Updated POT file.

65 files changed, 15857 insertions, 8902 deletions

diff --git a/po/ar.po b/po/ar.po
index 444439ae..22ab83ea 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -43,7 +43,7 @@ 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:97
+#: ../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
@@ -53,7 +53,7 @@ msgstr "خطأ."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "تهانينا"
 
@@ -135,32 +135,33 @@ msgstr "تحذيرأنت في DHCP, الخادم قد لا يعمل بهذه ا�
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "خطأ"
 
@@ -341,7 +342,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "فشِل"
 
@@ -502,7 +503,8 @@ msgid ""
 "continue"
 msgstr "يبدو أنّ المضيف موجود في إعدادك للـDNS... إضغط على التّالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "خطأ:"
 
@@ -626,7 +628,7 @@ msgstr "خادم ldap"
 msgid "Proxy"
 msgstr "بروكسي"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "عرض تهيئة Ldap"
@@ -672,7 +674,7 @@ msgstr ""
 "%s غير مثبّت\n"
 "أنقر على \"التّالي\" للتّثبيت أو على \"إلغي\" للخروج"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "التركيب فشل"
 
@@ -737,8 +739,8 @@ msgstr "إسم المضيف للخادم:"
 msgid "Admin email:"
 msgstr "العنوان الإلكتروني للمدير:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "رخّص دخول المستخدم الجذري:"
 
@@ -851,7 +853,7 @@ msgstr "قام المعالج بإعداد خادم الـFTP للإنترانت
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "من فضلك اعد تشغيل drakwizard، وحاول تغيير بعض البارمترات."
 
@@ -939,11 +941,21 @@ msgstr ""
 "تهانينا، خادم تثبيت ماندريبا جاهز الآن. يمكنك الآن إعداد خادم DHCP بدعم PXE، "
 "و خادم PXE. بهذا يكون تثبيت ماندريبا لينكس من خلال شبكة في غاية السّهولة."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "معالج تهيئة Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -954,7 +966,7 @@ msgstr ""
 "الكبرى تضمن: واجهة إدارة من الويب، كتاب عناوين مقسّم يحتوي على مستخدمي علبة "
 "البريد و الإتّصالات، و توصّل للبريد عن طريق POP3 و IMAP4 (rev1)"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -964,39 +976,140 @@ msgstr ""
 "Postfix، Imap، Saslauth. سيقوم المعالج بالاحتياط بجميع ملفّاتك للإعداد "
 "السّابقة الخاصّة بهذه الخدمات."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "مرحبا في معالج إعداد خادم البرامج الجماعية (groupware) كولاب."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "خادم DNS الرئيسى"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "لقد قمت بتهيئة خادم Ldap مسبقاً"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "خادم DNS التّابع"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "إسم المجال:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "إسم المجال:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "أدخل كلمة المرور لحساب مدير خادم كولاب."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "كلمات المرور غير متطابفة، أو كلمة مرور فارغة، صحّح من فضلك."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "كلمة المرور مجدّدا:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "الإسم:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "كلمة المرور مجدّدا:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "سيقوم المعالج الآن بإعداد خادم كولاب بهذه الوسائط"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "إسم المضيف:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "مجال البريد:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1004,19 +1117,11 @@ msgstr ""
 "خادم كولاب معدّ و يشتغل الآن. أدخل كمدير (manager) بكلمة المرور الّتي أدخلتها "
 "في https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "يتقدّم التّثبيت"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "يجري تثبيت خادم كولاب على نظامك..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "يجري إعداد خادم كولاب على نظامك..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "خادم كولاب (Kolab)"
 
@@ -1536,7 +1641,7 @@ msgid "Relay mail server"
 msgstr "خادم البريد الخارجي"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1555,9 +1660,8 @@ msgid ""
 "relay."
 msgstr "سيساعدك هذا المعالج على إعداد خادم لـFTP لشبكتك."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "معلومات"
 
@@ -1597,11 +1701,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "إسم المجال:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2414,12 +2513,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "معالج إعداد خادم الويب"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2727,7 +2820,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "مستوى التّوصّل:"
@@ -3446,132 +3539,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "خادم سامبا"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "ماذا تريد أن تفعل:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "أصغر عنوان IP:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "الإسم:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "خطأ: يجب أن يكون دليلا."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "طريقة التّثبيت:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "كلمة المرور:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "الطابعات:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "رخّص دخول المستخدم الجذري:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3579,73 +3672,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "تسجيل دخول المستخد:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "إسمح للمضيفات:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "إمنع المضيفات:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "خيار مخصّص:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "عرض تهيئة Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "قام المعالج بإعداد خادم NFS الخاصّ بك بنجاح."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "يجري إعداد خادم سامبا الخاصّ بك..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "خادم Apache"
@@ -3887,6 +3980,15 @@ msgstr "خادم Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "يجري إعداد نظامك كخادم Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "مجال البريد:"
+
+#~ msgid "Install in progress"
+#~ msgstr "يتقدّم التّثبيت"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "يجري تثبيت خادم كولاب على نظامك..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/az.po b/po/az.po
index 59e295f7..fe22cda2 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Xəta"
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Təbriklər"
 
@@ -139,32 +139,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Xəta"
 
@@ -348,7 +349,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Bacarılmadı"
 
@@ -508,7 +509,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Xəta:"
 
@@ -638,7 +640,7 @@ msgstr "Samba vericisi"
 msgid "Proxy"
 msgstr "Vəkil"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "DNS quraşdırma sehirbazı"
@@ -684,7 +686,7 @@ msgstr ""
 "%s qurulu deyil\n"
 "Qurmaq üçün \"Sonrakı\" ya da çıxmaq üçün \"Ləğv Et\" düyməsinə basın."
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Qurulum bacarılmadı"
 
@@ -750,8 +752,8 @@ msgstr "Verici Qovşaq Adı:"
 msgid "Admin email:"
 msgstr "Admin epoçtu:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "root girişinə icazə ver:"
 
@@ -870,7 +872,7 @@ msgstr "Sehirbaz İntranet/İnternet FTP Vericinizi müvəffəqiyyətlə quraşd
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -954,12 +956,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Samba Quraşdırma Sehirbazı"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -967,72 +979,161 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Veb Vericisi Quraşdırma Sehirbazı"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Əsas DNS vericisi"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, 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
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "İkinci DNS vericisi"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domen adı:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Domen adı:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Şifrə:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Şifrə:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Adı:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Şifrə:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Sehirbaz vericinizin İnternet Poçt xidmətini müvəffəqiyyətlə quraşdırdı."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Qovşaq adı:"
 
-#: ../kolab_wizard/Kolab.pm:91
-#, fuzzy
-msgid "Mail domain:"
-msgstr "Nis Domeni:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "İstifadəçi cərgəsi: "
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Samba vericisi"
@@ -1575,7 +1676,7 @@ msgid "Relay mail server"
 msgstr "Poçt vericisi"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1596,9 +1697,8 @@ msgid ""
 msgstr ""
 "Bu sehirbaz şəbəkəniz üçün FTP Vericisini quraşdırmaqda sizə yardım edəcək."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Mə'lumat"
 
@@ -1637,11 +1737,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Domen adı:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2446,12 +2541,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Veb Vericisi Quraşdırma Sehirbazı"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2758,7 +2847,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "İcazə səviyyəsi:"
@@ -3478,132 +3567,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba vericisi"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Nə etmək istəyirsiniz?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Ən Kiçik IP Ünvanı:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Adı:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Bölüşülmüş qovluq:"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Qurulum bacarılmadı"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Şifrə:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Çapçılar:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "root girişinə icazə ver:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3611,73 +3700,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Konteyner:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "İcazə verilən qovşaqlar:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Rədd edilən qovşaqlar:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Xüsusi seçim:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "DNS quraşdırma sehirbazı"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Sehirbaz NFS Vericinizi müvəffəqiyyətlə quraşdırdı"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "FTP Vericisi Quraşdırılır"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache vericisi"
@@ -3930,6 +4019,18 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Nis+Autofs(nfs) vericisi olaraq quraşdırılır ..."
 
 #, fuzzy
+#~ msgid "Mail domain:"
+#~ msgstr "Nis Domeni:"
+
+#, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "İstifadəçi cərgəsi: "
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/bg.po b/po/bg.po
index a9c015c0..eaa00eac 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Грешка"
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Поздравления"
 
@@ -136,32 +136,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Грешка"
 
@@ -345,7 +346,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Неуспешно"
 
@@ -508,7 +509,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr ""
 
@@ -642,7 +644,7 @@ msgstr "Сървър за база данни"
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Конфигурационен магьосник"
@@ -693,7 +695,7 @@ msgstr ""
 "%s не е инсталирано\n"
 "Натиснете \"Нататък\",за да инсталирате или \"Отказ\" за изход"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Инсталацията провалена"
 
@@ -757,8 +759,8 @@ msgstr "Име на новинарския сървър:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -873,7 +875,7 @@ msgstr "Помощникът успешно настрои вашият Интр
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -953,12 +955,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Конфигурационен магьосник"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -966,71 +978,159 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Помощник за настройка на FTP сървър"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "NFS сървър"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Помощникът успешно настрои вашият NFS сървър."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "NFS сървър"
+
+#: ../kolab_wizard/Kolab.pm:98
+msgid "Kolab Domain"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Парола:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Име:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Парола:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Помощникът успешно настрои вашата услуга \"интернет поща\" на сървъра ви."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Хост:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "Потребителска директория:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Настройване на FTP сървър"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Настройване на FTP сървър"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Сървър за база данни"
@@ -1569,7 +1669,7 @@ msgid "Relay mail server"
 msgstr "FTP сървър"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1589,9 +1689,8 @@ msgid ""
 "relay."
 msgstr "Този помощник ще ви помогне да настроите FTP сървър-а за мрежата ви."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Информация"
 
@@ -1630,10 +1729,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr ""
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2406,12 +2501,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Конфигурационен магьосник"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2707,7 +2796,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr ""
 
@@ -3415,129 +3504,129 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Сървър за база данни"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Какво искате да направите?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Най-малък IP адрес:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Име:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "инсталацията провалена"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Парола:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3545,71 +3634,71 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Добавяне на потребител"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Допълнителни параметри на командата GnuPG:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Конфигурационен магьосник"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Настройване на FTP сървър"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Новинарски сървър"
@@ -3837,6 +3926,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Настройване на DNS сървъра"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "Потребителска директория:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Настройване на FTP сървър"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/bn.po b/po/bn.po
index 1e6ca656..ebe5222a 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "ত্রুটি।"
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "অভিনন্দন"
 
@@ -137,32 +137,33 @@ msgstr "আপনি dhcp-তে আছেন, আপনার করা কন�
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "ত্রুটি"
 
@@ -353,7 +354,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "বিফল"
 
@@ -529,7 +530,8 @@ msgstr ""
 "ধাপ ক্লিক করুন"
 
 # ত্রুটি:
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "সমস্যা:"
 
@@ -659,7 +661,7 @@ msgstr "ldap সার্ভার"
 msgid "Proxy"
 msgstr "প্রক্সি"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Ldap কনফিগারেশন প্রদর্শন"
@@ -705,7 +707,7 @@ msgstr ""
 "%s ইনস্টল করা নেই\n"
 "\"পরবর্তী-ধাপ\" ক্লিক করে ইনস্টল করুন অথবা \"বাতিল\" ক্লিক করে প্রস্থান করুন"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "ইনস্টলেশন প্রক্রিয়া বিফল হয়েছে"
 
@@ -775,8 +777,8 @@ msgstr "সার্ভার হোস্টের নাম:"
 msgid "Admin email:"
 msgstr "অ্যাডমিন ইমেইল:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "রুট লগ-ইন করতে অনুমতি প্রদান করুন:"
 
@@ -895,7 +897,7 @@ msgstr "উইজার্ড আপনার ইন্ট্রানেট/ই
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "অনুগ্রহ করে drakwizard পুনরায় আরম্ভ করুন, এবং কিছু প্যারামিটার পরিবর্তন করবার চেষ্টা "
@@ -989,12 +991,23 @@ msgstr ""
 "DHCP সার্ভার এবং একটি PXE সার্ভার কনফিগার করতে পারবেন। এর দরুন খুব সহজেই "
 "নেটওয়ার্কের মাধ্যমে Mandriva Linux ইনস্টল করা যাবে।"
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab কনফিগারেশন উইজার্ড"
 
+# CONFUSED with the second line
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
 "features include: a web administration interface, a shared address book with "
@@ -1006,7 +1019,7 @@ msgstr ""
 "সুবিধা ও কন্টাক্ট সহ একটি শেয়ারকৃত এড্রেসবুক এবং একটি POP3 ও IMAP4(rev1) মেইল "
 "অ্যাক্সেস।"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1016,39 +1029,143 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth। উইজার্ড এই পরিসেবাগুলোর জন্য আপনার পূর্ববর্তী "
 "কনফিগারেশন ফাইলের ব্যাক-আপ তৈরি করবে।"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Kolab গ্রুপওয়ের সার্ভার কনফিগারেশন উইজার্ড-এ আপনাকে স্বাগতম।"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+# CONFUSED with the second line
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "মাস্টার DNS সার্ভার"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "আপনি ইতিমধ্যেই আপনার Ldap সার্ভার কনফিগার করেছেন"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "স্লেভ DNS সার্ভার"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "ডোমেইনের নাম:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "ডোমেইনের নাম:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Kolab সার্ভারের ম্যানেজার অ্যাকাউন্টের পাসওয়ার্ড লিখুন।"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "পাসওয়ার্ডে গরমিল অথবা শূন্য পাসওয়ার্ড, অনুগ্রহ করে সংশোধন করুন। "
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "পুনরায় পাসওয়ার্ড লিখুন:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "LDAP কাঠামো:"
+
+#: ../kolab_wizard/Kolab.pm:139
+#, fuzzy
+msgid "Organisational unit:"
+msgstr "LDAP কাঠামো:"
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "পুনরায় পাসওয়ার্ড লিখুন:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "নির্দিষ্ট প্যারামিটার ব্যবহার করে উইজার্ড এখন Kolab সার্ভার কনফিগার করবে"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "হোস্টের নাম:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "মেইল ডোমেইন:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+#, fuzzy
+msgid "Organisationnal unit:"
+msgstr "LDAP কাঠামো:"
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1056,19 +1173,11 @@ msgstr ""
 "Kolab সার্ভার কনফিগার করা হয়েছে এবং বর্তমানে চলছে। https://127.0.0.1/kolab/"
 "admin/ -এলেখা পাসওয়ার্ড ব্যবহার করে ম্যানজার' হিসাবে লগ-ইন করুন"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "ইনস্টল প্রক্রিয়া চলছে"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "আপনার সিস্টেমে Kolab সার্ভার ইনস্টল করবার প্রক্রিয়া..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "আপনার সিস্টেমে Kolab সার্ভার কনফিগার করবার প্রক্রিয়া..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab সার্ভার"
 
@@ -1608,7 +1717,7 @@ msgid "Relay mail server"
 msgstr "বহিস্থিত মেইল সার্ভার"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1628,9 +1737,8 @@ msgid ""
 msgstr ""
 "আপনার নেটওয়ার্কের জন্য একটি FTP সার্ভার কনফিগার করতে এই উইজার্ড সাহায্যে করবে।"
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "তথ্য"
 
@@ -1670,11 +1778,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "ডোমেইনের নাম:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2517,12 +2620,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "ওয়েব সার্ভার কনফিগারেশন উইজার্ড"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2832,7 +2929,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "ব্যবহারের লেভেল :"
@@ -3557,132 +3654,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "সাম্বা সার্ভার"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "আপনি কি করতে ইচ্ছুক:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "সর্বনিম্ন আইপি (IP) অ্যাড্রেস:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "প্রথম নাম:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "ত্রুটি: ডিরেক্টরি হওয়া আবশ্যক।"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "ইনস্টলেশন প্রক্রিয়া:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "প্রিন্টার:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "রুট লগ-ইন করতে অনুমতি প্রদান করুন:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3690,73 +3787,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "ব্যবহারকারী লগ-ইন:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "হোস্টদেরকে অনুমতি প্রদান করুন:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "হোস্টদেরকে বহিষ্কার করুন:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "নিজস্ব অপশন:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Ldap কনফিগারেশন প্রদর্শন"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "উইজার্ড সাফল্যের সাথে আপনার NFS সার্ভার কনফিগার করেছে।"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "আপনার সাম্বা সার্ভার কনফিগার করবার প্রক্রিয়া..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "অ্যাপাচে সার্ভার"
@@ -4005,6 +4102,15 @@ msgstr "অ্যাপাচে সার্ভার"
 msgid "Configuring your system as Apache server ..."
 msgstr "আপনার সিস্টেমকে অ্যাপাচে সার্ভার হিসাবে কনফিগার করবার প্রক্রিয়া..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "মেইল ডোমেইন:"
+
+#~ msgid "Install in progress"
+#~ msgstr "ইনস্টল প্রক্রিয়া চলছে"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "আপনার সিস্টেমে Kolab সার্ভার ইনস্টল করবার প্রক্রিয়া..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
@@ -4308,9 +4414,6 @@ msgstr "আপনার সিস্টেমকে অ্যাপাচে স
 #~ msgid "You must enter a suffix for LDAP."
 #~ msgstr "আপনাকে অবশ্যই LDAP এর জন্য একটি সাফিক্স (suffix) দিতে হবে।"
 
-#~ msgid "Organisation LDAP:"
-#~ msgstr "LDAP কাঠামো:"
-
 #~ msgid "The wizard successfully added a user in LDAP"
 #~ msgstr "উইজার্ড সাফল্যের সাথে ldap-তে একজন ব্যবহারকারী যোগ করেছে"
 
diff --git a/po/br.po b/po/br.po
index ee9af7da..7f623122 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -33,7 +33,7 @@ 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:97
+#: ../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
@@ -43,7 +43,7 @@ msgstr "Fazi."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Gourc'hemennoù"
 
@@ -120,32 +120,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Fazi"
 
@@ -313,7 +314,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Sac'het"
 
@@ -462,7 +463,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr ""
 
@@ -584,7 +586,7 @@ msgstr "Servijer Kolab"
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr ""
 
@@ -629,7 +631,7 @@ msgstr ""
 "N'eo ket staliadet %s\n"
 "Klikit ouzh « A heul » evit staliañ pe ouzh « Nullañ » evit guitaat"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Staliañ a zo sac'het"
 
@@ -689,8 +691,8 @@ msgstr "Anv ar servijer :"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -797,7 +799,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -874,11 +876,21 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -886,64 +898,154 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Servijer DNS mestr"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Servijer Postfix"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Servijer Kolab"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domani :"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domani :"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Tremenger :"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Anv-bihan :"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+msgid "CA passphrase again:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Anv ar ostiz :"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Servijer Kolab"
 
@@ -1434,7 +1536,7 @@ msgid "Relay mail server"
 msgstr "Serijer ar mailh"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1452,9 +1554,8 @@ msgid ""
 "relay."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Titouroù"
 
@@ -1492,10 +1593,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domani :"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2234,12 +2331,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2533,7 +2624,7 @@ msgstr "Restr kerzlevr :"
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Live kerzlevr :"
 
@@ -3216,128 +3307,128 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Servijer Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Petra e fell deoc'h da ober ?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Anv-bihan :"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Hentenn dilesadur"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Tremenger :"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Kerzlevr"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Moullerezioù :"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3345,69 +3436,69 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Dibarzh diouzoc'h :"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Servijer Postfix"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Servijer Postfix"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Servijer Apache"
diff --git a/po/bs.po b/po/bs.po
index 24526847..bd52de23 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "Greška."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Čestitam"
 
@@ -134,32 +134,33 @@ msgstr "Nalazite se u dhcp-u, server možda neće raditi sa ovom konfiguracijom.
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Greška"
 
@@ -347,7 +348,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Neuspjeh"
 
@@ -517,7 +518,8 @@ msgstr ""
 "Izgleda da je ovaj računar već u vašoj DNS konfiguraciji... pritisnite Dalje "
 "za nastavak"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Greška:"
 
@@ -645,7 +647,7 @@ msgstr "LDAP server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Prikaži LDAP konfiguraciju"
@@ -691,7 +693,7 @@ msgstr ""
 "%s nije instaliran\n"
 "Kliknite na \"Sljedeći\" da ga instalirate ili \"Odustani\" za izlaz"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "instalacija nije uspjela"
 
@@ -758,8 +760,8 @@ msgstr "Ime servera:"
 msgid "Admin email:"
 msgstr "E-mail administratora:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Dozvoli root prijavu:"
 
@@ -877,7 +879,7 @@ msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet FTP server"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Molim ponovo pokrenite drakwizard i probajte izmijeniti neke parametre."
@@ -970,11 +972,21 @@ msgstr ""
 "podesiti DHCP server sa PXE podrškom i PXE server. Tako će biti vrlo "
 "jednostavno da instalirate Mandriva Linux putem mreže."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Čarobnjak za podešavanje Kolab servera"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -986,7 +998,7 @@ msgstr ""
 "podrškom za korisnike poštanskih sandučića kao i kontakte, te POP3 i IMAP4 "
 "(rev1) pristup e-mailu"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -996,39 +1008,140 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Čarobnjak će napraviti rezervnu kopiju vaših "
 "prijašnjih konfiguracionih datoteka za ove servise."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Dobrodošli u čarobnjak za podešavanje Kolab groupware servera"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Glavni DNS server"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Već ste uspješno podesili vaš LDAP server"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Pomoćni DNS server"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domensko ime:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Domensko ime:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Unesite šifru za manager account za Kolab server:"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Šifre se ne poklapaju ili su prazne, molim ispravite."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Ponovo šifra:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Ime:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Ponovo šifra:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Čarobnjak je uspješno podesio Kolab server sa sljedećim parametrima"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Ime računara:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Domena za mail:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1036,19 +1149,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Instalacija u toku"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Instaliram Kolab server na vašem sistemu..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavam Kolab server na vašem sistemu..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -1577,7 +1682,7 @@ msgid "Relay mail server"
 msgstr "Vanjski mail server"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1596,9 +1701,8 @@ msgid ""
 "relay."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite FTP server za vašu mrežu."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informacije"
 
@@ -1638,11 +1742,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Domensko ime:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2485,12 +2584,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Čarobnjak za podešavanje Web servera"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2800,7 +2893,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Nivo pristupa:"
@@ -3521,132 +3614,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba server"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Šta želite uraditi:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Najmanja IP adresa:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Ime:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Greška: mora biti direktorij."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Metoda instalacije:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Šifra:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Štampači:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Dozvoli root prijavu:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3654,73 +3747,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Korisničko ime:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Dozvoli računare:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Odbij računare:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Vlastita opcija:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Prikaži LDAP konfiguraciju"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Čarobnjak je uspješno podesio NFS server."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Podešavam vaš Samba server..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache server"
@@ -3969,6 +4062,15 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje sistema kao Apache servera..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Domena za mail:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instalacija u toku"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Instaliram Kolab server na vašem sistemu..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/ca.po b/po/ca.po
index 502651e4..044c3a95 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -38,7 +38,7 @@ 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:97
+#: ../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
@@ -48,7 +48,7 @@ msgstr "Error."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Felicitats"
 
@@ -136,32 +136,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Error"
 
@@ -350,7 +351,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Ha fallat"
 
@@ -511,7 +512,8 @@ msgstr ""
 "Sembla que el nom de màquina ja és a la teva configuració de DNS... prem "
 "següent per continuar"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Error:"
 
@@ -638,7 +640,7 @@ msgstr "Servidor LDAP"
 msgid "Proxy"
 msgstr "Servidor intermediari"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Configuració del dimoni OpenSSH"
 
@@ -683,7 +685,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 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
@@ -747,8 +749,8 @@ msgstr "Nom del servidor:"
 msgid "Admin email:"
 msgstr "Correu de l'administrador:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Permet la entrada de root:"
 
@@ -864,7 +866,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Si us plau torna a llançar drakwizard i intenta canviar alguns paràmetres."
@@ -953,11 +955,21 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Auxiliar de configuració de Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -965,46 +977,146 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Benvingut a l'auxiliar de configuració del servidor Kolab Groupware"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Servidor DNS mestre"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Ja heu configurat el vostre servidor Ldap"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Servidor DNS esclau"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domini:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domini:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Introduïu la contrasenya pel compte de gestor del servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Les contrasenyes no concoden o és nul·la, si us plau corregiu-ho."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Contrasenya un altre cop:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Nom:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Contrasenya un altre cop:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "L'auxiliar configurarà el servidor Kolab amb aquests paràmetres"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nom de host:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Domini de correu:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1012,19 +1124,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Instal·lació en progrés"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "S'està instal·lant el servidor Kolab al vostre sistema..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "S'està configurant el servidor Kolab al vostre sistema..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -1541,7 +1645,7 @@ msgid "Relay mail server"
 msgstr "Servidor de correu extern"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1561,9 +1665,8 @@ msgid ""
 msgstr ""
 "Aquest auxiliar us ajudarà a configurar un servidor FTP per la vostra xarxa."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informació"
 
@@ -1604,10 +1707,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domini:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2408,12 +2507,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Auxiliar de configuració del servidor Web"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2712,7 +2805,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Intèrpret de comandaments per al login:"
@@ -3432,124 +3525,124 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Servidor Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Quin tipus de configuració voleu fer:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "Servidor SSH, opcions clàssiques"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Nombre de port:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "Especifica el port al que ssh escoltarà. El predeterminat és 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "El port ha de ser un nombre"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Mètode d'autenticació"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3557,66 +3650,66 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Compressió: Especifica si es permet la compressió."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Compressió:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Resum de la configuració d'OpenSSH."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "L'auxiliar ha configurat el servidor SSH amb èxit."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "S'està configurant el vostre servidor OpenSSH..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "Servidor OpenSSH"
 
@@ -3867,6 +3960,15 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "S'està configurant el vostre sistema con servidor Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Domini de correu:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instal·lació en progrés"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "S'està instal·lant el servidor Kolab al vostre sistema..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/cs.po b/po/cs.po
index ae6d14aa..dcbd35bb 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -44,7 +44,7 @@ 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:97
+#: ../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
@@ -54,7 +54,7 @@ msgstr "Chyba."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Gratulujeme"
 
@@ -144,32 +144,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Chyba"
 
@@ -356,7 +357,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Selhání"
 
@@ -528,7 +529,8 @@ msgstr ""
 "Zdá se, že počítač je ve vašem nastavení DNS už uveden... pokračujte "
 "stisknutím tlačítka Další"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Chyba:"
 
@@ -653,7 +655,7 @@ msgstr "LDAP server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Nastavení démona OpenSSH"
 
@@ -698,7 +700,7 @@ msgstr ""
 "%s není nainstalován.\n"
 "Nainstalujte stiskem tlačítka \"Další\" nebo skončete tlačítkem \"Zrušit\""
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalace selhala"
 
@@ -763,8 +765,8 @@ msgstr "Název serveru:"
 msgid "Admin email:"
 msgstr "Email správce:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Povolit přihlášení roota:"
 
@@ -878,7 +880,7 @@ msgstr "Tento průvodce úspěšně nastavil váš FTP server pro Internet/Intra
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Spusťte aplikaci drakwizard znovu a zkuste změnit některé parametry."
 
@@ -966,11 +968,21 @@ msgstr ""
 "drakpxelinux, chcete-li nastavit DHCP server, použijte příkaz drakwizard "
 "DHCP."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Průvodce nastavením serveru Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -982,7 +994,7 @@ msgstr ""
 "uživateli poštovních schránek a dalšími kontakty a přístup k poště pomocí "
 "protokolů POP3 a IMAP4"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -992,39 +1004,139 @@ msgstr ""
 "Postfix, IMAP a Saslauth. Tento průvodce zazálohuje soubory s předchozím "
 "nastavením všech těchto služeb."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Vítejte v průvodci nastavením groupware serveru Kolab."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Nadřízený DNS server"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Váš server LDAP byl již nastaven"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Podřízený DNS server"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Doména:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Doména:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Zadejte heslo pro účet správce serveru Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Heslo není shodné nebo je prázdné, opravte jej prosím."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Heslo znovu:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Jméno:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Heslo znovu:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Tento průvodce nyní nastaví server Kolab s následujícími parametry"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Název počítače:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Poštovní doména:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1032,19 +1144,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Probíhá instalace"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Na váš systém se instaluje server Kolab..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavuje se server Kolab na vašem systému..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -1568,7 +1672,7 @@ msgid "Relay mail server"
 msgstr "Přenosový poštovní server"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Začátečník - základní volby"
 
@@ -1588,9 +1692,8 @@ msgstr ""
 "Tento průvodce vám pomůže nastavit poštovní server Postfix nebo přenos pošty "
 "(relay) pomocí serveru Postfix."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informace"
 
@@ -1631,10 +1734,6 @@ msgstr ""
 "např. myhostname = mujnazevpocitace"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Doména:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2481,14 +2580,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Průvodce nastavením serveru Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Zdá se, že jste již dříve nastavovali Samba server. Tento průvodce načte "
-"vaše staré nastavení a umožní vám vybrat typ serveru, který chcete nastavit"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2820,7 +2911,7 @@ msgstr "Soubor se záznamy:"
 msgid "Max log size:"
 msgstr "Maximální velikost:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Úroveň záznamů:"
 
@@ -3574,79 +3665,79 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Sdílení Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Expertní - pokročilé volby SSH"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Jaký typ nastavení chcete provést:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSH server, základní volby"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Adresa pro naslouchání:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Udává lokální adresy, na kterých by měl démon sshd naslouchat."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Číslo portu:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 "Udává číslo portu, na kterém by měl démon sshd naslouchat. Výchozí je 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Port by mělo být číslo"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Způsob ověření"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "Ověření RSA:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Ověření veřejným klíčem:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Soubor s ověřovacími klíči:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Ověření heslem:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Ignorovat soubor rhosts:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Povolit prázdné heslo:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Záznamy"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 "Úroveň záznamu: udává úroveň podrobnosti při ukládání zpráv od démona sshd."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
@@ -3654,15 +3745,15 @@ msgstr ""
 "Zařízení syslog: udává kód zařízení použitý při ukládání záznamů od démona "
 "sshd"
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Zařízení syslog:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Volby přihlášení"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3670,11 +3761,11 @@ msgstr ""
 "Vypsat poslední přihlášení: zda-li by měl démon sshd vypsat datum a čas "
 "posledního přihlášení uživatele"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Prodleva při přihlášení:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3683,23 +3774,23 @@ msgstr ""
 "Server se odpojí po zadaném čase, pokud se uživatel úspěšně nepřihlásí. "
 "Pokud je hodnota 0, není zde časové omezení. Výchozí hodnota je 120 sekund."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Udržet spojení:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Vypsat zprávu dne:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Vypsat poslední přihlášení:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Prodleva při přihlášení by mělo být číslo"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3711,19 +3802,19 @@ msgstr ""
 "adresáře. To je za běžných okolností žádoucí, jelikož nováčci někdy "
 "nechávají své soubory či adresáře přístupné pro zápis komukoli"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Volby přihlášení uživatele"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Přísné režimy:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Povolit uživatele:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3731,11 +3822,11 @@ msgstr ""
 "Pokud jsou zadány, je přihlášení povoleno pouze uživatelům, jejichž jméno "
 "odpovídá alespoň jednomu ze vzorů. Příklad: erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Zakázat uživatele:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3743,11 +3834,11 @@ msgstr ""
 "Přihlášení je zapovězeno uživatelům, jejichž jméno odpovídá alespoň jednomu "
 "ze zadaných vzorů. Příklad: pirat guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Komprimace: Udává, zda-li je povolena komprimace."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3757,27 +3848,27 @@ msgstr ""
 "přeposílání ještě nezabraňuje uživatelům v přeposílání provozu z X11, "
 "jelikož si uživatelé mohou instalovat své vlastní přeposílatele."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Komprimace:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "Přeposílání X11:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Shrnutí nastavení OpenSSH."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Průvodce úspěšně nastavil váš server SSH."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Nastavuji váš server OpenSSH..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSH server"
 
@@ -4024,6 +4115,23 @@ msgstr "Server Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavuji váš systém jako server Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Poštovní doména:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Probíhá instalace"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Na váš systém se instaluje server Kolab..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Zdá se, že jste již dříve nastavovali Samba server. Tento průvodce načte "
+#~ "vaše staré nastavení a umožní vám vybrat typ serveru, který chcete "
+#~ "nastavit"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/cy.po b/po/cy.po
index 96e6ddcc..9bfefb26 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -34,7 +34,7 @@ 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:97
+#: ../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
@@ -44,7 +44,7 @@ msgstr "Gwall."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
 
@@ -132,32 +132,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Gwall"
 
@@ -345,7 +346,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Methwyd"
 
@@ -513,7 +514,8 @@ msgstr ""
 "Mae'n ymddangos fod y gwestai eisoes yn eich ffurfweddiad DNS...cliciwch "
 "Nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Gwall:"
 
@@ -641,7 +643,7 @@ msgstr "Gweinydd LDAP"
 msgid "Proxy"
 msgstr "Dirprwy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Dangos ffurfweddiad LDAP"
@@ -687,7 +689,7 @@ msgstr ""
 "Nid yw %s wedi ei osod\n"
 "Cliciwch \"Nesaf\"i'w osod neu \"Diddymu\" i adael."
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
@@ -756,8 +758,8 @@ msgstr "Enw Gweinydd :"
 msgid "Admin email:"
 msgstr "E-bost gweinyddwr"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Caniatáu Mewngofnodi gwraidd"
 
@@ -877,7 +879,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwynnwch drakwizard, a cheisio newid rhai paramedrau."
 
@@ -970,11 +972,21 @@ msgstr ""
 "modd ffurfweddu gweinydd DHCP gyda chynhaliaeth PXE a gweinydd PXE. Felly, "
 "bydd yn hawdd iawn gosod Mandriva Linux drwy rwydwaith."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Dewin Ffurfweddu Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -986,7 +998,7 @@ msgstr ""
 "rhanadwy gyda'r cyfleuster o flychau e-bost, cysylltiadau a POP3 yn ogystal "
 "â mynediad IMAP4(rev1) i e-bost."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -996,39 +1008,139 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Bydd y Dewin yn gwneud copi wrth gefn "
 "o'ch ffeiliau ffurfweddiad blaenorol ar gyfer y gwasanaethau hyn."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Croeso i Ddewin ffurfweddu gweinydd Kolab Groupware"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Prif weinydd DNS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Rydych eisoes wedi ffurfweddu eich gweinydd LDAP."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Is weinydd DNS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Parth:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Parth:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Rhowch gyfrinair ar gyfer cyfrif rheolwr gweinydd Kolab"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Cyfrinair gwallus, cywirwch."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Cyfrinair eto:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Enw cyntaf:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Cyfrinair eto:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Bydd y dewin yn ffurfweddu gweinydd Kolab gyda'r paramedrau hyn"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Enw Gwestai:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Parth E-bost:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1036,19 +1148,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Wrthi'n gosod"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Gosod gweinydd Kolab ar eich system..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Ffurfweddu gweinydd Kolab ar eich system..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Gweinydd Kolab"
 
@@ -1584,7 +1688,7 @@ msgid "Relay mail server"
 msgstr "Gweinydd e-bost allanol"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1605,9 +1709,8 @@ msgstr ""
 "Bydd y Dewin hwn yn eich cynorthwyo i ffurfweddu'r Gweinydd FTP ar gyfer "
 "eich rhwydwaith."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Gwybodaeth"
 
@@ -1646,10 +1749,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Parth:"
-
-#: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
@@ -2483,12 +2582,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Dewin Ffurfweddu Gweinydd Gwe"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2798,7 +2891,7 @@ msgstr "Ffeil cofnod:"
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Lefel mynediad:"
@@ -3517,131 +3610,131 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Gweinydd Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Beth hoffech ei wneud:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Cyfeiriad IP Isaf:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Enw cyntaf:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Gwall i fod yn gyfeiriadur"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Dull Dilysiant"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Cyfrinair:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Cofnodion"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Argraffyddion:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Caniatáu Mewngofnodi gwraidd"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3649,73 +3742,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Mewngofnod defnyddiwr:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Caniatáu gwesteiwr:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Gwrthod gwesteiwr"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Dewis addasu:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Dangos ffurfweddiad LDAP"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Mae'r dewin wedi ffurfweddu eich Gweinydd NFS yn llwyddiannus"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Ffurfweddu eich gweinydd Samba..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Gweinydd gwe Apache"
@@ -3963,6 +4056,15 @@ msgstr "Gweinydd gwe Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ffurfweddu eich system fel gweinydd Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Parth E-bost:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Wrthi'n gosod"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Gosod gweinydd Kolab ar eich system..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/da.po b/po/da.po
index 6c04397e..ff38b498 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -41,7 +41,7 @@ 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:97
+#: ../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
@@ -51,7 +51,7 @@ msgstr "Fejl."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Tillykke"
 
@@ -137,32 +137,33 @@ msgstr "Du er i dhcp, serveren vil muligvis ikke virke med din konfiguration."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Fejl"
 
@@ -351,7 +352,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Mislykkedes"
 
@@ -523,7 +524,8 @@ msgstr ""
 "Det ser ud som om værten allerede er i din DNS-konfiguration... tryk næste "
 "for at fortsætte"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Fejl:"
 
@@ -653,7 +655,7 @@ msgstr "ldap-server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Vís konfiguration for Ldap"
@@ -699,7 +701,7 @@ msgstr ""
 "%s er ikke installeret\n"
 "Klik \"Næste\" for at installere eller \"Annullér\" for at afslutte"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Installation mislykkedes"
 
@@ -767,8 +769,8 @@ msgstr "Værtsnavn på server:"
 msgid "Admin email:"
 msgstr "Admin-epost:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Tillad root-indlogning:"
 
@@ -886,7 +888,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Genstart drakwizard, og prøv at ændre nogen parametre."
 
@@ -978,11 +980,21 @@ msgstr ""
 "konfigurere en DHCP-server med PXE-understøttelse, og en PXE-server. Så vil "
 "det være meget nemt at installere Mandriva Linux over nettet."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Konfigurationshjælper for Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -994,7 +1006,7 @@ msgstr ""
 "adressebog med muligheder for postkassebrugere så vel som kontakter, og en "
 "POP3 og IMAP4 (rev1) adgang til post."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1004,40 +1016,141 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap og Saslauth. Hjælperen vil lave en sikkerhedskopi "
 "af alle dine tidligere konfigurationsfiler for disse tjenester."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 "Velkommen til konfigurationshjælperen for Kolab gruppeprogrammel-serveren."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Master DNS-server"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Du har allerede konfigureret din Ldap-server"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Slave DNS-server"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domænenavn:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Domænenavn:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Indtast adgangskode for administrationskontoen for Kolab-serveren."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Uoverensstemmende adgangskoder, eller blank adgangskode; ret venligst."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Adgangskode igen:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Fornavn:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Adgangskode igen:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Hjælperen vil nu konfigurere Kolab-serveren med disse parametre"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Værtsnavn:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Epost-domæne:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1045,19 +1158,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Installering i gang"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Installerer Kolab-server på dit system..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer Kolab-server på dit system..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab-server"
 
@@ -1591,7 +1696,7 @@ msgid "Relay mail server"
 msgstr "Ekstern e-postserver"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1612,9 +1717,8 @@ msgstr ""
 "Denne hjælper vil hjælpe dig med at konfigurere en FTP-server til dit "
 "netværk."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informationer"
 
@@ -1654,11 +1758,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Domænenavn:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2500,12 +2599,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Konfigurationshjælper for webserver"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2814,7 +2907,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Adgangsniveau:"
@@ -3535,132 +3628,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba-server"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Hvad ønsker du at gøre:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Laveste IP-adresse:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Fornavn:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Fejl, bør være et katalog."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Installationsmetode:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Adgangskode:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Printere:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Tillad root-indlogning:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3668,73 +3761,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Login for bruger:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Tillad værter:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Afvis værter:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Egendefineret option:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Vís konfiguration for Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Hjælperen konfigurerede din NFS-server uden problemer."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Konfigurerer din Samba-server..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache-server"
@@ -3982,6 +4075,15 @@ msgstr "Apache-server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer dit system som en Apache-server ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Epost-domæne:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Installering i gang"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Installerer Kolab-server på dit system..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/de.po b/po/de.po
index b124ac05..90179446 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-08-02 20:59+0200\n"
 "Last-Translator: Frank Koester <frank@dueppel13.de>\n"
 "Language-Team: deutsch\n"
@@ -48,7 +48,7 @@ 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:97
+#: ../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
@@ -58,7 +58,7 @@ msgstr "Fehler."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch"
 
@@ -150,32 +150,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Fehler"
 
@@ -371,7 +372,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Fehler"
 
@@ -545,7 +546,8 @@ msgstr ""
 "Dieser Rechner ist wahrscheinlich schon in der DNS-Konfiguration vorhanden. "
 "Drücken Sie „Weiter“ um fortzufahren"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Fehler:"
 
@@ -675,7 +677,7 @@ msgstr "LDAP-Server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH Daemon-Konfiguration"
 
@@ -720,7 +722,7 @@ msgstr ""
 "%s ist nicht installiert\n"
 "Wählen Sie „Weiter“ für die Installation, oder „Abbrechen“ zum Beenden"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Installation fehlgeschlagen"
 
@@ -786,8 +788,8 @@ msgstr "Server-Name:"
 msgid "Admin email:"
 msgstr "Admin-E-Mail:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Root-Login erlauben:"
 
@@ -905,7 +907,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Bitte starten Sie Drakwizard erneut und versuchen Sie, einige Parameter zu "
@@ -995,11 +997,21 @@ msgstr ""
 "installieren. Benutzen Sie drakpxelinux um Ihren PXE-Server zu "
 "konfigurieren, und drakwizard DHCP um einen DHCPD Server zu konfigurieren."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab Konfigurations-Assistent"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -1011,7 +1023,7 @@ msgstr ""
 "Administrationsschnittstelle, ein gemeinsames Adressbuch für Mailbox-"
 "Benutzer und Kontakte und POP3- oder IMAP4 (rev1)-Zugriff auf Ihre Emails"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1021,43 +1033,143 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Drakwizard wird eine Sicherungskopie aller "
 "vorhandenen Konfigurationsdateien dieser Dienste anfertigen."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Willkommen zum Kolab Groupware-Server Konfigurations-Assistenten."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Master-DNS-Server"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Sie haben Ihren LDAP-Server schon konfiguriert"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Slave-DNS-Server"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domäne:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domäne:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr ""
 "Bitte geben Sie das Passwort für das Verwaltungskonto des Kolab-Servers ein."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 "Die Passwörter stimmen nicht überein, oder es wurde kein Passwort "
 "eingegeben. Bitte korrigieren Sie dies."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Passwort nochmal:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Vorname:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Passwort nochmal:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Der Assistent wird nun den Kolab-Server mit diesen Parametern einrichten"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Mail-Domäne:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1066,19 +1178,11 @@ msgstr ""
 "'manager'·ein mit dem eingegebenen Passwort unter:·https://127.0.0.1/kolab/"
 "admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Installation im Gange"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Installiere den Kolab-Server auf Ihren System..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfiguriere den Kolab-Server auf Ihrem System..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab-Server"
 
@@ -1616,7 +1720,7 @@ msgid "Relay mail server"
 msgstr "Relais-Mail-Server"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Neuling - klassische Optionen"
 
@@ -1636,9 +1740,8 @@ msgstr ""
 "Der Assistent wird Ihnen helfen den Postfix-Mail-Server oder ein Postfix-"
 "Mail-Relaiseinzurichten."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informationen"
 
@@ -1676,10 +1779,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domäne:"
-
-#: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
@@ -2540,12 +2639,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Web-Server Konfigurations-Assistent"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2855,7 +2948,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Zugangslevel:"
@@ -3583,132 +3676,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba-Server"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Was wollen Sie machen:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Niedrigste IP-Adresse:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Vorname:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Fehler: sollte ein Verzeichnis sein."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Installations-Methode:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Passwort:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Drucker:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Root-Login erlauben:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3716,73 +3809,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Benutzeranmeldung:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Erlaubte Rechner:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Verweigerte Rechner:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Angepasste Option:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "LDAP Konfiguration anzeigen"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Der Assistent hat Ihren NFS-Server erfolgreich eingerichtet."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Konfiguriere Ihren Samba-Server..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache Server"
@@ -4038,6 +4131,15 @@ msgstr "Apache Server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfiguriere Ihr System als Apache-Server..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Mail-Domäne:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Installation im Gange"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Installiere den Kolab-Server auf Ihren System..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index 44cfdd3e..ebc54aff 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr ""
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr ""
 
@@ -122,32 +122,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr ""
 
@@ -315,7 +316,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr ""
 
@@ -463,7 +464,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr ""
 
@@ -582,7 +584,7 @@ msgstr ""
 msgid "Proxy"
 msgstr ""
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr ""
 
@@ -625,7 +627,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr ""
 
@@ -685,8 +687,8 @@ msgstr ""
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -791,7 +793,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -868,11 +870,19 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -880,64 +890,149 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+msgid "Master or slave Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid "You choose to configure a master Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:93
+msgid "Slave kolab server:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:98
+msgid "Kolab Domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:86
-msgid "The wizard will now configure Kolab server with these parameters"
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
-msgid "Hostname:"
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+msgid "Organisation name:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:150
 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/"
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment."
+msgstr ""
+
+#: ../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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+msgid "CA passphrase again:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
+msgid "The wizard will now configure Kolab server with these parameters"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
+msgid "Hostname:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr ""
 
@@ -1423,7 +1518,7 @@ msgid "Relay mail server"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1441,9 +1536,8 @@ msgid ""
 "relay."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr ""
 
@@ -1480,10 +1574,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr ""
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2218,12 +2308,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2512,7 +2596,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr ""
 
@@ -3176,124 +3260,124 @@ msgstr ""
 msgid "Samba homes share"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3301,66 +3385,66 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index ad2508ff..85e5dc98 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -34,7 +34,7 @@ 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:97
+#: ../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
@@ -44,7 +44,7 @@ msgstr "Σφάλμα."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Συγχαρητήρια"
 
@@ -133,32 +133,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -339,7 +340,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Ανεπιτυχές"
 
@@ -499,7 +500,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Σφάλμα:"
 
@@ -623,7 +625,7 @@ msgstr "Εξυπηρετητής Samba"
 msgid "Proxy"
 msgstr "Διαμεσολαβητής"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Οδηγός Ρυθμίσεων LDAP"
@@ -669,7 +671,7 @@ msgstr ""
 "Το %s δεν είναι εγκατεστημένο επιλέξτε \"Επόμενο\" για εγκατάσταση η \"Άκυρο"
 "\" για έξοδο"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
@@ -737,8 +739,8 @@ msgstr "Όνομα εξυπηρετητή"
 msgid "Admin email:"
 msgstr "email διαχειριστή:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Επιτρέπεται η σύνδεση του root:"
 
@@ -855,7 +857,7 @@ msgstr "Ο οδηγός ρύθμισε με επιτυχία τον Διακομ
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Επανεκκίνηστε το drakwizard και προσπαθήστε να αλλάξετε κάποιες παραμέτρους"
@@ -935,12 +937,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων Samba"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -948,71 +960,160 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Οδηγός Ρυθμίσεων Διακομιστή Ιστού"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Κύριος διακομιστής DNS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή Samba."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Δευτερεύων διακομιστής DNS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Τομέας NIS:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Τομέας NIS:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Κωδικός:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Όνομα:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Κωδικός:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εσωτερικό εξυπηρετητή αλληλογραφίας"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Όνομα συστήματος:"
 
-#: ../kolab_wizard/Kolab.pm:91
-#, fuzzy
-msgid "Mail domain:"
-msgstr "Τομέας NIS:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "Κατάλογος εγκατάστασης"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά σας"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά σας"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Εξυπηρετητής Samba"
@@ -1551,7 +1652,7 @@ msgid "Relay mail server"
 msgstr "Εξωτερικός εξυπηρετητής αλληλογραφίας"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1572,9 +1673,8 @@ msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει στη ρύθμιση του Διακομιστή NFS για το δίκτυό "
 "σας."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Πληροφορίες"
 
@@ -1613,11 +1713,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Τομέας NIS:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2419,12 +2514,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Οδηγός Ρυθμίσεων Διακομιστή Ιστού"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2732,7 +2821,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Κέλυφος Σύνδεσης"
@@ -3453,133 +3542,133 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Εξυπηρετητής Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Μικρότερη Διεύθυνση ΙΡ:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "αριθμός uid:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Πρέπει να είναι αριθμός"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Μέθοδος Εγκατάστασης:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Κωδικός:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Εκτυπωτές:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Επιτρέπεται η σύνδεση του root:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 #, fuzzy
 msgid "Login grace time should be a number"
 msgstr "Πρέπει να είναι αριθμός"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3587,73 +3676,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Container:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Επέτρεψε τους υπολογιστές:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Απέτρεψε τους υπολογιστές:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Προσαρμοσμένη  επιλογή:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Οδηγός Ρυθμίσεων LDAP"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον Διακομιστή NFS"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Ρυθμίσεις εξυπηρετητή Samba ..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Εξυπηρετητής Apache "
@@ -3910,6 +3999,18 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Το σύστημα σας ρυθμίζεται σαν εξυπηρετητής Apache "
 
 #, fuzzy
+#~ msgid "Mail domain:"
+#~ msgstr "Τομέας NIS:"
+
+#, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "Κατάλογος εγκατάστασης"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά σας"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/eo.po b/po/eo.po
index bb80a6d0..d8a68e1b 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "Eraro."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Gratulon"
 
@@ -137,32 +137,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Eraro"
 
@@ -348,7 +349,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 #, fuzzy
 msgid "Failed"
 msgstr "enŝaltita"
@@ -516,7 +517,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 #, fuzzy
 msgid "Error:"
 msgstr "Sorĉil-eraro."
@@ -650,7 +652,7 @@ msgstr "LDAP-servilo"
 msgid "Proxy"
 msgstr "Prokurilo"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Konfigurad-sorĉilo"
@@ -697,7 +699,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalado malsukcesis"
 
@@ -760,8 +762,8 @@ msgstr "Servil-nomo:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -874,7 +876,7 @@ msgstr "La sorĉilo sukcese konfiguris vian intraretan/interretan FTP-servilon"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -955,11 +957,21 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Sorĉilo por Kolab-konfigurado"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -967,72 +979,162 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Sorĉilo por konfiguri Teksaĵ-servilon"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "NFS-servilo"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "NFS-servilo"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Komputita domajno-nomo%s"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Komputita domajno-nomo%s"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Pasvorto:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Gastiganto-nomo:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Pasvorto:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "La sorĉilo sukcese konfiguris vian interretan poŝtservon de via servilo."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 #, fuzzy
 msgid "Hostname:"
 msgstr "Gastiganto-nomo"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "Uzul-dosierujo:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Mi konfiguras la FTP-servilon"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Mi konfiguras la FTP-servilon"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab-servilo"
 
@@ -1575,7 +1677,7 @@ msgid "Relay mail server"
 msgstr "Nomo de poŝt-servilo:"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1595,9 +1697,8 @@ msgid ""
 "relay."
 msgstr "Tiu ĉi sorĉilo helpos vin konfiguri la FTP-servilon por via reto."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informo"
 
@@ -1636,11 +1737,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Komputita domajno-nomo%s"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2432,12 +2528,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Sorĉilo por konfiguri Teksaĵ-servilon"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2742,7 +2832,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Alir-nivelo:"
@@ -3456,130 +3546,130 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba-servilo"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Plej malalta IP-adreso:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Gastiganto-nomo:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Opuza dosierujo:"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Pasvorto:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Presiloj:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "skribu liston:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3587,72 +3677,72 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Uzul-aldono"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Permesu gastigantojn:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Rifuzu gastigantojn:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Konfigurad-sorĉilo"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "La sorĉilo sukcese konfiguris vian NFS-servilon"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Mi konfiguras la FTP-servilon"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Intrareta teksaĵ-servilo:"
@@ -3905,6 +3995,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurante la DNS-servilon"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "Uzul-dosierujo:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Mi konfiguras la FTP-servilon"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/es.po b/po/es.po
index 99515b64..cab8307d 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Error."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Felicidades"
 
@@ -134,32 +134,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Error"
 
@@ -350,7 +351,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Falló"
 
@@ -523,7 +524,8 @@ msgstr ""
 "Parece que ese host ya está en su configuración DNS... persione siguiente "
 "para continuar"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Error:"
 
@@ -652,7 +654,7 @@ msgstr "Servidor LDAP"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Mostrar la configuración Ldap"
@@ -698,7 +700,7 @@ msgstr ""
 "%s no está instalado\n"
 "Pulse sobre «Siguiente» para instalarlo o sobre «Cancelar» para salir"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
@@ -764,8 +766,8 @@ msgstr "Nombre de host del servidor:"
 msgid "Admin email:"
 msgstr "Correo del admin:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Permitir conexión de root:"
 
@@ -885,7 +887,7 @@ msgstr "El asistente configuró exitosamente su servidor FTP Intranet/Internet"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Por favor, vuelva a lanzar drakwizard, e intente cambiar algunos parámetros."
@@ -978,11 +980,21 @@ msgstr ""
 "Ahora puede configurar un servidor DHCP con soporte PXE, y un servidor PXE. "
 "De esta manera será fácil instalar Mandriva Linux por medio de una red."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Asistente de configuración de Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -995,7 +1007,7 @@ msgstr ""
 "casillas de correo así como también contactos y un acceso al correo POP3 así "
 "como también IMAP4(rev1)."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1005,39 +1017,140 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. El Asistente hará una copia de respaldo de "
 "todos los archivos de configuración existentes para estos servicios."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Bienvenido al asistente de configuración del servidor Groupware Kolab."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Servidor DNS maestro"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Su servidor Ldap ya ha sido configurado"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Servidor DNS esclavo"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Nombre de dominio:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Nombre de dominio:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Ingrese contraseña para la cuenta administrador del servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "La contraseña no coinicide, o está vacía, por favor corrija."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Contraseña (de nuevo):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Nombre:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Contraseña (de nuevo):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "El asistente configurará ahora al servidor Kolab con estos parámetros"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nombre de host:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Dominio de correo:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1045,19 +1158,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Instalación en progreso"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Instalando servidor Kolab en su sistema..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando servidor Kolab en su sistema..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -1595,7 +1700,7 @@ msgid "Relay mail server"
 msgstr "Servidor de correo externo"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1614,9 +1719,8 @@ msgid ""
 "relay."
 msgstr "Este asistente lo ayudará a configurar un servidor FTP para su red."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Información"
 
@@ -1656,11 +1760,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Nombre de dominio:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2516,12 +2615,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Asistente de configuración del servidor web"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2831,7 +2924,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Nivel de acceso:"
@@ -3556,132 +3649,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Servidor Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Qué desea hacer:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Dirección IP más baja:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Nombre:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Error, debería ser un directorio."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Método de instalación:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Contraseña:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Impresoras:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Permitir conexión de root:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3689,73 +3782,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Nombre de usuario:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Hosts permitidos:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Negar hosts:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Opción personalizada:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Mostrar la configuración Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "El asistente configuró exitosamente su servidor NFS"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Configurando su servidor Samba..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Servidor Apache"
@@ -4007,6 +4100,15 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando su sistema como un servidor Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Dominio de correo:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instalación en progreso"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Instalando servidor Kolab en su sistema..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/et.po b/po/et.po
index 117149c1..86fe6699 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -34,7 +34,7 @@ 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:97
+#: ../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
@@ -44,7 +44,7 @@ msgstr "Viga."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Õnnitlused"
 
@@ -131,32 +131,33 @@ msgstr "Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Viga"
 
@@ -342,7 +343,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Ebaõnnestus"
 
@@ -512,7 +513,8 @@ msgstr ""
 "Paistab, et see masin on juba DNS-seadistuses... vajutage jätkamiseks nupule "
 "\"Järgmine\""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Viga:"
 
@@ -637,7 +639,7 @@ msgstr "LDAP-server"
 msgid "Proxy"
 msgstr "Puhverserver"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH deemoni seadistamine"
 
@@ -683,7 +685,7 @@ msgstr ""
 "Klõpsake paigaldamiseks nupule \"Järgmine\" või \"Loobu\", kui soovite "
 "loobuda"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
@@ -745,8 +747,8 @@ msgstr "Serveri nimi:"
 msgid "Admin email:"
 msgstr "Administraatori e-posti aadress:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Administraatori sisselogimise lubamine:"
 
@@ -856,7 +858,7 @@ msgstr "Nõustaja seadistas edukalt intraneti/Interneti FTP-serveri"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
 
@@ -939,11 +941,21 @@ msgstr ""
 "drakpxelinuxit ning DHCP-serveri seadistamiseks drakwizardi vastavat "
 "tööriista."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolabi seadistamise nõustaja"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -955,7 +967,7 @@ msgstr ""
 "kasutajatele kui kontaktidele ning nii POP3 kui IMAP4 (rev1) kirjade "
 "vastuvõtmiseks"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -965,39 +977,139 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth). Nõustaja teeb Teie nende teenuste "
 "varasematest konfiguratsioonifailidest varukoopia."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Tere tulemast kasutama Kolabi grupitööserveri seadistamise nõustajat."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Esmane nimeserver"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Te olete juba seadistanud oma LDAP-serveri"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Teisene nimeserver"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domeen:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domeen:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Sisestage Kolabi serveri haldurikonto parool."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Parool ei ole õige või jäi andmata, palun parandage viga."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Parool teist korda:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Eesnimi:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Parool teist korda:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Nõustaja seadistab nüüd Kolabi serveri järgmiselt:"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Masina nimi:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "E-posti domeen:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1006,19 +1118,11 @@ msgstr ""
 "(manager) aadressil https://127.0.0.1/kolab/admin/, kasutades äsja "
 "sisestatud parooli."
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Paigaldamine..."
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Kolabi serveri paigaldamine Teie süsteemi..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Teie süsteemi seadistamine Kolabi serveriks..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolabi server"
 
@@ -1543,7 +1647,7 @@ msgid "Relay mail server"
 msgstr "E-posti edastusserver"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Algaja - klassikalised valikud"
 
@@ -1563,9 +1667,8 @@ msgstr ""
 "See nõustaja aitab seadistada Teie Postfixi e-posti serveri või Postfixi e-"
 "posti edastusserveri."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Info"
 
@@ -1607,10 +1710,6 @@ msgstr ""
 "nt. myhostname = minu_masinanimi"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domeen:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2448,14 +2547,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Veebiserveri seadistamise nõustaja"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Paistab, et Teil on juba Samba-serveri seadistus olemas. Nõustaja loeb selle "
-"ja näitab, millise Samba-serveri tüübi olete varem valinud"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2779,7 +2870,7 @@ msgstr "Logifail:"
 msgid "Max log size:"
 msgstr "Maksimaalne logi suurus:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Logi tase:"
 
@@ -3514,91 +3605,91 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba jagatud ressurss"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Ekspert - täielikud ssh valikud"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Seadistamistüübi valik:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSH server, klassikalised valikud"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Jälgitav aadress:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Määrab kohaliku aadressi, mida sshd peab jälgima."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Pordi number:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "Määrab pordi, mida sshd jälgib. Vaikimisi on see 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Port peab olema arv"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Autentimisviis"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "RSA:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Avalik võti:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Autentimisvõtme fail:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Parool:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Faili rhosts ignoreerimine:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Tühja parooli lubamine:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Logi"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr "Logi tase: määrab sshd teadete logimisel kasutatava infotaseme."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr "Syslogi vahend: määrab vahendi, mida kasutada sshd teadete logimisel."
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Syslogi vahend:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Sisselogimise valikud"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3606,11 +3697,11 @@ msgstr ""
 "Viimase sisselogimise näitamine: määrab, kas sshd peab näitama kuupäeva ja "
 "kellaaega, mil kasutaja viimati sisse logis."
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Sisselogimise armuaeg:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3620,23 +3711,23 @@ msgstr ""
 "jooksul edukalt sisse loginud. 0 tähendab ajapiirangu puudumist. Vaikimisi "
 "on see 120 sekundit."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Elushoidmine:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Päevasõnumi näitamine:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Viimase sisselogimise näitamine:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Sisselogimise armuaeg peab olema arv"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3648,19 +3739,19 @@ msgstr ""
 "sest eriti algajad jätavad mõnikord teadmatusest oma kataloogi või failid "
 "kogu maailmale kättesaadavaks."
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Kasutaja sisselogimise valikud"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Karm režiim:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Lubatud kasutajad:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3668,11 +3759,11 @@ msgstr ""
 "Määramise korral on sisselogimine lubatud ainult kasutajatele, kelle nimi "
 "sobib mõne antud mustriga, nt. erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Keelatud kasutajad:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3680,11 +3771,11 @@ msgstr ""
 "Sisselogimine on keelatud kasutajatele, kelle nimi sobib mõne antud "
 "mustriga, nt. piraat guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Tihendus: määrab, kas tihendus on lubatud."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3694,27 +3785,27 @@ msgstr ""
 "suunamise keelamine ei takista kasutajal suunamast X11 liiklust, sest "
 "kasutaja võib selleks alati paigaldada omaenda vahendid."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Tihendus:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11 suunamine:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "OpenSSH seadistamise kokkuvõte."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Nõustaja seadistas edukalt Teie SSH serveri."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "SSH serveri seadistamine..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSH server"
 
@@ -3960,6 +4051,22 @@ msgstr "Apache'i server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Süsteemi seadistamine Apache'i serveriks..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "E-posti domeen:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Paigaldamine..."
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Kolabi serveri paigaldamine Teie süsteemi..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Paistab, et Teil on juba Samba-serveri seadistus olemas. Nõustaja loeb "
+#~ "selle ja näitab, millise Samba-serveri tüübi olete varem valinud"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/eu.po b/po/eu.po
index 163357dc..1a3197a4 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "Errorea."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Zorionak"
 
@@ -135,32 +135,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Errorea"
 
@@ -350,7 +351,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Huts egin du"
 
@@ -522,7 +523,8 @@ msgstr ""
 "Ostalaria dagoeneko zure DNS konfigurazioan dagoela dirudi... sakatu "
 "'Hurrengoa' jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Errorea:"
 
@@ -647,7 +649,7 @@ msgstr "ldap zerbitzaria "
 msgid "Proxy"
 msgstr "Proxy-a"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH deabru konfigurazioa"
 
@@ -692,7 +694,7 @@ msgstr ""
 "%s ez dago instalatuta\n"
 "Sakatu \"Hurrengoa\" instalatzeko, edo \"Utzi\" irteteko"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
@@ -758,8 +760,8 @@ msgstr "Zerbitzari izena:"
 msgid "Admin email:"
 msgstr "Admin helb.el.:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Baimendu root gisa saioa hasten:"
 
@@ -878,7 +880,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Berrabiarazi drakwizard, eta saiatu parametro batzuk aldatzen."
 
@@ -966,11 +968,21 @@ msgstr ""
 "drakpxelinux zure PXE zerbitzaria konfiguratzeko, eta drakwizard DHCP DHCPD "
 "zerbitzari bat konfiguratzeko."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab konfigurazio-morroia"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -982,7 +994,7 @@ msgstr ""
 "helbide-liburu partekatua, postontziko erabiltzaileentzako zerbitzuarekin "
 "eta kontaktuekin, eta postarako POP3 eta IMAP4(rev1) sarbideak"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -992,39 +1004,139 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Morroiak aurreko konfigurazio-"
 "fitxategi guztien babeskopia egingo du zerbitzu horientzat."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Ongi etorri Kolab talde-lanerako zerbitzaria konfiguratzeko morroira."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "DNS zerbitzari maisua"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Dagoeneko konfiguratu duzu zure Ldap Zerbitzaria"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Mendeko DNS zerbitzaria"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domeinua:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domeinua:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Sartu Kolab zerbitzariaren kudeatzaile-kontuaren pasahitza."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Pasahitza ez dator bat edo nulua da, zuzendu."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Pasahitza berriro:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Izena:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Pasahitza berriro:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Morroiak Kolab zerbitzaria parametro hauekin konfiguratuko du orain"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Ostalari-izena:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Postaren domeinua:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1033,19 +1145,11 @@ msgstr ""
 "saioa 'kudeatzaile' gisa helbide honetan sartutako pasahitzarekin: "
 "https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Instalatzen ari da"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Kolab zerbitzaria sisteman instalatzen..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab zerbitzaria sisteman konfiguratzen..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab zerbitzaria "
 
@@ -1578,7 +1682,7 @@ msgid "Relay mail server"
 msgstr "Errelebu posta zerbitzaria"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Hasiberria - aukera klasikoak"
 
@@ -1598,9 +1702,8 @@ msgstr ""
 "Morroi honek Postfix posta zerbitzari bat edo Postfix errelebu posta "
 "konfiguratzen lagunduko dizu."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informazioa"
 
@@ -1643,10 +1746,6 @@ msgstr ""
 "adierazten du. adib: myhostname = nereostalarizena"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domeinua:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2489,15 +2588,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Samba zerbitzariaren konfigurazio Morroia"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Aurretik Samba zerbitzari bat ezarri zenuela dirudi. Morroi honek zure "
-"konfiguraketa zaharra berrirakurriko du, eta zuk aukeratutako Postfix "
-"zerbitzari mota erakutsiko dizu"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2809,7 +2899,7 @@ msgstr "Erregistro fitxategia:"
 msgid "Max log size:"
 msgstr "Erreg neurri max:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Erregistro maila:"
 
@@ -3526,93 +3616,93 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba zerbitzaria"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Aditua - ssh aukera aurreratuak"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Zein konfiguraketa mota egin nahi duzu:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSH zerbitzaria, aukera klasikoak"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Aditu beharreko helbidea:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "sshd-ek aditu behar duen bertako helbidea zehazten du."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Ataka zenbakia:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "sshd-k aditu behar duen ataka zenbakia zehazten du. Lehenetsia 22 da."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Ataka zenbakia izan beharko luke"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Instalatzeko metodoa:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Pasahitza:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "rhosts fitxategiari jaramonik ez:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Onartu pasahitz hutsak:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3620,34 +3710,34 @@ msgstr ""
 "Inprimatu azken saio abioa: sshd-ek erabiltzaileak azken saioa abiatu "
 "zueneko data eta ordua inprimatu behar dituen hala ez"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Bizirik mantendu:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Inprimatu motd:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3655,19 +3745,19 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Saio abiapen aukerak"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Modu hertsia:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Onartu erabiltzaileak:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3675,11 +3765,11 @@ msgstr ""
 "Hala zehaztu ezkero, saio abiapena onartzen da soilik ereduekin bat datozen "
 "erabiltzaile izenentzako. adib: erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Ukatu erabiltzaileak:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3687,11 +3777,11 @@ msgstr ""
 "Saio abiapena ukatzen da ereduekin bat datozen erabiltzaile izenentzako. "
 "adib: pirate guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Konpresioa: Konpresioa onartzen den zehazten du."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3702,27 +3792,27 @@ msgstr ""
 "dezaten ekiditen, erabiltzaileek beti instalatu bait dezakete beraien "
 "berbidaltzaile propioa."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Konpresioa:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11 berbidalpena:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "OpenSSH konfigurazioaren laburpena."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Morroiak arrakastaz konfiguratu du zure SSH zerbitzaria."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Zure OpenSSH zerbitzaria konfiguratzen..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSH zerbitzaria"
 
@@ -3974,6 +4064,23 @@ msgstr "Apache zerbitzaria"
 msgid "Configuring your system as Apache server ..."
 msgstr "Sistema Apache zerbitzari gisa konfiguratzen..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Postaren domeinua:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instalatzen ari da"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Kolab zerbitzaria sisteman instalatzen..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Aurretik Samba zerbitzari bat ezarri zenuela dirudi. Morroi honek zure "
+#~ "konfiguraketa zaharra berrirakurriko du, eta zuk aukeratutako Postfix "
+#~ "zerbitzari mota erakutsiko dizu"
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/fa.po b/po/fa.po
index 5014cd12..ca0e4ace 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-02-07 21:55-0500\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "خطا."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "تبریک می‌گوئیم "
 
@@ -133,32 +133,33 @@ msgstr "شما در dhcp هستید, کارگزار ممکن است با پیک�
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "خطا"
 
@@ -346,7 +347,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "شکست خورد"
 
@@ -518,7 +519,8 @@ msgstr ""
 "بنظر می‌رسد که آن میزبان از قبل در پیکربندی DNS شما هست...بعدی را برای ادامه "
 "فشار دهید"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "خطا:"
 
@@ -648,7 +650,7 @@ msgstr "کارگزار ldap"
 msgid "Proxy"
 msgstr "پراکسی"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "نشان دادن پیکربندی Ldap"
@@ -694,7 +696,7 @@ msgstr ""
 "%s نصب نشده است\n"
 "\"بعدی\" را برای نصب یا \"لغو\" را برای ترک کردن کلیک کنید"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
@@ -760,8 +762,8 @@ msgstr "نام‌میزبان کارگزار:"
 msgid "Admin email:"
 msgstr "پست الکترونیکی مدیر:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "اجازه‌ی ثبت‌ورود مدیر:"
 
@@ -878,7 +880,7 @@ msgstr "جادوگر با موفقیت کارگزار FTP اینترنت/این�
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "جادوگر drakwizard را دوباره راه‌اندازی کرده و تلاش کنید بعضی از پارامترها را "
@@ -970,11 +972,21 @@ msgstr ""
 "میتوانید یک کارگزار DHCP با پشتیبانی PXE و یک کارگزار PXE را پیکربندی کنید. "
 "پس نصب لینوکس ﻡﺎﻧﺩﺭیﺑﺍ از طریق شبکه خیلی آسان خواهد گردید."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "جادوگر پیکربندی Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -985,7 +997,7 @@ msgstr ""
 "واسط مدیریت وب، دفتر نشانی مشترک با تدارک برای کاربران جعبه‌پست و همچنین "
 "تماس‌هاو یک POP3 و همچنین IMAP4 rev1 (دستیابی به پست)"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -995,39 +1007,140 @@ msgstr ""
 "·CyrusPostfix,·Imap,·Saslauth. جادوگر از تمام پرونده‌های پیکربندی پیشین برای "
 "این سرویس‌ها ذخیره‌ی پشتیبان خواهد ساخت."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "به جادوگر پیکربندی کارگزار گروه‌افزار Kolab خوش آمدید."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "کارگزار ارشد DNS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "شما از قبل کارگزار Ldap خود را پیکربندی کرده‌اید"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "کارگزار برده‌ی DNS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "نام‌دامنه:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "نام‌دامنه:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "گذرواژه‌‌ی برای حساب مدیر کارگزار Kolab را وارد کنید."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "عدم تطابق گذرواژه، یا هیچ گذرواژه، لطفا درستش کنید."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "گذرواژه دوباره:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "نام کوچک:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "گذرواژه دوباره:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "جادوگر اکنون کارگزار Kolab را با این پارامترها پیکربندی خواهد کرد"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "نام میزبان:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "دامنه‌ی پست:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1035,19 +1148,11 @@ msgstr ""
 "کارگزار kolab اکنون پیکربندی شده و در حال اجراست. مانند مدیر با گذرواژه‌ای که "
 "وارد کردیددر http://127.0.0.1/kolab/admin ثبت ورود کنید."
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "نصب کردن در پیشروی است"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "در حال نصب کردن کارگزار Kolab بر سیستم شما..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "در حال پیکربندی کارگزار Kolab بر سیستم شما..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "کارگزار‌ Kolab"
 
@@ -1571,7 +1676,7 @@ msgid "Relay mail server"
 msgstr "کارگزار پست بیرونی"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1590,9 +1695,8 @@ msgid ""
 "relay."
 msgstr "این جادوگر به شما در پیکربندی یک کارگزار FTP برای شبکه‌تان کمک می‌کند."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "اطلاعات"
 
@@ -1632,11 +1736,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "نام‌دامنه:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2465,12 +2564,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "جادوگر پیکربندی کارگزار وب"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2778,7 +2871,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "سطح دستیابی:"
@@ -3499,132 +3592,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "کارگزار‌ سامبا"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "چکار می‌خواهید انجام دهید:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "کوچکترین نشانی آی‌پی:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "نام کوچک:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "خطا باید یک شاخه‌ باشد."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "روش نصب:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "گذرواژه:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "چاپگرها:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "اجازه‌ی ثبت‌ورود مدیر:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3632,73 +3725,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "ثبت ورود کاربر:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "میزبان‌های مجاز:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "میزبان‌های غیرمجاز:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "گزینه‌ی اختصاصی:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "نشان دادن پیکربندی Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "جادوگر با موفقیت کارگزار NFS شما را پیکربندی کرد"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "پیکربندی کارگزار سامبای شما..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "کارگزار آپاچی"
@@ -3944,6 +4037,15 @@ msgstr "کارگزار آپاچی"
 msgid "Configuring your system as Apache server ..."
 msgstr "پیکربندی سیستم شما مانند کارگزار آپاچی ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "دامنه‌ی پست:"
+
+#~ msgid "Install in progress"
+#~ msgstr "نصب کردن در پیشروی است"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "در حال نصب کردن کارگزار Kolab بر سیستم شما..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/fi.po b/po/fi.po
index 67483ec3..ed1d7a5d 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -39,7 +39,7 @@ 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:97
+#: ../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
@@ -49,7 +49,7 @@ msgstr "Virhe."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Onnittelut"
 
@@ -136,32 +136,33 @@ msgstr "Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Virhe"
 
@@ -350,7 +351,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Epäonnistui"
 
@@ -521,7 +522,8 @@ msgstr ""
 "Näyttää siltä että tuo kone on jo DNS asetuksissasi... paina 'seuraava' "
 "jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Virhe:"
 
@@ -649,7 +651,7 @@ msgstr "LDAP palvelin"
 msgid "Proxy"
 msgstr "Välityspalvelin"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Näytä LDAP asetukset"
@@ -695,7 +697,7 @@ msgstr ""
 "%s ei ole asennettu.\n"
 "Paina \"Seuraava\" asentaaksesi tai \"Poistu\" lopettaaksesi."
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
@@ -761,8 +763,8 @@ msgstr "Palvelimen konenimi:"
 msgid "Admin email:"
 msgstr "Ylläpitäjän sähköposti:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Salli kirjautuminen root tunnuksella:"
 
@@ -877,7 +879,7 @@ msgstr "Velho asetti Intranet/Internet FTP-palvelimesi onnistuneesti"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Käyynistä drakwizard uudelleen ja yritä muuttaa joitakin parametreja."
 
@@ -969,11 +971,21 @@ msgstr ""
 "DHCP-palvelinta PXE-tuella, ja PXE-palvelinta. Sen jälkeen on helppoa "
 "asentaa Mandriva Linux verkon kautta."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab asetusvelho"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -985,7 +997,7 @@ msgstr ""
 "osoitteisto varustettuna tuella postitileille ja yhteystiedoille sekä POP3 "
 "ja IMAP4(rev1) tuki postin lukemiseen"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -995,39 +1007,140 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Velho varmuuskopioi kaikki nykysten "
 "palvelujen asetustiedostoja ennen niiden uudelleenasettaminen Kolab-tuelle."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Tervetuloa Kolab Groupware palvelimen asetusvelhoon"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Isäntä DNS-palvelin"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Olet jo määrittänyt LDAP palvelintasi"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Orja DNS-palvelin"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Verkkoalue:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Verkkoalue:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Anna Kolab-palvelimen hallintatilin salasanaa."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Salasana ei täsmää, tai tyhjää salasanaa, ole hyvä ja korjaa."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Salasana uudestaan:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Etunimi:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Salasana uudestaan:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Kolab-palvelinta asetetaan nyt näillä parametreilla."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Konenimi:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Sähköposti verkkoalue:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1035,19 +1148,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Asennus käynnissä"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Asennetaan Kolab-palvelinta järjestelmääsi..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Asetetaan järjestelmäsi Kolab-palvelinta..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab-palvelin"
 
@@ -1577,7 +1682,7 @@ msgid "Relay mail server"
 msgstr "Ulkoinen sähköpostipalvelin"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1596,9 +1701,8 @@ msgid ""
 "relay."
 msgstr "Tämä velho auttaa sinua asettamaan FTP-palvelimen verkollesi."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Tiedot"
 
@@ -1638,11 +1742,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Verkkoalue:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2492,12 +2591,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "WWW-palvelimen asetusvelho"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2806,7 +2899,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Sisäänkirjautumiskehote:"
@@ -3532,133 +3625,133 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba-palvelin"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Mitä haluat tehdä:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Matalin IP-osoite:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "uid numero:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Pitäisi olla numero"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Asennustapa:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Salasana:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Tulostimet:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Salli kirjautuminen root tunnuksella:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 #, fuzzy
 msgid "Login grace time should be a number"
 msgstr "Pitäisi olla numero"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3666,73 +3759,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Kirjautumistunnus:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Hyväksy osoitteet:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Kiellä osoitteet:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Mukautettu vaihtoehto:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Näytä LDAP asetukset"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Velho asetti NFS-palvelimen onnistuneesti."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Asetetaan Samaba-palvelimesi."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache palvelin"
@@ -3977,6 +4070,15 @@ msgstr "Apache palvelin"
 msgid "Configuring your system as Apache server ..."
 msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Sähköposti verkkoalue:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Asennus käynnissä"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Asennetaan Kolab-palvelinta järjestelmääsi..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/fr.po b/po/fr.po
index c12d5a16..f3594376 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2004-12-27 10:00+0100\n"
 "Last-Translator: clut\n"
 "Language-Team:  <fr@li.org>\n"
@@ -44,7 +44,7 @@ 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:97
+#: ../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
@@ -54,7 +54,7 @@ msgstr "Erreur."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Félicitations"
 
@@ -143,32 +143,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Erreur"
 
@@ -363,7 +364,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Échec"
 
@@ -537,7 +538,8 @@ msgstr ""
 "Il semble que cet hôte soit déjà dans la configuration de votre DNS... "
 "Appuyez sur Suivant pour continuer"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Erreur :"
 
@@ -665,7 +667,7 @@ msgstr "serveur ldap"
 msgid "Proxy"
 msgstr "Serveur Mandataire (Squid)"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Montrer la configuration Ldap"
@@ -711,7 +713,7 @@ msgstr ""
 "le paquetage %s n'est pas installé\n"
 "Cliquez sur « Suivant » pour l'installer ou « Annuler » pour quitter"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "L'installation a échoué"
 
@@ -781,8 +783,8 @@ msgstr "Nom du serveur :"
 msgid "Admin email:"
 msgstr "Adresse électronique de l'administrateur"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Autoriser root à se connecter :"
 
@@ -907,7 +909,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Relancez drakwizard en changeant quelques paramètres."
 
@@ -1004,11 +1006,21 @@ msgstr ""
 "Vous pouvez désormais configurer un serveur DHCP, puis un serveur PXE. Il "
 "sera alors très facile d'installer Mandriva Linux par le réseau."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Assistant de configuration de Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+msgid "Master kolab server"
+msgstr "Serveur DNS maître"
+
+#: ../kolab_wizard/Kolab.pm:61
+#, fuzzy
+msgid "Slave kolab server"
+msgstr "Serveur DNS secondaire"
+
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
 "features include: a web administration interface, a shared address book with "
@@ -1020,7 +1032,7 @@ msgstr ""
 "d'administration web, un carnet d'adresses partagé, et un accès mail POP3 et "
 "IMAP4."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1030,42 +1042,143 @@ msgstr ""
 "LDAP, Cyrus,Postfix, Imap, Saslauth. Cet assistant va faire une copie de "
 "sauvegarde des fichiers de configuration de ces services."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Bienvenu dans l'Assistant de configuration du serveur Kolab"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Serveur DNS maître"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Vous avez déjà configuré votre serveur Ldap"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Serveur DNS secondaire"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Nom du domaine :"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Nom du domaine :"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Entrez le mot de passe de l'administrateur Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 "Le mot de passe ne correspond pas, ou a une valeur nulle. Corrigez SVP."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Mot de Passe :"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Mot de Passe (encore une fois) :"
 
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Prénom :"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Mot de Passe (encore une fois) :"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
 # uncertain
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "L'assistant configurera votre serveur Kolab avec les paramètres suivants"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nom d'hôte :"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Domaine de courrier :"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1073,19 +1186,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Installation en cours"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Installation du serveur Kolab sur votre système..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Configuration du serveur Kolab sur votre système..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Serveur Kolab"
 
@@ -1622,7 +1727,7 @@ msgid "Relay mail server"
 msgstr "Serveur de messagerie externe"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1641,9 +1746,8 @@ msgid ""
 "relay."
 msgstr "Cet assistant vous aide à configurer un serveur FTP pour votre réseau."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informations"
 
@@ -1681,11 +1785,6 @@ msgid ""
 "system. ie: myhostname = myhostname"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Nom du domaine :"
-
 # don't know if I should translate 'myorigin', see next item
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
@@ -2562,12 +2661,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Assistant de configuration du serveur Web"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2874,7 +2967,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Niveau d'accès :"
@@ -3608,133 +3701,133 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Serveur Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Que voulez vous faire ?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Adresse IP la plus basse :"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Prénom :"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
 # I had to modify that one a bit...
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Erreur : ce doit être un répertoire."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Méthode d'installation :"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Mot de Passe :"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Imprimantes :"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Autoriser root à se connecter :"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3743,73 +3836,73 @@ msgid ""
 msgstr ""
 
 # non breaking space before colon in french
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Nom d'utilisateur :"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Hôtes autorisés :"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Hôtes non autorisés :"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Option personnalisée :"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Montrer la configuration Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "L'assistant a configuré avec succès votre serveur NFS."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Configuration du serveur Samba..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Serveur Apache"
@@ -4067,6 +4160,15 @@ msgstr "Serveur Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurer votre système en tant que serveur Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Domaine de courrier :"
+
+#~ msgid "Install in progress"
+#~ msgstr "Installation en cours"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Installation du serveur Kolab sur votre système..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/fur.po b/po/fur.po
index 08ddf8a6..15977723 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Fal."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Congratulazions"
 
@@ -133,32 +133,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Fal"
 
@@ -349,7 +350,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Falât"
 
@@ -522,7 +523,8 @@ msgstr ""
 "Al somee che l'host al sedi dizà te to configurazion DNS... frache prossin "
 "par continuâ"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Fal:"
 
@@ -652,7 +654,7 @@ msgstr "Server Kolab"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Assistent di configurazion LDAP"
@@ -698,7 +700,7 @@ msgstr ""
 "%s nol è instalât\n"
 "Frache \"Prossin\" par instalâlu o \"Scancele\" par jessî"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalazion falade"
 
@@ -766,8 +768,8 @@ msgstr "Non host dal server:"
 msgid "Admin email:"
 msgstr "Email aministratôr:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Permet login di aministratôr:"
 
@@ -886,7 +888,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Par plasè torne a inviâ drakwizard, e cîr di cambiâ cualchi parametri."
 
@@ -980,11 +982,21 @@ msgstr ""
 "tu puedis configurâ un server DHCP cun sopuart PXE, e un server PXE. Cussì "
 "al sarà une vore sempliç instalâ Mandriva Linux a mieç di une rêt."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Assistent di configurazion Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -995,7 +1007,7 @@ msgstr ""
 "plui importantis: une interface di amministrazion, une rubriche condividude "
 "cun estension mailbox, contats, POP3 e acès mail IMAP4 (rev1)"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1005,39 +1017,140 @@ msgstr ""
 "Proftpd, LDAP, Cyrus, Postfix, Imap, Saslauth. L'assistent al fasarâ un "
 "backup di ducj i toi file di configurazion par chiscj servizis."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Benvignût  tal assistent di configurazion dal server Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Server DNS primari"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, 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
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Server DNS secondari"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Non di domini:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Non di domini:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Insede le password par l'account dal aministratôr dial server Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Password no corispondent, o password vueide, par plasè, juste."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Password ancjemò:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Non:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Password ancjemò:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "L'assistent al configurarà cumò il server Kolab cun chescj parametris"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Non host:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Domini mail:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1045,19 +1158,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Instalazion in vore"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "O stoi instalant il server Kolab tal to sisteme..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "O stoi configurant il server Kolab tal to sisteme..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Server Kolab"
 
@@ -1597,7 +1702,7 @@ msgid "Relay mail server"
 msgstr "Server mail esterni"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1616,9 +1721,8 @@ msgid ""
 "relay."
 msgstr "Chest assistent a ti judarà a configurâ un server FTP pe to rêt."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informazion"
 
@@ -1658,11 +1762,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Non di domini:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2521,12 +2620,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Assistent di configurazion dal server Web"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2834,7 +2927,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Nivel di acès:"
@@ -3557,132 +3650,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Server Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Ce vuelistu fa:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Recapit IP plui bas:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Non:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Fal: e vares di sedi une cartele."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Sorte di instalazion:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Password:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Stampantis:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Permet login di aministratôr:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3690,73 +3783,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Contenidôr:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Abilite host:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Dinee host:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Opzion personalizade:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Assistent di configurazion LDAP"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "L'assistent al à configurât cun sucès il to server NFS."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "O configuri il to server Samba..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Server Apache"
@@ -4000,6 +4093,15 @@ msgstr "Server Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "O configuri il to sisteme sicu server Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Domini mail:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instalazion in vore"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "O stoi instalant il server Kolab tal to sisteme..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/ga.po b/po/ga.po
index 1caa5e7f..026150ca 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -34,7 +34,7 @@ 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:97
+#: ../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
@@ -44,7 +44,7 @@ msgstr "Earráid."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Comhghairdeas"
 
@@ -121,32 +121,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Earráid"
 
@@ -314,7 +315,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Teipthe"
 
@@ -462,7 +463,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Earráid:"
 
@@ -582,7 +584,7 @@ msgstr ""
 msgid "Proxy"
 msgstr "Seachfhreastalaí"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr ""
 
@@ -625,7 +627,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Theip ag feistiú"
 
@@ -685,8 +687,8 @@ msgstr "Ainm an fhreastalaí:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -792,7 +794,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -869,11 +871,21 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -881,64 +893,152 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+msgid "Master or slave Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid "You choose to configure a master Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Freastalaí Samba"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Fearann:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Fearann:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Focal Faire:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Ainm baiste:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+msgid "CA passphrase again:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Óstainm:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr ""
 
@@ -1426,7 +1526,7 @@ msgid "Relay mail server"
 msgstr "Freastalaí Samba"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1444,9 +1544,8 @@ msgid ""
 "relay."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Eolas"
 
@@ -1483,10 +1582,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Fearann:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2223,12 +2318,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2522,7 +2611,7 @@ msgstr "Logchomhad:"
 msgid "Max log size:"
 msgstr "Uasmhéid an logchomhaid:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Leibhéal logála:"
 
@@ -3195,126 +3284,126 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Freastalaí Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Ainm baiste:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Modh Fíordheimhnithe"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Focal Faire:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Log"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3322,67 +3411,67 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Rogha saincheaptha:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Freastalaí DNS"
diff --git a/po/gl.po b/po/gl.po
index b67b7bb0..c61f1314 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-06-17 18:52+0100\n"
 "Last-Translator: Leandro Regueiro <unho@gulo.org>\n"
 "Language-Team: Galician\n"
@@ -34,7 +34,7 @@ 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:97
+#: ../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
@@ -44,7 +44,7 @@ msgstr "Erro."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Noraboa"
 
@@ -131,32 +131,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Erro"
 
@@ -347,7 +348,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Fallou"
 
@@ -511,7 +512,8 @@ msgstr ""
 "Semella ser que esta máquina xa está na configuración do seu DNS... prema "
 "seguinte para continuar"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Erro:"
 
@@ -640,7 +642,7 @@ msgstr "Servidor ldap"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Amosa-la configuración de Ldap"
@@ -686,7 +688,7 @@ msgstr ""
 "%s non está instalado\n"
 "Prema \"Seguinte\" para instalalo ou \"Cancelar\" para saír"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Fallo na instalación"
 
@@ -753,8 +755,8 @@ msgstr "Nome de Máquina do Servidor:"
 msgid "Admin email:"
 msgstr "Correo-e do administrador:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Permitir que root entre:"
 
@@ -874,7 +876,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Volva executar drakwizard, e inténteo de novo cambiando algúns dos "
@@ -962,11 +964,21 @@ msgstr ""
 "pode configurar un servidor DHCP con soporte PXE, e un servidor PXE. Así "
 "será moi sinxelo instalar Mandriva Linux a través dunha rede."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Asistente de configuración de Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -974,7 +986,7 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -984,39 +996,140 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. O asistente fará unha copia de seguridade de "
 "tódolos ficheiros de configuración anteriores destes servicios."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Servidor DNS Mestre"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, 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
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Servidor DNS Escravo"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Nome do dominio:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Nome do dominio:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Introduza o contrasinal para a conta manager do servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Os contrasinais non coinciden ou non hai contrasinal, corríxao."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Contrasinal outra vez:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Primeiro nome:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Contrasinal outra vez:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "O asistente vai configurar o servidor Kolab con estes parámetros"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nome de máquina:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Dominio de correo:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1024,19 +1137,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Instalando"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Instalando o servidor Kolab no seu sistema..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor Kolab do seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -1556,7 +1661,7 @@ msgid "Relay mail server"
 msgstr "Servidor de correo externo"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1576,9 +1681,8 @@ msgid ""
 msgstr ""
 "Este asistente axudaralle a configurar un servidor FTP para a súa rede."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Información"
 
@@ -1616,11 +1720,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Nome do dominio:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2453,12 +2552,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Asistente de configuración do servidor web"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2767,7 +2860,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Nivel de acceso:"
@@ -3488,132 +3581,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Servidor Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Qué desexa facer:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Enderezo IP inferior:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Primeiro nome:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Erro: debe ser un directorio."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Método de instalación:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Contrasinal:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Impresoras:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Permitir que root entre:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3621,73 +3714,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Nome de Usuario:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Permitir ás máquinas:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Denegar ás máquinas:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Opción personalizada:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Amosa-la configuración de Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "O asistente configurou con éxito o seu servidor NFS."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Configurando o seu servidor Samba..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Servidor Apache"
@@ -3937,6 +4030,15 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando o seu sistema coma servidor Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Dominio de correo:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instalando"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Instalando o servidor Kolab no seu sistema..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
@@ -4116,9 +4218,6 @@ msgstr "Configurando o seu sistema coma servidor Apache..."
 #~ msgid "Form of the address:"
 #~ msgstr "Forma do enderezo:"
 
-#~ msgid "The wizard will now configure an internal mail server."
-#~ msgstr "O asistente vai configurar un servidor de correo interno."
-
 #~ msgid "The wizard successfully configured your external mail server."
 #~ msgstr "O asistente configurou con éxito o seu servidor de correo externo."
 
diff --git a/po/he.po b/po/he.po
index 0bf06cdb..544cf0e3 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -42,7 +42,7 @@ 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:97
+#: ../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
@@ -52,7 +52,7 @@ msgstr "שגיאה."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "איחולי"
 
@@ -133,32 +133,33 @@ msgstr "הנך בהגדרת DHCP, השרת עלול שלא לעבוד עם תצ�
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "שגיאה"
 
@@ -340,7 +341,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "נכשל"
 
@@ -504,7 +505,8 @@ msgid ""
 msgstr ""
 "נראה כי הלקוח כבר מופיע בתצורת ה DNS שלך... עליך לבחור \"המשך\" בכדי להמשיך"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "שגיאה:"
 
@@ -627,7 +629,7 @@ msgstr "שרת LDAP"
 msgid "Proxy"
 msgstr "שרת מתווך (Proxy)"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "הגדרת תוכנת הרקע OpenSSH"
 
@@ -672,7 +674,7 @@ msgstr ""
 "%s לא מותקן\n"
 "נא ללחוץ \"המשך\" בכדי להתקין, או \"ביטול\" כדי לצאת"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "ההתקנה נכשלה"
 
@@ -735,8 +737,8 @@ msgstr "שם השרת:"
 msgid "Admin email:"
 msgstr "דוא\"ל מנהל:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "אפשר התחברות כמנהל מערכת:"
 
@@ -845,7 +847,7 @@ msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-FTP שלך �
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "עליך להריץ מחדש את drakwizard, ולנסות לשנות מספר הגדרות."
 
@@ -926,11 +928,21 @@ msgstr ""
 "ושרת PXE, ובכך לאפשר התקנות פשוטות של לינוקס דרך הרשת. באפשרותך להיעזר ב-"
 "drakpxelinux להגדרת שרת ה-PXE שלך, וב-drakwizard DHCP כדי להגדיר שרת DHCPD."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "אשף הגדרת Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -942,7 +954,7 @@ msgstr ""
 "למשתמשי דואר אלקטרוני, כמו גם אנשי קשר וגישת POP3 ו IMAP (גרסה 1) לדואר "
 "אלקטרוני."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -951,39 +963,139 @@ msgstr ""
 "אזהרה: Kolab מחייב הגדרת שרותים רבים נוספים: Proftpd, LDAP, Cyrus, Postfix, "
 "Imap, Saslauth. האשף יגבה את קבצי התצורה הנוכחיים של שרותים אלו."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "ברוך בואך לאשף הגדרת השרת של המערכת לקבוצות עבודה Kolab."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "שרת DNS ראשי"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "כבר הגדרת את שרת הLDAP שלך"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "שרת DNS משני"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "מתחם:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "מתחם:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "עליך להגדיר סיסמת חשבון מנהל עבור שרת Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "אין התאמה בין הסיסמאות, או הוגדרה סיסמה ריקה. עליך לתקן זאת."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "סיסמה (שוב):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "שם פרטי:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "סיסמה (שוב):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "האשף יגדיר כעת את תצורת שרת Kolab לפי המאפיינים שהוגדרו"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "שם המחשב:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "מתחם הדוא\"ל:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -991,19 +1103,11 @@ msgstr ""
 "שרת Kolab מוגדר ופועל כעת. עליך להתחבר למערכת בשם משתמש 'manager' עם הסיסמה "
 "שהגדרת בכתובת https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "ההתקנה מתבצעת כעת"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "מתקין שרת Kolab על המערכת שלך..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "הגדרת שרת Kolab על המערכת שלך..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "שרת Kolab"
 
@@ -1514,7 +1618,7 @@ msgid "Relay mail server"
 msgstr "שרת דואר ניתוב"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "מתחיל - אפשרויות קלאסיות"
 
@@ -1532,9 +1636,8 @@ msgid ""
 "relay."
 msgstr "אשף זה יעזור לך להגדיר את שרת הדואר Postfix או שרת ניתוב דואר Postfix."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "מידע"
 
@@ -1573,10 +1676,6 @@ msgid ""
 msgstr "המשתנה myhostname מגדיר את שם השרת המארח של מערכת דואר זו."
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "מתחם:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2378,14 +2477,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "אשף הגדרת שרת Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"נראה כי שרת Samba כבר הוגדר. אשף זה יקרא את ההדרות הישנות, ויציג לך את סוג "
-"שרת ה- Samba שנבחר"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2680,7 +2771,7 @@ msgstr "קובץ רישום:"
 msgid "Max log size:"
 msgstr "גודל קובץ רישום מקסימלי"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "רמת דיווח:"
 
@@ -3384,102 +3475,102 @@ msgstr "לא ניתן ליצור %s. נא לבדוק מדוע האשף אינו
 msgid "Samba homes share"
 msgstr "שיתוף Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "מומחה - אפשרויות SSH מתקדמות"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "מהו סוג ההגדרה שברצונך לבצע:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "שרת SSH. אפשרויות רגילות"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "כתובת להאזנה:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "עליך לפרט את הכתובות המקומיות שעל sshd להקשיב להן."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "מספר יציאה:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "היציאה צריכה להיות ערך מספרי"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "שיטת אימות"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "אימות סיסמה:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "אפשר סיסמא ריקה:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "רישום"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "אפשרויות התחברות"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 "הדפס רישום אחרון: האם על sshd להדפיס את התאריך והזמן שהמשתמש האחרון התחבר"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3488,23 +3579,23 @@ msgstr ""
 "השרת מתנתק אחרי זמן זה אם המשתמש לא התחבר בהצלחה. אם הערך הוא 0, הזמן לא "
 "מוגבל. ברירת המחדל היא 120 שניות."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "השאר מחובר:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Print motd:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "רישום ההדפסה האחרון:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3512,66 +3603,66 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "אפשרויות התחברות משתמשים"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "אפשר משתמשים:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "הגבל משתמשים:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "דחיסה:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "תמצית הגדרות תצורת OpenSSH."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-SSH שלך"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "מגדיר את שרת ה-OpenSSH שלך..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "שרת OpenSSH"
 
@@ -3810,6 +3901,22 @@ msgstr "שרת Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "הגדרת המערכת שלך כשרת Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "מתחם הדוא\"ל:"
+
+#~ msgid "Install in progress"
+#~ msgstr "ההתקנה מתבצעת כעת"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "מתקין שרת Kolab על המערכת שלך..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "נראה כי שרת Samba כבר הוגדר. אשף זה יקרא את ההדרות הישנות, ויציג לך את "
+#~ "סוג שרת ה- Samba שנבחר"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/hi.po b/po/hi.po
index 24d657e6..6f3c3e57 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr "त्रुटि ।"
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "अभिनन्दन"
 
@@ -132,32 +132,33 @@ msgstr "आप डीएचसीपी में है, सर्वर इस
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -346,7 +347,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "असफ़लता"
 
@@ -514,7 +515,8 @@ msgstr ""
 "ऐसा लगता है कि होस्ट पहिले से ही आपके डीएनएस संरचना में है...अगला बटन को जारी रखने के "
 "लिए दबायें"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "त्रुटि:"
 
@@ -642,7 +644,7 @@ msgstr "एलडीऐपी सर्वर"
 msgid "Proxy"
 msgstr "प्रोक्सी"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "एलडीऐपी संरचना का प्रदर्शन"
@@ -688,7 +690,7 @@ msgstr ""
 "%s संसाधित नहीं है\n"
 "संसाधन के लिए \"अगला\" पर क्लिक करें या बाहर निकलने के लिए  \"निरस्त\" पर"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल रहा"
 
@@ -754,8 +756,8 @@ msgstr "सर्वर होस्ट का नाम:"
 msgid "Admin email:"
 msgstr "विपत्र प्रबंध:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "रूट संत्रारम्भ को आज्ञापत्र:"
 
@@ -872,7 +874,7 @@ msgstr "इस जादूगरी ने आपका इन्ट्रा�
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "कृपया ड्रैकविजार्ड को पुनः चलायें, और कुछ पैरामीटरों को परिवर्तित करने का प्रयास करें ।"
@@ -965,11 +967,21 @@ msgstr ""
 "पीएक्सई समर्थन  और एक पीएक्सई सर्वर के साथ संरचित कर सकते है । इसलिए मैनड्रिव लिनक्स को "
 "नेटवर्क के जरिये संसाधन करना, अब बहुत आसान हो जायेगा ।"
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "कोलैब संरचना जादूगरी"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -980,7 +992,7 @@ msgstr ""
 "एक में शामिल है: एक वेब प्रबंधन इन्टरफ़ेस, सम्पर्कों के सहित मेलबॉक्स उपयोगकर्ताओंके लिए तैयारी "
 "के साथ एक साझा पता-पुस्तिका और विपत्र पर एक पॉप३ व साथ-साथ आईमैप४(संशोधन१) पहुँच"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -990,39 +1002,140 @@ msgstr ""
 "एलडीऐपी, साइप्रस,पोस्टफ़िक्स, आईमैप, एसऐएएलऑथ । इन सेवाओं के लिए विजार्ड आपकी सभी "
 "पूर्ववर्त्ती संरचना संचिकाओं काएक बैक-अप बनायेगा ।"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "कोलैब ग्रूपवेयर सर्वर संरचना जादूगरी में स्वागत ।"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "स्वामी डीएनएस सर्वर"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "आपने पहिले से ही अपने एलडीऐपी सर्वर को संरचित कर चुके है"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "दास डीएनएस सर्वर"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "डोमेन का नाम:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "डोमेन का नाम:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "कोलैब सर्वर के प्रबंधक खाते के लिए एक कूटशब्द बतायें।"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "कूटशब्द बेमेल, या शून्य कूटशब्द, कृपया ठीक करें।"
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "कूट-शब्द:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "कूट-शब्द पुनः बतायें:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "प्रथमनाम:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "कूट-शब्द पुनः बतायें:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "इन पैरामीटरों के साथ विजार्ड अब कोलैब सर्वर को संरचित करेगा"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "होस्टनाम:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "विपत्र डोमेन:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1030,19 +1143,11 @@ msgstr ""
 "कोलैब सर्वर अब संरचित है और चल रहा है । https://127.0.0.1/kolab/admin/ पर आपके "
 "द्वारा बताये हुए कूट-शब्द को इन्टर करते हुए 'प्रबंधक' की भांति सत्र आरम्भ करें।"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "संसाधन हो रहा है"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "आपके तंत्र पर कोलैब सर्वर को संसाधित किया जा रहा है ..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "आपके तंत्र पर कोलैब सर्वर को संरचित किया जा रहा है ..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "कोलैब सर्वर"
 
@@ -1573,7 +1678,7 @@ msgid "Relay mail server"
 msgstr "बाह्य विपत्र सर्वर"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1592,9 +1697,8 @@ msgid ""
 "relay."
 msgstr "यह जादूगरी आपके नेटवर्क हेतु एक एफ़टीपी सर्वर को संरचित करने में सहायता करेगा।"
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "सूचना"
 
@@ -1634,11 +1738,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "डोमेन का नाम:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2474,12 +2573,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "वेब सर्वर संरचना जादूगरी"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2788,7 +2881,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "पहुँच स्तर:"
@@ -3511,132 +3604,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "सॉबा सर्वर"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "आप क्या करना चाहते है:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "निम्नतम आई०पी० पता:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "प्रथमनाम:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "त्रुटि, एक निर्देशिका होना चाहिए ।"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "संसाधन विधि:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "कूट-शब्द:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "प्रिन्टर्स:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "रूट संत्रारम्भ को आज्ञापत्र:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3644,73 +3737,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "उपयोगकर्ता लॉग-इन:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "होस्टों को अनुमति:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "होस्टों के लिए निषेधाज्ञा:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "कस्टम विकल्प:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "एलडीऐपी संरचना का प्रदर्शन"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "जादूगरी ने आपके एनएफ़एस सर्वर को सफ़लता-पूर्वक संरचित कर दिया है"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "आपके सॉबा सर्वर को संरचित किया जा रहा है...."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "आपाचे सर्वर"
@@ -3957,6 +4050,15 @@ msgstr "आपाचे सर्वर"
 msgid "Configuring your system as Apache server ..."
 msgstr "आपके तंत्र को एक आपाचे सर्वर की भांति संरचित किया जा रहा है ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "विपत्र डोमेन:"
+
+#~ msgid "Install in progress"
+#~ msgstr "संसाधन हो रहा है"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "आपके तंत्र पर कोलैब सर्वर को संसाधित किया जा रहा है ..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/hr.po b/po/hr.po
index 5bfa79f5..24cb3525 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-01-04 21:26+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr "Greška."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Čestitamo"
 
@@ -129,32 +129,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Greška"
 
@@ -331,7 +332,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Nije uspjelo"
 
@@ -482,7 +483,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Greška:"
 
@@ -601,7 +603,7 @@ msgstr ""
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Sistemska greška, podešavanje nije gotovo"
@@ -647,7 +649,7 @@ msgstr ""
 "%s nije instaliraj\n"
 "Kliknite \"Slijedeći\" da instalira ili \"Odustani\" da odustanete"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
@@ -708,8 +710,8 @@ msgstr "Poslužitelj:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -816,7 +818,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -893,11 +895,21 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -905,64 +917,151 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+msgid "Master or slave Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid "You choose to configure a master Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "PXE server"
+
+#: ../kolab_wizard/Kolab.pm:98
+msgid "Kolab Domain"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Ime:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+msgid "CA passphrase again:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Ime računala:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr ""
 
@@ -1457,7 +1556,7 @@ msgid "Relay mail server"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1477,9 +1576,8 @@ msgid ""
 msgstr ""
 "Ovaj čarobnjak vam pomaže konfigurirati Samba servise na vašem poslužitelju. "
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informacije"
 
@@ -1517,10 +1615,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr ""
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2289,12 +2383,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Čarobnjak za podešavanje proxy-a "
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2591,7 +2679,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr ""
 
@@ -3298,128 +3386,128 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba čarobnjak"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Što želite napraviti?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Ime:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Lozinka:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Pisači:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3427,70 +3515,70 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Dozvoli računalima:  "
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Odbij računala:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Posebna opcija:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Čarobnjak je uspješno konfigurirao vaš Samba poslužitelj. "
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 57a98a6e..ea890bca 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-09-01 22:13+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -40,7 +40,7 @@ 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:97
+#: ../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
@@ -50,7 +50,7 @@ msgstr "Hiba."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 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 ""
@@ -138,32 +140,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Hiba"
 
@@ -227,7 +230,8 @@ msgstr ""
 "programot."
 
 #: ../common/Wizcommon_gtk2.pm:95
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+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?"
@@ -354,7 +358,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Sikertelen"
 
@@ -362,7 +366,8 @@ msgstr "Sikertelen"
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
 #: ../web_wizard/Apache.pm:147
 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"
@@ -505,7 +510,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."
@@ -528,7 +534,8 @@ msgstr ""
 "Úgy tűnik, a megadott gép már szerepel a DNS beállításaiban. A folytatáshoz "
 "nyomja le a \"Következő\" gombot."
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Hiba:"
 
@@ -549,7 +556,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."
@@ -579,7 +587,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
@@ -604,7 +613,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 ..."
@@ -651,7 +661,7 @@ msgstr "LDAP-kiszolgáló"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH szolgáltatás beállítása"
 
@@ -696,7 +706,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 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "A telepítés nem sikerült"
 
@@ -764,8 +774,8 @@ msgstr "A kiszolgáló neve:"
 msgid "Admin email:"
 msgstr "Adminisztrátori email:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Rendszergazdai bejelentkezés engedélyezése:"
 
@@ -789,7 +799,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."
@@ -882,16 +893,18 @@ msgstr "A varázsló beállította az intranetes/internetes FTP-kiszolgálót."
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../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
@@ -967,11 +980,21 @@ msgstr ""
 "A PXE-kiszolgáló beállításához használja a Drakpxelinux programot, a DHCP-"
 "kiszolgáló beállításához pedig a Drakwizard DHCP-komponensét."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab-beállításvarázsló"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+msgid "Master kolab server"
+msgstr "Elsődleges DNS-kiszolgáló"
+
+#: ../kolab_wizard/Kolab.pm:61
+#, fuzzy
+msgid "Slave kolab server"
+msgstr "Másodlagos DNS-kiszolgáló"
+
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
 "features include: a web administration interface, a shared address book with "
@@ -983,7 +1006,7 @@ msgstr ""
 "megosztott címjegyzék levelezéshez és kapcsolatokhoz, valamint POP3- és "
 "IMAP4 (rev1)-hozzáférés a levelekhez."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -993,39 +1016,139 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. A varázsló mentést készít ezeknek a korábbi "
 "beállításairól."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Üdvözli a Kolab csoportmunka-kiszolgáló beállítási varázslója."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Elsődleges DNS-kiszolgáló"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Az LDAP-kiszolgáló már be lett állítva"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Másodlagos DNS-kiszolgáló"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Tartomány:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Tartomány:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Adja meg a Kolab-kiszolgáló rendszergazdai jelszavát."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "A jelszavak nem egyeznek, vagy pedig üres a jelszó - javítsa ki."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Jelszó (ismét):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Keresztnév:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Jelszó (ismét):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "A varázsló beállítja a Kolab-kiszolgálót ezekkel a paraméterekkel"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Gépnév:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Levelezési tartomány:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1034,19 +1157,11 @@ msgstr ""
 "jelentkezni 'manager' (rendszergazda) felhasználóként a \"https://127.0.0.1/"
 "kolab/admin/\" címen."
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "A telepítés folyamatban"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "A Kolab-kiszolgáló telepítése a rendszerre..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "A Kolab-kiszolgáló beállítása a rendszeren..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab-kiszolgáló"
 
@@ -1362,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
@@ -1555,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"
@@ -1582,7 +1699,7 @@ msgid "Relay mail server"
 msgstr "Továbbító levelezőkiszolgáló"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Újonc - alapvető opciók"
 
@@ -1602,9 +1719,8 @@ msgstr ""
 "Ez a varázsló segítséget nyújt egy Postfix levelezőkiszolgáló illetve egy "
 "továbbító Postfix levelezőkiszolgáló beállításához."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Információ"
 
@@ -1646,10 +1762,6 @@ msgstr ""
 "myhostname = gépnév"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Tartomány:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -1686,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."
@@ -1719,9 +1832,9 @@ msgid ""
 "the gateway itself, instead of from individual machines."
 msgstr ""
 "A bejövő levelekhez használt címnek megfelelően választandó. A címmaszkolás "
-"segítségével elrejthető egy tartományon belül levő összes gép "
-"a levelezési átjáró mögé - azt a látszatot keltve, hogy a levelek magáról az "
-"átjáróról érkeznek (nem pedig az egyes gépekről)."
+"segítségével elrejthető egy tartományon belül levő összes gép a levelezési "
+"átjáró mögé - azt a látszatot keltve, hogy a levelek magáról az átjáróról "
+"érkeznek (nem pedig az egyes gépekről)."
 
 #: ../postfix_wizard/Postfix.pm:185
 msgid ""
@@ -1756,8 +1869,8 @@ msgid ""
 "What destination domains (and subdomains thereof) this system will relay "
 "mail to. ie: mydomain.com"
 msgstr ""
-"Mely céltartományokba (és azok altartományaiba) továbbítson leveleket "
-"ez a rendszer - például \"tartomány.com\""
+"Mely céltartományokba (és azok altartományaiba) továbbítson leveleket ez a "
+"rendszer - például \"tartomány.com\""
 
 #: ../postfix_wizard/Postfix.pm:201
 msgid "Need a relayhost."
@@ -1772,8 +1885,9 @@ msgid ""
 "The network interface addresses that this mail system receives mail on. By "
 "default, the software claims all active interfaces on the machine. ie: all"
 msgstr ""
-"Azon hálózati csatolói címek, amelyeken ez a levelezőrendszer leveleket fogad. "
-"Alapértelmezés: a szoftver a gép összes aktív csatolóját felhasználja, azaz \"all\"."
+"Azon hálózati csatolói címek, amelyeken ez a levelezőrendszer leveleket "
+"fogad. Alapértelmezés: a szoftver a gép összes aktív csatolóját "
+"felhasználja, azaz \"all\"."
 
 #: ../postfix_wizard/Postfix.pm:215 ../postfix_wizard/Postfix.pm:260
 msgid "inet interfaces:"
@@ -1786,8 +1900,8 @@ msgid ""
 "destinations"
 msgstr ""
 "Azon tartományok listája, amelyek leveleit a $local_transport levélküldési "
-"transzport kezeli. Példa: $myhostname, localhost.$mydomain, "
-"/etc/postfix/destinations"
+"transzport kezeli. Példa: $myhostname, localhost.$mydomain, /etc/postfix/"
+"destinations"
 
 #: ../postfix_wizard/Postfix.pm:216 ../postfix_wizard/Postfix.pm:261
 msgid "my destination:"
@@ -1795,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:"
@@ -1806,8 +1921,8 @@ msgid ""
 "This is the list of trusted SMTP clients. For security reason, please "
 "provide one. ie: 127.0.0.0/32, 192.168.1.0/24"
 msgstr ""
-"A megbízható SMTP-kliensek listája. Biztonsági okokból érdemes megadni. Példa: "
-"127.0.0.0/32, 192.168.1.0/24"
+"A megbízható SMTP-kliensek listája. Biztonsági okokból érdemes megadni. "
+"Példa: 127.0.0.0/32, 192.168.1.0/24"
 
 #: ../postfix_wizard/Postfix.pm:229
 msgid "Message options"
@@ -1846,9 +1961,9 @@ msgid ""
 "The delay_warning_time specifies after how many hours a warning is sent that "
 "mail has not yet been delivered."
 msgstr ""
-"A delay_warning_time (figyelmeztetés késleltetésének időtartama) megadja, hogy "
-"hány óra elteltével legyen küldve figyelmeztetés arról, hogy a levél még nem "
-"lett kézbesítve."
+"A delay_warning_time (figyelmeztetés késleltetésének időtartama) megadja, "
+"hogy hány óra elteltével legyen küldve figyelmeztetés arról, hogy a levél "
+"még nem lett kézbesítve."
 
 #: ../postfix_wizard/Postfix.pm:243
 msgid ""
@@ -1942,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."
@@ -1960,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ó."
@@ -2067,7 +2185,8 @@ 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:"
@@ -2181,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 ""
@@ -2225,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"
@@ -2256,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
@@ -2268,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"
@@ -2306,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."
@@ -2370,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 ""
@@ -2391,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\" "
@@ -2432,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"
@@ -2497,12 +2626,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Webkiszolgáló-beállítási varázsló"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2520,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
@@ -2750,7 +2874,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"
@@ -2814,7 +2939,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Hozzáférési szint:"
@@ -2882,7 +3007,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"
@@ -3022,7 +3148,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?"
@@ -3066,7 +3193,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
@@ -3538,99 +3666,99 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba-kiszolgáló"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Szakértő - speciális SSH-opciók"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Milyen fajta beállítást szeretne:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSH-kiszolgáló, klasszikus opciók"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Figyelési (listen) cím:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
-"Megadja azokat a helyi címeket, amelyeken az Sshd szolgáltatásnak "
-"figyelnie kell"
+"Megadja azokat a helyi címeket, amelyeken az Sshd szolgáltatásnak figyelnie "
+"kell"
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Portszám:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 "Megadja a portszámot, amelyen az Sshd szolgáltatásnak figyelnie kell. "
 "Alapértelmezés: 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Portként egy számot kell megadni"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Azonosítási módszer"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "RSA azonosítás:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Nyilvános kulcsos azonosítás:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Azonosítási kulcs fájlja:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Jelszavas azonosítás:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Az rhosts fájl figyelmen kívül hagyása:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Üres jelszó engedélyezése:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Napló"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
-"Naplózási szint: megadja, hogy mennyire legyen részletes az Sshd szolgáltatás "
-"üzeneteinek naplózása"
+"Naplózási szint: megadja, hogy mennyire legyen részletes az Sshd "
+"szolgáltatás üzeneteinek naplózása"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
-"Rendszernaplózási eszköz: megadja, hogy milyen eszközzel legyen végezve "
-"az Sshd szolgáltatás üzeneteinek naplózása"
+"Rendszernaplózási eszköz: megadja, hogy milyen eszközzel legyen végezve az "
+"Sshd szolgáltatás üzeneteinek naplózása"
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Rendszernaplózási eszköz:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Bejelentkezési opciók"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3638,11 +3766,11 @@ msgstr ""
 "Legutóbbi bejelentkezés kiírása: az Sshd szolgáltatás kiírja-e a felhasználó "
 "legutóbbi bejelentkezésének dátumát és idejét"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Bejelentkezési haladék:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3652,105 +3780,104 @@ msgstr ""
 "nem jelentkezett be sikeresen. Ha az érték 0, akkor nincs időkorlát. "
 "Alapértelmezés: 120 másodperc."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Életben tartás:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Motd kiírása:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Legutóbbi bejelentkezés kiírása:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Bejelentkezési haladékként egy számot kell megadni"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
 "normally desirable because novices sometimes accidentally leave their "
 "directory or files world-writable"
 msgstr ""
-"Szigorított üzemmódok: megadja, hogy az Sshd szolgáltatás ellenőrizze-e "
-"a felhasználó fájljainak és saját könyvtárának engedélyeit és tulajdonosát "
-"a bejelentkezés elfogadása előtt. Ezt általában érdemes használni, "
-"mivel kezdő felhasználóknál előfordul, hogy mindenki által írható állapotban "
-"hagyják a könyvtárukat illetve a fájljaikat."
+"Szigorított üzemmódok: megadja, hogy az Sshd szolgáltatás ellenőrizze-e a "
+"felhasználó fájljainak és saját könyvtárának engedélyeit és tulajdonosát a "
+"bejelentkezés elfogadása előtt. Ezt általában érdemes használni, mivel kezdő "
+"felhasználóknál előfordul, hogy mindenki által írható állapotban hagyják a "
+"könyvtárukat illetve a fájljaikat."
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Felhasználói bejelentkezési opciók"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Szigorított üzemmódok:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Engedélyezett felhasználók:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
-"Ha meg van adva, akkor a bejelentkezés csak olyan felhasználónevek "
-"esetében engedélyezett, amelyek illeszkednek valamelyik mintára. "
-"Példa: erwan aginies guibo"
+"Ha meg van adva, akkor a bejelentkezés csak olyan felhasználónevek esetében "
+"engedélyezett, amelyek illeszkednek valamelyik mintára. Példa: erwan aginies "
+"guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Letiltott felhasználók:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
-"A bejelentkezés nem engedélyezett azon felhasználónevek "
-"esetében, amelyek illeszkednek valamelyik mintára. "
-"Példa: pirate guillomovitch"
+"A bejelentkezés nem engedélyezett azon felhasználónevek esetében, amelyek "
+"illeszkednek valamelyik mintára. Példa: pirate guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Tömörítés: megadja, hogy engedélyezett-e a tömörítés"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 "X11-továbbítás: megadja, hogy engedélyezett-e az X11-továbbítás. Megjegyzés: "
-"az X11-továbbítás kikapcsolása nem akadályozza meg a felhasználókat az "
-"X11-forgalom továbbításában, mivel a felhasználók bármikor telepíthetik a "
-"saját továbbítóikat."
+"az X11-továbbítás kikapcsolása nem akadályozza meg a felhasználókat az X11-"
+"forgalom továbbításában, mivel a felhasználók bármikor telepíthetik a saját "
+"továbbítóikat."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Tömörítés:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11-továbbítás:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Az OpenSSH-beállítás összefoglalása"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "A varázsló beállította az SSH-kiszolgálót."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Az OpenSSH-kiszolgáló beállítása..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSH-kiszolgáló"
 
@@ -3893,7 +4020,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:"
@@ -4002,3 +4130,11 @@ msgstr "Apache-kiszolgáló"
 msgid "Configuring your system as Apache server ..."
 msgstr "A rendszer beállítása Apache-kiszolgálónak..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Levelezési tartomány:"
+
+#~ msgid "Install in progress"
+#~ msgstr "A telepítés folyamatban"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "A Kolab-kiszolgáló telepítése a rendszerre..."
diff --git a/po/id.po b/po/id.po
index ece5012e..f82eea3d 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-08-31 23:20+0700\n"
 "Last-Translator: Sofian Hanafi <sofianhanafi@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -40,7 +40,7 @@ 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:97
+#: ../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
@@ -50,7 +50,7 @@ msgstr "Kesalahan."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Selamat"
 
@@ -138,32 +138,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -354,7 +355,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Gagal"
 
@@ -526,7 +527,8 @@ msgstr ""
 "Tampaknya host sudah berada dalam konfigurasi DNS Anda... tekan berikutnya "
 "untuk melanjutkan"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Kesalahan:"
 
@@ -651,7 +653,7 @@ msgstr "Server LDAP"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Konfigurasi daemon OpenSSH"
 
@@ -696,7 +698,7 @@ msgstr ""
 "%s tidak terinstall\n"
 "Klik \"Berikutnya\" untuk menginstal atau \"Batal\" untuk keluar"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
@@ -761,8 +763,8 @@ msgstr "Nama Server:"
 msgid "Admin email:"
 msgstr "Email Admin:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Ijinkan login root:"
 
@@ -875,7 +877,7 @@ msgstr "Wizard berhasil mengkonfigurasikan server FTP Intranet/Internet Anda"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Harap jalankan ulang drakwizard, dan coba ubah beberapa parameter."
 
@@ -963,11 +965,21 @@ msgstr ""
 "drakpxelinux untuk mengkonfigurasi server PXE Anda, dan drakwizard DHCP "
 "untuk mengkonfigurasi sebuah server DHCPD."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Wizard konfigurasi Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -978,7 +990,7 @@ msgstr ""
 "meliputi: administrasi berbasis web, buku alamat untuk mailbox pengguna dan "
 "juga akses POP3 serta IMAP4 (rev1) untuk email"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -988,39 +1000,139 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Wizard akan membuat cadangan dari file "
 "konfigurasi Anda sebelumnya untuk layanan ini."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Selamat datang ke Wizard konfigurasi server Groupware Kolab."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Server DNS Master"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Anda telah mengkonfigurasikan server LDAP Anda"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Server DNS Slave"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domain:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domain:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Masukkan katasandi untuk account manajer dari server Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Katasandi tidak sesuai, atau katasandi kosong, harap diperbaiki."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Katasandi:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Katasandi lagi:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Nama Depan:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Katasandi lagi:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Wizard akan mengkonfigurasi server Kolab dengan parameter berikut"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nama host:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Domain Mail:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1028,19 +1140,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Installasi sedang berlangsung"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Menginstall server Kolab pada sistem Anda..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Mengkonfigurasi server Kolab pada sistem Anda..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Server Kolab"
 
@@ -1567,7 +1671,7 @@ msgid "Relay mail server"
 msgstr "Server mail relay"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Pemula - Opsi klasik"
 
@@ -1587,9 +1691,8 @@ msgstr ""
 "Wizard ini akan membantu Anda mengkonfigurasi sebuah server mail Postfix "
 "atau mail relay Postfix."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informasi"
 
@@ -1632,10 +1735,6 @@ msgstr ""
 "misalnya: myhostname = myhostname"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domain:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -1715,8 +1814,8 @@ msgid ""
 "Masquerade should be a valid domain name such as \"domain_to_masquerade.com "
 "with_this_domain.com\"!"
 msgstr ""
-"Masquerade harus berupa nama domain yang valid seperti \"domain_yang_hendak_dimasquerade.com "
-"dengan_domain_ini.com\"!"
+"Masquerade harus berupa nama domain yang valid seperti "
+"\"domain_yang_hendak_dimasquerade.com dengan_domain_ini.com\"!"
 
 #: ../postfix_wizard/Postfix.pm:192
 msgid ""
@@ -2485,15 +2584,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Wizard konfigurasi server Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Tampaknya Anda telah mensetting server Samba sebelumnya. Wizard ini akan "
-"membaca ulang konfigurasi lama Anda, dan menampilkan jenis server Samba yang "
-"Anda pilih"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2820,7 +2910,7 @@ msgstr "File log:"
 msgid "Max log size:"
 msgstr "Ukuran maksimal log"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Level log:"
 
@@ -3559,71 +3649,71 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Share home Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Ahli - opsi ssh tingkat lanjut"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Jenis konfigurasi apa yang hendak Anda lakukan:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "Server SSH, opsi klasik"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Alamat IP yang didengarkan:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Menentukan alamat lokal yang harus didengarkan oleh sshd."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Nomor port:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "Menentukan nomor port yang harus didengarkan sshd. Defaultnya 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Port seharusnya sebuah nomor"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Metode otentikasi"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "Otentikasi RSA:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Otentikasi KunciPublik:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Otentikasi file kunci:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Otentikasi katasandi:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Abaikan file rhosts:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Ijinkan katasandi kosong:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Log"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
@@ -3631,7 +3721,7 @@ msgstr ""
 "Level log: memberikan level kejelasan yang digunakan ketika mencatat pesan "
 "dari sshd."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
@@ -3639,15 +3729,15 @@ msgstr ""
 "Fasilitas syslog: memberikan kode fasilitas yang digunakan ketika mencatat "
 "pesan dari sshd"
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Fasilitas syslog:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Opsi login"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3655,11 +3745,11 @@ msgstr ""
 "Cetak log terakhir : apakah sshd harus mencetak tanggal dan waktu kapan "
 "ppengguna login"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Waktu login umum:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3668,23 +3758,23 @@ msgstr ""
 "Server terputus setelah waktu ini jika pengguna belum login. Jika nilainya "
 "0, maka tidak ada batas waktu. Default adalah 120 detik."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Tetap pertahankan:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Cetak motd:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Cetak log terakhir:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Waktu login umum seharusnya sebuah angka"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3696,19 +3786,19 @@ msgstr ""
 "umumnya diinginkan karena pemula seringkali membiarkan direktori atau "
 "filenya dapat ditulis oleh semua orang."
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Opsi Login pengguna"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Mode ketat:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Izinkan pengguna:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3716,11 +3806,11 @@ msgstr ""
 "Jika ditentukan, login selalu diijinkan hanya dari nama pengguna yang sesuai "
 "dengan salah satu pola. Misalnya erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Tolak pengguna:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3728,11 +3818,11 @@ msgstr ""
 "Login tidak diperbolehkan untuk nama pengguna yang sesuai dengan salah satu "
 "pola. Misalnya pirate guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Kompresi: Menentukan apakah kompresi diperbolehkan."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3742,27 +3832,27 @@ msgstr ""
 "menonaktifkan penerusan X11 tidak mencegah pengguna untuk melewatkan beban "
 "penerusan X11, karena pengguna dapat selalu menginstall forwarder mereka."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Kompresi:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "Penerusan X11:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Ringkasan dari konfigurasi OpenSSH."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Wizard berhasil mengkonfigurasikan server SSH Anda."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Mengkonfigurasi server OpenSSH Anda..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "Server OpenSSH"
 
@@ -4008,6 +4098,23 @@ msgstr "Server Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Mengkonfigurasi sistem Anda sebagai server Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Domain Mail:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Installasi sedang berlangsung"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Menginstall server Kolab pada sistem Anda..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Tampaknya Anda telah mensetting server Samba sebelumnya. Wizard ini akan "
+#~ "membaca ulang konfigurasi lama Anda, dan menampilkan jenis server Samba "
+#~ "yang Anda pilih"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/is.po b/po/is.po
index a1e32614..766036bc 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-07-24 00:16+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <isl@molar.is>\n"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Villa."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Til hamingju"
 
@@ -132,32 +132,33 @@ msgstr "Þú ert í dhcp, miðlari mun kannski ekki virka með þinni uppsetning
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Villa"
 
@@ -344,7 +345,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Mistókst"
 
@@ -515,7 +516,8 @@ msgstr ""
 "Það lítur út fyrir að vélin sé þegar í DNS uppsetningunni þinni... Smellið á "
 "\"Næsta\" til að halda áfram"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Villa:"
 
@@ -641,7 +643,7 @@ msgstr "ldap miðlari"
 msgid "Proxy"
 msgstr "Vefsel"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH þjónustustillingar"
 
@@ -686,7 +688,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 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Uppsetning mistókst"
 
@@ -751,8 +753,8 @@ msgstr "Nafn miðlara:"
 msgid "Admin email:"
 msgstr "Netfang stjórnanda:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Leyfa rótaraðgang:"
 
@@ -865,7 +867,7 @@ msgstr "Ráðgjafinn hefur sett upp staðarnet/Internet FTP miðlarann þinn"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Vinsamlega enduræsið drakwizard og reynið að breyta einhverjum gildum."
 
@@ -949,11 +951,21 @@ msgstr ""
 "að setja upp Linux um net. Notaðu drakpxelinux til að stilla PXE miðlarann "
 "þinn, og drakwizard DHCP til að stilla DHCPD miðlara."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab stillingarráðgjafi"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+msgid "Master kolab server"
+msgstr "Aðal DNS nafnamiðlari"
+
+#: ../kolab_wizard/Kolab.pm:61
+#, fuzzy
+msgid "Slave kolab server"
+msgstr "Vara DNS nafnamiðlari"
+
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
 "features include: a web administration interface, a shared address book with "
@@ -964,7 +976,7 @@ msgstr ""
 "má telja:vefstjórnunar-umsjónarkerfi, miðlæga vistfanga-bók með netföngum og "
 "öðrum samskiptaupplýsingum. Einnig POP3 og IMAP4 (útg1) aðgangi að pósti"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -974,39 +986,139 @@ msgstr ""
 "Postfix, Imap, Saslauth. Ráðgjafinn mun afrita allar þínar fyrri "
 "stillingaskrár fyrir þessar þjónustur."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Velkomin að Kolab hópvinnumiðlara-ráðgjafanum."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Aðal DNS nafnamiðlari"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Þú hefur þegar stillt Ldap miðlarann þinn"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Vara DNS nafnamiðlari"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Lén:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Lén:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Gefið upp lykilorð fyrir aðgang stjórnanda Kolab miðlarans."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Lykilorð eru ekki eins, eða lykilorð autt, vinsamlega leiðréttið."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Lykilorð aftur:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Eiginnafn:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Lykilorð aftur:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Ráðgjafinn mun nú stilla Kolab miðlarann með þessum gildum"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Vélarheiti:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Póstlén:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1014,19 +1126,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Uppsetning í gangi"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Set upp Kolab miðlara á kerfið þitt..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Stilli Kolab miðlara á þínu kerfi..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab miðlari"
 
@@ -1549,7 +1653,7 @@ msgid "Relay mail server"
 msgstr "Póstflutnings-þjónn"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Byrjandi - klassískir valkostir"
 
@@ -1569,9 +1673,8 @@ msgstr ""
 "Þessi ráðgjafi hjálpar þér við að setja upp Postfix póstmiðlara eða Postfix "
 "framsendi-póstþjónustu."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Upplýsingar"
 
@@ -1613,10 +1716,6 @@ msgstr ""
 "myhostname = myhostname"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Lén:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2455,14 +2554,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Stillingarráðgjafi fyrir Samba miðlara"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Það lítur út fyrir að þú hafir þegar sett upp Samba miðlara. Þessi ráðgjafi "
-"mun lesa stillingar þínar og sýna þér Samba miðlarann sem þú hefur valið"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2784,7 +2875,7 @@ msgstr "Annálaskrá:"
 msgid "Max log size:"
 msgstr "Hámarksstærð annáls:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Annálsþrep:"
 
@@ -3530,71 +3621,71 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba miðlað svæði"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Sérfræðingur - ítarlegri ssh valkostir"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Hvers konar uppsetningu vilt þú framkvæma:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSH miðlari, klassískir valkostir"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Hlustunar-vistfang:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Tilgreinir staðbundin IP vistföng sem sshd ætti að hlusta á."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Port-númer:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "Tilgreinir port-númer sem sshd hlustar á. sjálfgefið er 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Port ætti að vera tala"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Auðkenningaraðferð"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "RSA auðkenning:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Dreifilykils-auðkenning:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Auðkenningarskrá:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Lykilorðs-auðkenning:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Hunsa rhosts skrá:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Leyfa auð lykilorð:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Annáll"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
@@ -3602,7 +3693,7 @@ msgstr ""
 "Annálsþrep: tilgreinir hversu mikið af upplýsingum er skráð í kerfisannála "
 "frá sshd."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
@@ -3610,15 +3701,15 @@ msgstr ""
 "Syslog facility: tiltekur 'facility' kóða sem notaður er við skráningu "
 "skeyta frá sshd"
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Syslog facility:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Innskráningar-valkostir"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3626,11 +3717,11 @@ msgstr ""
 "Sýna síðustu lotu: hvort sshd ætti að prenta dagsetningu og tíma þegar "
 "notandi skráði sig síðast inn"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Innskráningar-tími:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3640,23 +3731,23 @@ msgstr ""
 "skrá sig inn. Ef gildið er 0, þá eru engin tímamörk. sjálfgefið er 120 "
 "sekúndur."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Halda lifandi:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Prenta motd:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Sýna síðustu lotu:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Innskráningar-tími ætti að vera tala"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3668,19 +3759,19 @@ msgstr ""
 "er samþykktur. Þetta er venjulega æskilegt því byrjendur skilja oft eftir "
 "möppur sínar og skrár þannig að allir geti skrifað í þær"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Innskráningar-valkostir notanda"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Ströng skráaskoðun:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Leyfa notendur:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3688,11 +3779,11 @@ msgstr ""
 "Ef tilgreint, þá er innskráning aðeins leyfð fyrir notendur sem passa við "
 "tilgreind mynstur. t.d. jon pall siggi"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Hafna notendum:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3700,11 +3791,11 @@ msgstr ""
 "Skráning er ekki leyfð fyrir notendur sem passa við eitthvað af mynstrunum. "
 "t.d. lundi ruddi"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Þjöppun: Skilgreinir hvort þjöppun gagna sé leyfð."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3714,27 +3805,27 @@ msgstr ""
 "slökkt sé á X11 endurvörpun þá varnar það ekki notendum að senda áfram X11 "
 "gögn, því notendur geta ætíð sett upp sína eigin endurvörpun."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Þjöppun:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11 endurvörpun:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Samantekt á OpenSSH stillingum."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Ráðgjafinn hefur stillt SSH miðlarann þinn."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Set upp OpenSSH miðlarann þinn..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSH miðlari"
 
@@ -3979,6 +4070,23 @@ msgstr "Apache miðlari"
 msgid "Configuring your system as Apache server ..."
 msgstr "Set upp kerfið þitt sem Apache miðlara ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Póstlén:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Uppsetning í gangi"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Set upp Kolab miðlara á kerfið þitt..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Það lítur út fyrir að þú hafir þegar sett upp Samba miðlara. Þessi "
+#~ "ráðgjafi mun lesa stillingar þínar og sýna þér Samba miðlarann sem þú "
+#~ "hefur valið"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/it.po b/po/it.po
index f47be4ff..4d9f0d1c 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr "Errore."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Congratulazioni"
 
@@ -136,32 +136,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Errore"
 
@@ -355,7 +356,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Fallito"
 
@@ -527,7 +528,8 @@ msgstr ""
 "Sembra che l'host sia già presente nella configurazione del DNS... fai clic "
 "su \"Continua\" per andare avanti"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Errore:"
 
@@ -656,7 +658,7 @@ msgstr "Server LDAP"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Configurazione del demone OpenSSH"
 
@@ -701,7 +703,7 @@ msgstr ""
 "%s non è installato.\n"
 "Premi \"Avanti\" per installarlo o \"Annulla\" per uscire."
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Installazione non riuscita"
 
@@ -764,8 +766,8 @@ msgstr "Nome del Server:"
 msgid "Admin email:"
 msgstr "Email di amministrazione:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Permetti accesso come root:"
 
@@ -886,7 +888,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Per favore riavvia drakwizard e cerca di modificare alcuni parametri"
 
@@ -979,11 +981,21 @@ msgstr ""
 "Usa drakpxelinux per configurare il tuo server PXE, e drakwizard DHCP per "
 "configurare un server DHCP."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Assistente di configurazione di Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -996,7 +1008,7 @@ msgstr ""
 "avere caselle postali e gestire i contatti e un accesso ai servizi postali "
 "sia tramite POP3 che tramite IMAP4(rev1)."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1007,41 +1019,142 @@ msgstr ""
 "una copia di backup di tutti i precedenti file di configurazione per "
 "questi servizi."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Benvenuti nell'assistente di configurazione del server Kolab Groupware"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Server DNS primario"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Il server LDAP è già stato configurato"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Server DNS secondario"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Nome di dominio:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Nome di dominio:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Immetti una password per l'amministratore del server Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Password non coincidenti o vuote. Devi correggere."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Ripeti password:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Nome:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Ripeti password:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "L'assistente adesso effettuerà la configurazione del server Kolab con "
 "questiparametri"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nome computer:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Dominio posta elettronica:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1049,19 +1162,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Installazione in corso"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Installazione del server Kolab sul sistema"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurazione del server Kolab sul sistema..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Server Kolab"
 
@@ -1601,7 +1706,7 @@ msgid "Relay mail server"
 msgstr "Server di posta esterno"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 #, fuzzy
 msgid "Newbie - classical options"
 msgstr "Principiante - opzioni tipiche"
@@ -1623,9 +1728,8 @@ msgstr ""
 "Questo assistente ti aiuterà a configurare un server di posta Postfix o "
 "server di posta Postfix esterno"
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informazioni"
 
@@ -1672,11 +1776,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Nome di dominio:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2561,15 +2660,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Assistente di configurazione del server Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Sembra che precedentemente sia stata installato un server Samba. Questo "
-"assistente riconoscerà la vecchia configurazione, e ti mostrerà il tipo di "
-"server Samba che hai scelto"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2919,7 +3009,7 @@ msgstr "File di Log:"
 msgid "Max log size:"
 msgstr "Dimensione massima del file di log"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Livello di accesso:"
@@ -3706,96 +3796,96 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Condivisione Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Esperto - Opzioni avanzate ssh"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Che tipo di configurazione intendi fare:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "Server SSH, opzioni tipiche"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Indirizzo d'ascolto:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Specifica gli indirizzi locali su cui sshd dovrebbe stare in ascolto."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Numero di porta:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 "Specifica il numero di porta su cui il demone sshd ascolta. Di default "
 "ascolta sulla porta 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "la porta dovrebbe essere un numero"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Metodo di autenticazione"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Password:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Permette password vuota:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "File di log"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Opzioni di login"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3803,12 +3893,12 @@ msgstr ""
 "Stampa l'ultimo log: sshd dovrebbe stampare la data e l'ora di "
 "quandol'ultimo utente si è loggato"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 #, fuzzy
 msgid "Login Grace time:"
 msgstr "Tempo necessario per loggarsi:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3818,25 +3908,25 @@ msgstr ""
 "con successo. Se il valore è zero, non viene fissato alcun tempo limite. Il "
 "default è 120 secondi."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 #, fuzzy
 msgid "Keep alive:"
 msgstr "Mantieni connesso:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Stampanti:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Stampa l'ultimo log:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Il tempo \" Login grace \" deve essere un numero"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
@@ -3848,21 +3938,21 @@ msgstr ""
 "generalmente consigliabile perchè i novizi inavvertitamente lasciano le loro "
 "directory o file scrivibili a tutti"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Opzioni per il login dell'utente:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Metodi rigorosi:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Utenti abilitati:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3870,12 +3960,12 @@ msgstr ""
 "Se specificato, il login è permesso soltanto agli utenti il cui nome "
 "corrisponde a uno di quelli abilitati. Ad es. guido pincopallino antonio"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Utenti rifiutati:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3883,11 +3973,11 @@ msgstr ""
 "Il login è rifiutato agli utenti il cui nome non corrisponde a uno diquelli "
 "abilitati. Ad es. pirata nemo"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Compressione: specifica se la compressione è permessa."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 #, fuzzy
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
@@ -3898,30 +3988,30 @@ msgstr ""
 "disabilitando \"X11 forwarding \" non impedisci agli utenti di inoltrare "
 "traffico X11, come utenti possono sempre installare le proprie forwarders."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Compressione:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11 forwarding:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Sommario della configurazione OpenSSH"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server SSH"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Configurando il tuo server OpenSSH..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "Server OpenSSH"
 
@@ -4172,6 +4262,23 @@ msgstr "Server web Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurazione del server Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Dominio posta elettronica:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Installazione in corso"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Installazione del server Kolab sul sistema"
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Sembra che precedentemente sia stata installato un server Samba. Questo "
+#~ "assistente riconoscerà la vecchia configurazione, e ti mostrerà il tipo "
+#~ "di server Samba che hai scelto"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/ja.po b/po/ja.po
index f492cc05..51d3925b 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-08-31 23:30+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "エラー"
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "おめでとうございます"
 
@@ -132,32 +132,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "エラー"
 
@@ -339,7 +340,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "失敗しました。"
 
@@ -501,7 +502,8 @@ msgid ""
 "continue"
 msgstr "ホストがすでにDNS設定にあるようです。[次へ]を押すと設定を続けます。"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "エラー:"
 
@@ -624,7 +626,7 @@ msgstr "LDAPサーバ"
 msgid "Proxy"
 msgstr "プロクシ"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSHデーモンの設定"
 
@@ -670,7 +672,7 @@ msgstr ""
 "[次へ]を押すとインストールを開始します。\n"
 "中止する場合は[キャンセル]を押してください。"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "インストールに失敗しました。"
 
@@ -734,8 +736,8 @@ msgstr "サーバ名:"
 msgid "Admin email:"
 msgstr "管理者のEmail:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "rootログインを許可:"
 
@@ -842,7 +844,7 @@ msgstr "イントラネット/インターネットFTPサーバの設定が完�
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizardを再起動して設定を変更してみてください。"
 
@@ -928,11 +930,21 @@ msgstr ""
 "で簡単にLinuxのインストールができるようになります。PXEサーバとDHCPDサーバの設"
 "定にはdrakpxelinuxとdrakwizard DHCPをそれぞれ使ってください。"
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolabの設定ウィザード"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -943,7 +955,7 @@ msgstr ""
 "フェースによる管理、アドレス帳・連絡先の共有、POP3とIMAP4メールへのアクセス等"
 "の機能を備えています。"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -953,39 +965,139 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth。このウィザードはこれらのサービスの既存"
 "の設定ファイルのバックアップを作成します。"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Kolabグループウェアサーバの設定ウィザードへようこそ"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "マスターDNSサーバ"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "LDAPサーバはすでに設定されています。"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "スレーブDNSサーバ"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "ドメイン:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "ドメイン:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Kolabサーバの管理者のパスワードを入力してください。"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "パスワードが一致していません。修正してください。"
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "パスワード確認:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "下の名前:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "パスワード確認:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "以下の内容でKolabサーバを設定します。"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "ホスト名:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "メールドメイン:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -994,19 +1106,11 @@ msgstr ""
 "い。\n"
 "https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "インストール中"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Kolabサーバをインストールしています..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "システムのKolabサーバを設定..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolabサーバ"
 
@@ -1518,7 +1622,7 @@ msgid "Relay mail server"
 msgstr "リレーメールサーバ"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "初心者 - 標準的なオプション"
 
@@ -1538,9 +1642,8 @@ msgstr ""
 "このウィザードはpostfixメールサーバまたはpostfixメールリレーの設定をお手伝い"
 "します。"
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "情報"
 
@@ -1581,10 +1684,6 @@ msgstr ""
 "します。(例: myhostname = myhostname)"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "ドメイン:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -1613,7 +1712,8 @@ msgid "You must provide an internet hostname of this mail system."
 msgstr "このメールシステムのインターネットホストネームを指定してください。"
 
 #: ../postfix_wizard/Postfix.pm:168
-msgid "You must specifiy the local internet domain name."
+#, fuzzy
+msgid "You must specify the local internet domain name."
 msgstr "ローカルインターネットドメイン名を指定してください。"
 
 #: ../postfix_wizard/Postfix.pm:172
@@ -2403,14 +2503,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Sambaサーバの設定ウィザード"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"以前にSambaサーバを設定されているようです。このウィザードは古い設定を読み込ん"
-"で選択されたSambaサーバのタイプを表示します。"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2734,7 +2826,7 @@ msgstr "ログファイル:"
 msgid "Max log size:"
 msgstr "ログの最大サイズ:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "ログレベル:"
 
@@ -3448,77 +3540,77 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba home共有"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "上級 - SSHの詳細オプション"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "どのタイプの設定をしますか:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSHサーバ - 標準的オプション"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "listenするアドレス:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "sshdがlistenするローカルアドレスを指定します。"
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "ポート番号:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "sshdがlistenするポート番号を指定します。デフォルトは22です。"
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "ポートは数字で指定してください。"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "認証方法"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "RSA認証:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "公開鍵認証:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "認証鍵ファイル:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "パスワード認証:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "rhostsファイルを無視:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "空白のパスワードを認める:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "ログ"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr "ログレベル: sshdからのメッセージを記録する際の詳細レベルを指定"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
@@ -3526,15 +3618,15 @@ msgstr ""
 "syslog facility: sshdからのメッセージを記録する時に使用される facility code "
 "を提供します。"
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Syslog facility:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "ログインのオプション"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3542,11 +3634,11 @@ msgstr ""
 "前回のログを表示: sshdにユーザが前回ログインした日付と時間を表示させるかどう"
 "か。"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "ログイン猶予時間:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3555,23 +3647,23 @@ msgstr ""
 "ユーザがここで指定した時間内にログインできなかった場合にサーバとの接続を切断"
 "します。値をゼロにすると時間制限なしになります。デフォルトは120秒です。"
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "接続を保つ:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "motdを表示:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "前回のログをプリント:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "ログイン猶予時間は数字にしてください。"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3583,19 +3675,19 @@ msgstr ""
 "リやファイルをworld-writableにしていることがあるので、一般的にはこのオプショ"
 "ンを有効にすることをお勧めします。"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "ユーザログインのオプション"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "厳格モード:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "許可するユーザ:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3603,11 +3695,11 @@ msgstr ""
 "ユーザ名が指定したパターンのいずれかに合致したユーザにだけログインを許可しま"
 "す。(例: taro hanako)"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "拒否するユーザ:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3615,11 +3707,11 @@ msgstr ""
 "ユーザ名が指定したパターンのいずれかに合致したユーザのログインを拒否します。"
 "(例: kaizoku)"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "圧縮: 圧縮を許可するかどうかを指定します。"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3629,27 +3721,27 @@ msgstr ""
 "ユーザはいつでも自分自身のforwarderをインストールできるので、ユーザがX11転送"
 "を行なうことを止めることはできません。"
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "圧縮:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11転送:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "OpenSSH設定のまとめ"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "SSHサーバの設定が完了しました。"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "OpenSSHサーバを設定.."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSHサーバ"
 
@@ -3888,6 +3980,22 @@ msgstr "Apacheサーバ"
 msgid "Configuring your system as Apache server ..."
 msgstr "システムをApacheサーバとして設定.."
 
+#~ msgid "Mail domain:"
+#~ msgstr "メールドメイン:"
+
+#~ msgid "Install in progress"
+#~ msgstr "インストール中"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Kolabサーバをインストールしています..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "以前にSambaサーバを設定されているようです。このウィザードは古い設定を読み"
+#~ "込んで選択されたSambaサーバのタイプを表示します。"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/ko.po b/po/ko.po
index 9433558f..dc8ec5ab 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -39,7 +39,7 @@ 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:97
+#: ../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
@@ -49,7 +49,7 @@ msgstr "오류."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "축하합니다."
 
@@ -139,32 +139,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "오류"
 
@@ -343,7 +344,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "실패"
 
@@ -509,7 +510,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "오류:"
 
@@ -645,7 +647,7 @@ msgstr "데이터베이스 서버"
 msgid "Proxy"
 msgstr "프록시"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "설정 마법사"
@@ -694,7 +696,7 @@ msgstr ""
 "[%s]가 설치되어 있지 않습니다.\n"
 "지금 설치하려면, [다음]을, 그냥 종료하려면, [취소]를 누르세요."
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "설치 실패."
 
@@ -758,8 +760,8 @@ msgstr "서버 이름:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -873,7 +875,7 @@ msgstr "마법사가 성공적으로 인트라넷/인터넷 FTP 서버를 설정
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -954,12 +956,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "삼바 설정 마법사"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -967,70 +979,160 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "웹 서버 설정 마법사"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "NFS 서버"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "마법사가 성공적으로 삼바 서버를 설정하였습니다."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "NFS 서버"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "계산된 도메인 이름%s"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "계산된 도메인 이름%s"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "암호:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "암호:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "이름:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "암호:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "마법사가 성공적으로 인터넷 메일 서버를 설정하였습니다."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "호스트명:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "디렉토리:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "FTP 서버 설정 중"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP 서버 설정 중"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "데이터베이스 서버"
@@ -1568,7 +1670,7 @@ msgid "Relay mail server"
 msgstr "메일 서버 이름:"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1588,9 +1690,8 @@ msgid ""
 "relay."
 msgstr "이 마법사는 FTP 서버 설정을 도울 것입니다."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "정보"
 
@@ -1629,11 +1730,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "계산된 도메인 이름%s"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2422,12 +2518,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "웹 서버 설정 마법사"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2730,7 +2820,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "액세스 제어:"
@@ -3438,129 +3528,129 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "데이터베이스 서버"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "무엇을 하고 싶습니까?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "최저 IP 주소:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "이름:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "암호:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "프린트 서버:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3568,70 +3658,70 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "사용자 추가"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "설정 마법사"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "마법사가 성공적으로 NFS 서버를 설정하였습니다."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "FTP 서버 설정 중"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "인트라넷 웹 서버:"
@@ -3876,6 +3966,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "DNS 서버 설정 중"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "디렉토리:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "FTP 서버 설정 중"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/ku.po b/po/ku.po
index 21842c9b..ca2416ce 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -34,7 +34,7 @@ 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:97
+#: ../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
@@ -44,7 +44,7 @@ msgstr "Xeletî."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Pîroz be"
 
@@ -132,32 +132,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Xeletî"
 
@@ -349,7 +350,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Bi ser neket"
 
@@ -527,7 +528,8 @@ msgstr ""
 "Navê makîneyê ji xwe di avakirina DNS'a we de cî digire... ji bo domkirinê "
 "pêl PêşÊ bikin"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Xeletî:"
 
@@ -656,7 +658,7 @@ msgstr "Pêşkêşkara Kolabê"
 msgid "Proxy"
 msgstr "Pêşkêşkara cîgir (Proxy)"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Sêrbaza avakirina LDAP'ê"
@@ -703,7 +705,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 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Saz kirin bi ser neket."
 
@@ -774,8 +776,8 @@ msgstr "Navê Makîneya Pêşkêşkar:"
 msgid "Admin email:"
 msgstr "Posteya-e ya bikarhêner:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Destûrê bide têketina rootê:"
 
@@ -895,7 +897,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Ji kerema xwe re Drakwizardê dadin û vekin û guherandna hin parametreyan "
@@ -990,11 +992,21 @@ msgstr ""
 "pêşkêşkareke DHCP'yê ku bi desteka PXE'yê ye û pêşkêşkareke PXE'yê ava "
 "bikin. Ango êdî barkirina Mandrivayê ya ji ser torê dê pir hêsantir be."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Sêrbaza avakirinê ya Kolabê"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -1002,64 +1014,157 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Sêrbaza Avakirinê ya Pêşkêşkara Webê"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Pêşkêşkara DNS'ê ya bingehîn"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, 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
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Pêşkêşkara DNS'ê ya duyemîn"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Navê qadê:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Navê qadê:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Passporta xwe ji bo hesabe managere yen servere Kolab bide"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Şîfre:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Dîsa şîfre:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Nav:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Dîsa şîfre:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Sêrbaz dê hilbijêrkên vekirî li gorî van parametreyan biguherîne:"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Navê komputerê:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Qada NIS'ê:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Rêzika avakirinê"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Pêşkêşkara Kolabê di pergala we de tê vakirin..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Pêşkêşkara PXE'yê di pergala we de tê vakirin..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Pêşkêşkara Kolabê"
 
@@ -1604,7 +1709,7 @@ msgid "Relay mail server"
 msgstr "Pêşkêşkara posteyê ya derve"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1625,9 +1730,8 @@ msgstr ""
 "Ev sêrbaz dê di avakirina pêşkêşkareke FTP'ê ya ji bo torê de ji we re bibe "
 "alîkar."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "pêkîn"
 
@@ -1667,11 +1771,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Navê qadê:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2512,12 +2611,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Sêrbaza avakirina webê"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2824,7 +2917,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Radeya rê:"
@@ -3548,132 +3641,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Pêşkêşkara Sambayê"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Hûn dixwazin çi bikin:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Navnîşana IP'ê ya nizimtirîn:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Nav:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Xeletî: divê hûn rêzikekê diyar bikin."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Awayê avakirinê:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Şîfre:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Moşenên nivîsandinê:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Destûrê bide têketina rootê:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3681,73 +3774,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Kontaner:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Makîneyên nas:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Makîneyên nenas:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Hilbijêrka APIC'ê:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Sêrbaza avakirina LDAP'ê"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Sêrbazê, pêşkêşkara we ya NSF'ê bi awayekî biserketî ava kir."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Pêşkêşkara Samba tê avakirin..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Pêşkêşkara Apache Webê"
@@ -4001,6 +4094,15 @@ msgstr "Pêşkêşkara Apache Webê"
 msgid "Configuring your system as Apache server ..."
 msgstr "Pergala we wekî Pêşkêşkara Apache Webê tê avakirin..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Qada NIS'ê:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Rêzika avakirinê"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Pêşkêşkara Kolabê di pergala we de tê vakirin..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/ky.po b/po/ky.po
index 06feef4f..e9ed02a2 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr "Ката."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Куттуктайбыз"
 
@@ -133,32 +133,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Ката"
 
@@ -348,7 +349,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Игиликсиз аяктады"
 
@@ -509,7 +510,8 @@ msgid ""
 msgstr ""
 "Бул хост DNS ырастоолорунда барга окшош...Улантуу үчүн Кийинки'ни басыңыз"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Ката:"
 
@@ -633,7 +635,7 @@ msgstr "LDAP сервери"
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "LDAP ырастоолорун көрсөтүү"
@@ -679,7 +681,7 @@ msgstr ""
 "%s жүктөлгөн жок\n"
 "Жүктөө үчүн \"Кийинки\"'ни же чыгуу үчүн \"Айнуу\"'ну басыңыз"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Жүктөө ийгиликсиз аяктады"
 
@@ -747,8 +749,8 @@ msgstr "Хосттун аты:"
 msgid "Admin email:"
 msgstr "Админдин э-почтасы:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "root'тун кирүү уруксаты:"
 
@@ -870,7 +872,7 @@ msgstr "Уста сиздин Интернет/Интранет FTP сервер
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizard'ды кайра аткарыңыз жана кээбир параметрлерди өзгөртүңүз."
 
@@ -958,11 +960,21 @@ msgstr ""
 "колдогон DHCP серверин жана PXE серверин ырастайаласыз. Бул жол менен "
 "Mandriva Linux'ту тармактан орнотуу жеңил болот."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab ырастоо устасы"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -970,46 +982,147 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Kolab Groupware серверин ырастоо устасына кош келиңиздер."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Негизги DNS сервер"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Сиз өзүңүздүн LDAP сервериңизди ырастадыңыз"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Жардамчы DNS сервер"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Домендик аты:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Домендик аты:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Kolab сервердин менеджер катталуусунун сырсөзүн кириңиз."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Сырсөз:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Сырсөздү кайра кириңиз:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Биринчи аты:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Сырсөздү кайра кириңиз:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Азыр Уста, Kolab серверин төмөнкү параметрлер менен ырастайт"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Хосттун аты:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Почта домени:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1017,19 +1130,11 @@ msgstr ""
 "kolab сервери ырасталды жана иштетилүүдө. https://127.0.0.1/kolab/admin/ "
 "адреси менен мурун 'manager' үчүн кирген сырсөз менен системага кириңиз"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Орнотуу аткарылууда"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Сиздин системаңызга Kolab сервери орнотулууда..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab сервери сиздин системаңызда ырасталууда..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab сервери"
 
@@ -1524,7 +1629,7 @@ msgid "Relay mail server"
 msgstr "Тышкы кат сервери"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1543,9 +1648,8 @@ msgid ""
 "relay."
 msgstr "Бул уста сизге тармагыңызга FTP серверин орнотууга жардам берет."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Информация"
 
@@ -1583,11 +1687,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Домендик аты:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2343,12 +2442,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Kolab ырастоо устасы"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2651,7 +2744,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr ""
 
@@ -3356,129 +3449,129 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba сервери"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Эмнени кылышты калайсыз:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Астынкы IP-адрес:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Биринчи аты:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Сырсөз:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "root'тун кирүү уруксаты:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3486,71 +3579,71 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Логин:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "FXP'ге уруксат берүү:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "LDAP ырастоолорун көрсөтүү"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Уста DHCP кызматын ийгиликтүү орнотту."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Сиздин система жардамчы DNS сервер катары орнотулуп жатат..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "NFS сервери"
@@ -3775,6 +3868,15 @@ msgstr ""
 msgid "Configuring your system as Apache server ..."
 msgstr ""
 
+#~ msgid "Mail domain:"
+#~ msgstr "Почта домени:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Орнотуу аткарылууда"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Сиздин системаңызга Kolab сервери орнотулууда..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/lt.po b/po/lt.po
index 4a33ba14..137c5bdc 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-04-05 14:53+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: LITHUANIAN\n"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Klaida."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Sveikiname"
 
@@ -137,32 +137,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Klaida"
 
@@ -351,7 +352,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Nepavyko"
 
@@ -523,7 +524,8 @@ msgstr ""
 "Šis kompiuteris jau yra jūsų DNS konfigūracijoje... norėdami tęsti, "
 "spauskite Toliau"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Klaida:"
 
@@ -649,7 +651,7 @@ msgstr "ldap serveris"
 msgid "Proxy"
 msgstr "Tarpinis serveris"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Rodyti Ldap konfigūraciją"
@@ -696,7 +698,7 @@ msgstr ""
 "Spauskite \"Toliau\" , jei norite įdiegti, arba \"Atšaukti\" , jei norite "
 "baigti"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Įdiegimas nepavyko"
 
@@ -764,8 +766,8 @@ msgstr "Serverio kompiuterio adresas:"
 msgid "Admin email:"
 msgstr "Administratoriaus el. paštas:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Leisti pagrindinį prisijungimą:"
 
@@ -883,7 +885,7 @@ msgstr "Vedlys sėkmingai sukonfigūravo jūsų intraneto/Interneto FTP serverį
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Dar kartą paleiskite drakwizard ir pakeiskite parametrus."
 
@@ -975,11 +977,21 @@ msgstr ""
 "sukonfigūruoti DHCP serverį su PXE palaikymu bei patį PXE serverį. Tada "
 "lengvai įdiegsite Mandriva Linux per tinklą."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab konfigūravimo vedlys"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -991,7 +1003,7 @@ msgstr ""
 "naudojama adresų knygelė pašto vartotojams, kontaktai, taip pat POP3 bei "
 "IMAP4(rev1) pašto prieiga"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1001,41 +1013,142 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Vedlys padarys atsarginę ankstesnio "
 "šių paslaugų konfigūravimo bylų kopiją."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 "Sveiki, čia Kolab grupinės darbo įrangos serverio konfigūravimo vedlys."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Pagrindinis DNS serveris"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Jūs jau sukonfigūravote Ldap serverį"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Pagalbinis DNS serveris"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domeno vardas:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Domeno vardas:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Įveskite Kolab serverio valdymo abonento slaptažodį."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Slaptažodis nesutamba arba visai neįvestas, pataisykite."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Slaptažodis dar kartą:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Vardas:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Slaptažodis dar kartą:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Vedlys, naudodamas šiuos parametrus, netrukus sukonfigūruos Kolab serverį"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Kompiuterio vardas:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Pašto domenas:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1043,19 +1156,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Vyksta įdiegimas"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Jūsų sistemoje įdiegiamas Kolab serveris..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Jūsų sistemoje konfigūruojamas Kolab serveris..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab serveris"
 
@@ -1590,7 +1695,7 @@ msgid "Relay mail server"
 msgstr "Išorinio pašto serveris"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1609,9 +1714,8 @@ msgid ""
 "relay."
 msgstr "Šis vedlys padės sukonfigūruoti jūsų tinklo FTP serverį."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informacija"
 
@@ -1651,11 +1755,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Domeno vardas:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2503,12 +2602,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Web serverio konfigūravimo vedlys"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2817,7 +2910,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Prieigos lygis:"
@@ -3540,132 +3633,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba serveris"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Ką norite daryti:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Žemiausias IP adresas:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Vardas:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Klaida: turėtų būti katalogas."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Įdiegimo būdas:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Slaptažodis:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Spausdintuvai:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Leisti pagrindinį prisijungimą:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3673,73 +3766,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Vartotojo prisijungimas:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Leisti kompiuterius:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Drausti kompiuterius:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Vartotojo nuostata:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Rodyti Ldap konfigūraciją"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Vedlys sėkmingai sukonfigūravo jūsų NFS serverį."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Konfigūruojamas jūsų Samba serveris..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache serveris"
@@ -3987,6 +4080,15 @@ msgstr "Apache serveris"
 msgid "Configuring your system as Apache server ..."
 msgstr "Jūsų sistema konfigūruojama kaip Apache serveris ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Pašto domenas:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Vyksta įdiegimas"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Jūsų sistemoje įdiegiamas Kolab serveris..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/lv.po b/po/lv.po
index ce41892c..dc5672d1 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr "Kļūda."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Apsveicam"
 
@@ -137,32 +137,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Kļūda"
 
@@ -342,7 +343,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Neizdevās"
 
@@ -498,7 +499,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 #, fuzzy
 msgid "Error:"
 msgstr "Meistara kļūda."
@@ -634,7 +636,7 @@ msgstr "Datubāzu serveris"
 msgid "Proxy"
 msgstr "Proksī"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Konfigurācijas meistars"
@@ -682,7 +684,7 @@ msgstr ""
 "%s nav instalēts\n"
 "Klikšķiniet \"Nākamis\", lai instalētu, vai \"Atlikt\" lai beigtu"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalēšana neizdevās"
 
@@ -744,8 +746,8 @@ msgstr "Servera nosaukums:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -859,7 +861,7 @@ msgstr "Meistars veiksmīgi nokonfigurēja Intraneta/Interneta FTP serveri"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -940,12 +942,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Samba konfigurēšanas meistars"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -953,71 +965,159 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Web servera konfigurēšanas meistars"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "NFS serveris"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Meistars veiksmīgi nokonfigurēja Samba serveri"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "NFS serveris"
+
+#: ../kolab_wizard/Kolab.pm:98
+msgid "Kolab Domain"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Parole:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Vārds:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Parole:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Meistars veiksmīgi nokonfigurēja Jūsu servera Interneta pasta servisu"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 #, fuzzy
 msgid "Hostname:"
 msgstr "Servera nosaukums:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "Direktorijs:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Tiek konfigurēts FTP serveris"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Tiek konfigurēts FTP serveris"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Datubāzu serveris"
@@ -1545,7 +1645,7 @@ msgid "Relay mail server"
 msgstr "Pasta servera nosaukums:"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1565,9 +1665,8 @@ msgid ""
 "relay."
 msgstr "Šis meistars palīdzēs Jums konfigurēt FTP serveri priekš Jūsu tīkla"
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informācija"
 
@@ -1606,10 +1705,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr ""
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2395,12 +2490,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Web servera konfigurēšanas meistars"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2697,7 +2786,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Piekļuves kontrole:"
@@ -3401,127 +3490,127 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Datubāzu serveris"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Zemākā IP adrese:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Vārds:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Parole:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3529,70 +3618,70 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Lietotāja pievienošana"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Konfigurācijas meistars"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Meistars veiksmīgi nokonfigurēja NFS serveri"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Tiek konfigurēts FTP serveris"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Intraneta Web serveris"
@@ -3841,6 +3930,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Tiek konfigurēts DNS serveris"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "Direktorijs:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Tiek konfigurēts FTP serveris"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/mk.po b/po/mk.po
index 2df20b32..923b5bed 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Грешка."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Честитки"
 
@@ -136,32 +136,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Грешка"
 
@@ -355,7 +356,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Неуспешно"
 
@@ -528,7 +529,8 @@ msgstr ""
 "Изгледа дека компјутерот веќе се наоѓа во конфигурацијата на DNS-от... "
 "притиснете „следно“ за да продолжите"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Грешка:"
 
@@ -659,7 +661,7 @@ msgstr "ldap сервер"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Прикажи Ldap конфигурација"
@@ -705,7 +707,7 @@ msgstr ""
 "%s не е инсталиран\n"
 "За да инсталирате притиснете \"Наредно\" или \"Откажи\""
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Инсталацијата не успеа"
 
@@ -774,8 +776,8 @@ msgstr "Име на серверот:"
 msgid "Admin email:"
 msgstr "Администраторска е-пошта:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Дозволи најавување на root:"
 
@@ -896,7 +898,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Ве молиме повторно вклучете го drakwizard, и обидете се да сменете некои "
@@ -992,11 +994,21 @@ msgstr ""
 "даконфигурирате DHCP сервер со подршка на PXE и PXE сервер. Така што многу "
 "лесно ќе можете да инсталирате Mandriva Linux преку мрежа."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Волшебник за конфигурирање на Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -1008,7 +1020,7 @@ msgstr ""
 "адресар со провизија за корисници со сандачиња, со контакти и POP3 како и "
 "IMAP4(rev1) пристап до пошта"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1018,40 +1030,141 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Волшебникот ќе направи заштитна копија "
 "на сите ваши претходни конфигурациони датотеки за овие сервиси."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 "Добредојдовте во конфигурациониот Волшебник за Kolab серверот за групи."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Главен DNS сервер"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Веќе сте го конфигурирале вашиот Ldap сервер"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Секундарен DNS сервер"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Име на доменот:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Име на доменот:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Внесете лозинка за сметката „manager“ на Kolab серверот."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Лозинките не се совпаѓаат, или нема лозинка, ве молиме поправете."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Лозинка повторно:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Име:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Лозинка повторно:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Волшебникот сега ќе конфигурира Kolab сервер со следниве параметри"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Име на компјутерот:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Домен на поштата:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1059,19 +1172,11 @@ msgstr ""
 "Kolab серверот е конфигуриран и работи. Најавете се како „manager“ со "
 "лозинката која ја внесовте на https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Инсталирањето е во тек"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Инсталирање на Kolab сервер на вашиот систем..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Конфигурирање на Kolab сервер на вашиот систем..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab сервер"
 
@@ -1608,7 +1713,7 @@ msgid "Relay mail server"
 msgstr "Надворешен поштенски сервер"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1628,9 +1733,8 @@ msgid ""
 msgstr ""
 "Овој волшебник ќе Ви помогне во конфигурирање на FTP сервер за Вашата мрежа."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Информации"
 
@@ -1670,11 +1774,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Име на доменот:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2531,12 +2630,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Волшебник за конфигурација на веб сервер"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2844,7 +2937,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Ниво на пристап:"
@@ -3572,132 +3665,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba сервер"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Што сакате да направите:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Најмала IP адреса:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Име:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Грешка: треба да е директориум."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Начин на инсталирање:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Лозинка:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Принтери:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Дозволи најавување на root:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3705,73 +3798,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Најава на корисник:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Допуштени:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Недопуштени:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Сопствена опција:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Прикажи Ldap конфигурација"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Волшебникот успешно го конфигурираше Вашиот NFS сервер."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Конфигурирање на FTP серверот ..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache сервер"
@@ -4024,6 +4117,15 @@ msgstr "Apache сервер"
 msgid "Configuring your system as Apache server ..."
 msgstr "Конфигурирање на вашиот систем како Apache сервер ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Домен на поштата:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Инсталирањето е во тек"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Инсталирање на Kolab сервер на вашиот систем..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/ms.po b/po/ms.po
index 38010547..014cff5e 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -20,59 +20,36 @@ msgstr ""
 msgid "configuration wizard"
 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
+#: ../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
 msgid "Warning."
 msgstr "Amaran"
 
-#: ../Wiztemplate.pm:64
-#: ../dns_wizard/Bind.pm:196
-#: ../ftp_wizard/Proftpd.pm:140
-#: ../news_wizard/Inn.pm:76
-#: ../news_wizard/Inn.pm:81
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:140
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
 msgid "Error."
 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:97
-#: ../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:187
-#: ../web_wizard/Apache.pm:141
+#: ../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:141
 msgid "Congratulations"
 msgstr "Tahniah"
 
-#: ../client_wizard/Bind_client.pm:38
-#: ../client_wizard/Bind_client.pm:55
+#: ../client_wizard/Bind_client.pm:38 ../client_wizard/Bind_client.pm:55
 msgid "DNS Client Wizard"
 msgstr "Wizard Klien DNS"
 
@@ -81,128 +58,107 @@ msgid "You must first run the DNS server wizard"
 msgstr "Anda mesti pertama sekali melaksanakan wizard pelayan DNS"
 
 #: ../client_wizard/Bind_client.pm:55
-msgid "A client of your local network is a machine connected to the network having its own name and IP address."
-msgstr "Klien rangkaian tempatan adalah mesin yang disambungkan kepada rangkaian yang mempunyai nama dan alamat IP sendiri."
+msgid ""
+"A client of your local network is a machine connected to the network having "
+"its own name and IP address."
+msgstr ""
+"Klien rangkaian tempatan adalah mesin yang disambungkan kepada rangkaian "
+"yang mempunyai nama dan alamat IP sendiri."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
 msgstr "Tekan maju untuk mula, atau Batal untuk meninggalkan wizard ini."
 
 #: ../client_wizard/Bind_client.pm:55
-msgid "The server will use the information you enter here to make the name of the client available to other machines into your network."
-msgstr "Pelayan akan menggunakan maklumat yang anda masukkan disini untuk membolehkan nama klien diperolehi pada mesin lain dalam rangkaian anda."
+msgid ""
+"The server will use the information you enter here to make the name of the "
+"client available to other machines into your network."
+msgstr ""
+"Pelayan akan menggunakan maklumat yang anda masukkan disini untuk "
+"membolehkan nama klien diperolehi pada mesin lain dalam rangkaian anda."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Wizard ini akan membantu anda untuk menambah klien baru dalam DNS tempatan."
+msgstr ""
+"Wizard ini akan membantu anda untuk menambah klien baru dalam DNS tempatan."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
 msgstr "(anda tidak perlu menaip domain selepas nama)"
 
-#: ../client_wizard/Bind_client.pm:61
-#: ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Pengenalan klien:"
 
-#: ../client_wizard/Bind_client.pm:61
-#: ../dns_wizard/Bind.pm:128
-msgid "Note that the given IP address and client name should be unique in the network."
-msgstr "Perhatian bahawa alamat IP yang diberi dan nama klien mestilah unik dalam rangkaian."
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
+msgid ""
+"Note that the given IP address and client name should be unique in the "
+"network."
+msgstr ""
+"Perhatian bahawa alamat IP yang diberi dan nama klien mestilah unik dalam "
+"rangkaian."
 
-#: ../client_wizard/Bind_client.pm:61
-#: ../dns_wizard/Bind.pm:128
-msgid "Your client on the network will be identified by name, as in clientname.company.net. Every machine on the network must have a (unique) IP address, in the usual dotted syntax."
-msgstr "Klien anda dalam rangkaian akan dikenali dengan nama, contohnya namaklien.syarikat.net. Setiap komputer dalam rangkaian mesti mempunyai alamat IP (unik), dalam sintaks biasa bertitik."
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
+msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"Klien anda dalam rangkaian akan dikenali dengan nama, contohnya namaklien."
+"syarikat.net. Setiap komputer dalam rangkaian mesti mempunyai alamat IP "
+"(unik), dalam sintaks biasa bertitik."
 
-#: ../client_wizard/Bind_client.pm:67
-#: ../dns_wizard/Bind.pm:132
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nama mesin:"
 
-#: ../client_wizard/Bind_client.pm:68
-#: ../dns_wizard/Bind.pm:133
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Alamat IP komputer:"
 
-#: ../client_wizard/Bind_client.pm:73
-#: ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100
-#: ../dns_wizard/Bind.pm:191
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 #: ../nisautofs_wizard/Nisautofs.pm:86
 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
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:86
 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:111
-#: ../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:88
-#: ../sshd_wizard/Sshd.pm:145
+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:120
 msgid "Error"
 msgstr "Ralat"
@@ -220,12 +176,18 @@ msgid "Adding a new client to your network"
 msgstr "Menambah klien baru pada rangkaian anda"
 
 #: ../client_wizard/Bind_client.pm:88
-msgid "The wizard collected the following parameters needed to add a client to your network:"
+msgid ""
+"The wizard collected the following parameters needed to add a client to your "
+"network:"
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:88
-msgid "To accept these values, and add your client, click the Next button or use the Back button to correct them."
-msgstr "Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau guna butang Undur untuk membetulkan mereka."
+msgid ""
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
+msgstr ""
+"Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau "
+"guna butang Undur untuk membetulkan mereka."
 
 #: ../client_wizard/Bind_client.pm:90
 msgid "Client name"
@@ -240,29 +202,38 @@ msgid "The wizard successfully added the client."
 msgstr "Wizard berjaya menambah klien."
 
 #: ../common/Wizcommon.pm:57
-msgid "You need to readjust your hostname. 'localhost' is not a correct hostname for a DNS server. Hostname must be a FQDN: Fully Qualified Domain Name"
+msgid ""
+"You need to readjust your hostname. 'localhost' is not a correct hostname "
+"for a DNS server. Hostname must be a FQDN: Fully Qualified Domain Name"
 msgstr ""
 
 #: ../common/Wizcommon.pm:60
-msgid "You need to readjust your domainname. For a DNS server you need a correct domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully Qualified Domain Name. Launch drakconnect to adjust it."
+msgid ""
+"You need to readjust your domainname. For a DNS server you need a correct "
+"domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully "
+"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?"
+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
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
 msgid "DHCP Wizard"
 msgstr "Wizard DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:53
-msgid "DHCP is a service that automatically assigns networking addresses to your workstations."
-msgstr "DHCP adalah servis yang memberikan alamat rangkaian secara automatik kepada stesen kerja anda."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
+msgstr ""
+"DHCP adalah servis yang memberikan alamat rangkaian secara automatik kepada "
+"stesen kerja anda."
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
@@ -273,7 +244,10 @@ msgid "Interface the dhcp server must listen to"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:72
-msgid "If you want to enable PXE in your dhcp server please check the box (Pre-boot eXecution Environment, a protocol that allows computers to boot through the network)."
+msgid ""
+"If you want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allows computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:72
@@ -282,26 +256,25 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:72
 #, fuzzy
-msgid "Select the range of addresses assigned to the workstations by the DHCP service; unless you have special needs, you can safely accept the proposed values. (ie: 192.168.100.20 192.168.100.40)"
+msgid ""
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr "DHCP terima."
 
-#: ../dhcp_wizard/Dhcp.pm:82
-#: ../dhcp_wizard/Dhcp.pm:115
+#: ../dhcp_wizard/Dhcp.pm:82 ../dhcp_wizard/Dhcp.pm:115
 msgid "Lowest IP address:"
 msgstr "Alamat IP terendah:"
 
-#: ../dhcp_wizard/Dhcp.pm:83
-#: ../dhcp_wizard/Dhcp.pm:116
+#: ../dhcp_wizard/Dhcp.pm:83 ../dhcp_wizard/Dhcp.pm:116
 msgid "Highest IP address:"
 msgstr "Alamat IP tertinggi:"
 
-#: ../dhcp_wizard/Dhcp.pm:84
-#: ../dhcp_wizard/Dhcp.pm:117
+#: ../dhcp_wizard/Dhcp.pm:84 ../dhcp_wizard/Dhcp.pm:117
 msgid "Gateway IP address:"
 msgstr "Alamat IP gateway:"
 
-#: ../dhcp_wizard/Dhcp.pm:85
-#: ../dhcp_wizard/Dhcp.pm:119
+#: ../dhcp_wizard/Dhcp.pm:85 ../dhcp_wizard/Dhcp.pm:119
 msgid "Enable PXE:"
 msgstr "Hidupkan PXE:"
 
@@ -323,33 +296,25 @@ msgstr "Menetapkan pelayan DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:110
 #, fuzzy
-msgid "The wizard collected the following parameters needed to configure your DHCP service:"
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
 msgstr "DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:112
-#: ../ftp_wizard/Proftpd.pm:147
-#: ../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:128
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:147
+#: ../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:128
 #: ../web_wizard/Apache.pm:129
 msgid "disabled"
 msgstr "dimatikan"
 
-#: ../dhcp_wizard/Dhcp.pm:112
-#: ../ftp_wizard/Proftpd.pm:147
-#: ../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:128
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:147
+#: ../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:128
 #: ../web_wizard/Apache.pm:129
 msgid "enabled"
 msgstr "dihidupkan"
@@ -362,38 +327,27 @@ msgstr "Antaramuka:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Wizard berjaya menetapkan servis DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130
-#: ../dns_wizard/Bind.pm:274
-#: ../ftp_wizard/Proftpd.pm:173
-#: ../installsrv_wizard/Installsrv.pm:106
-#: ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:120
-#: ../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:193
-#: ../web_wizard/Apache.pm:146
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
+#: ../ftp_wizard/Proftpd.pm:173 ../installsrv_wizard/Installsrv.pm:106
+#: ../nfs_wizard/NFS.pm:107 ../nisautofs_wizard/Nisautofs.pm:120
+#: ../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:146
 msgid "Failed"
 msgstr "Gagal"
 
-#: ../dhcp_wizard/Dhcp.pm:131
-#: ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:121
-#: ../proxy_wizard/Squid.pm:185
+#: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
 #: ../web_wizard/Apache.pm:147
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:77
-#: ../dns_wizard/Bind.pm:712
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Pelayan DNS induk"
 
-#: ../dns_wizard/Bind.pm:78
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
 #: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Pelayan DNS hamba"
@@ -408,7 +362,9 @@ msgstr "Buang hos dalam DNS"
 
 #: ../dns_wizard/Bind.pm:99
 #, fuzzy
-msgid "DNS (Domain Name Server) is the service that maps an IP address of a machine with an internet host name."
+msgid ""
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr "Domain Nama Pelayan IP."
 
 #: ../dns_wizard/Bind.pm:99
@@ -417,7 +373,10 @@ msgstr "Wizard tetapan utama DNS"
 
 #: ../dns_wizard/Bind.pm:99
 #, fuzzy
-msgid "This wizard will help you configuring the DNS services of your server. This configuration will provide a local DNS service for local computers names, with non-local requests forwarded to an outside DNS."
+msgid ""
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr "lokal lokal lokal."
 
 #: ../dns_wizard/Bind.pm:120
@@ -428,13 +387,11 @@ msgstr "Antaramuka pelayan DNS"
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Anda tidak perlu menambah domain selepas nama)"
 
-#: ../dns_wizard/Bind.pm:130
-#: ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Pelayan:"
 
-#: ../dns_wizard/Bind.pm:131
-#: ../dns_wizard/Bind.pm:227
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "Nama domain DNS:"
 
@@ -455,16 +412,20 @@ msgid "Computer Name:"
 msgstr "Nama Komputer:"
 
 #: ../dns_wizard/Bind.pm:147
-msgid "A slave name server will take some of the burden away from your primary name server, and will also function as a backup server, in case your master server is unreachable."
+msgid ""
+"A slave name server will take some of the burden away from your primary name "
+"server, and will also function as a backup server, in case your master "
+"server is unreachable."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:149
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Alamat IP pelayan DNS induk:"
 
 #: ../dns_wizard/Bind.pm:156
-msgid "Forwarding occurs on only those queries for which the server is not authoritative and  does not have the answer in its cache."
+msgid ""
+"Forwarding occurs on only those queries for which the server is not "
+"authoritative and  does not have the answer in its cache."
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:156
@@ -472,11 +433,12 @@ msgid "IP of your forwarder"
 msgstr "IP forwarder anda"
 
 #: ../dns_wizard/Bind.pm:156
-msgid "If you need it and know your IP forwarder enter IP address of it, if you dont know leave it blank"
+msgid ""
+"If you need it and know your IP forwarder enter IP address of it, if you "
+"dont know leave it blank"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
-#: ../dns_wizard/Bind.pm:247
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS Luaran:"
 
@@ -485,20 +447,26 @@ msgid "Add search domain"
 msgstr "Tambah domain carian"
 
 #: ../dns_wizard/Bind.pm:168
-msgid "Domainname of this server is automatically added, and you dont need to add it here."
+msgid ""
+"Domainname of this server is automatically added, and you dont need to add "
+"it here."
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:168
-msgid "Search list for host-name lookup.  The search list is normally determined from the local domain name; by default, it contains only the local domain name. This may be changed by listing the desired domain search path following the search keyword"
+msgid ""
+"Search list for host-name lookup.  The search list is normally determined "
+"from the local domain name; by default, it contains only the local domain "
+"name. This may be changed by listing the desired domain search path "
+"following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:171
-#: ../dns_wizard/Bind.pm:248
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Nama domain default untuk dicari:"
 
 #: ../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 ""
 
 #: ../dns_wizard/Bind.pm:181
@@ -510,24 +478,31 @@ msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:196
-msgid "It seems that host is already in your DNS configuration... press next to continue"
+msgid ""
+"It seems that host is already in your DNS configuration... press next to "
+"continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201
-#: ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Ralat:"
 
 #: ../dns_wizard/Bind.pm:201
-msgid "It seems that this is not present in your DNS configuration... press next to continue"
+msgid ""
+"It seems that this is not present in your DNS configuration... press next to "
+"continue"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:206
-msgid "It seems that no DNS server has been set through wizard. Please run DNS wizard: Master DNS server."
+msgid ""
+"It seems that no DNS server has been set through wizard. Please run DNS "
+"wizard: Master DNS server."
 msgstr ""
 
 #: ../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_wizard/Bind.pm:216
@@ -542,8 +517,7 @@ msgstr "dengan tetapan ini:"
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:228
-#: ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Nama komputer:"
 
@@ -556,7 +530,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
 #: ../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_wizard/Bind.pm:245
@@ -580,8 +555,7 @@ msgstr "Wizard telah berjaya membuang hos dari DNS anda."
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "DHCP."
 
-#: ../dns_wizard/Bind.pm:275
-#: ../installsrv_wizard/Installsrv.pm:107
+#: ../dns_wizard/Bind.pm:275 ../installsrv_wizard/Installsrv.pm:107
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -597,8 +571,7 @@ msgstr "Menetapkan sistem anda sebagai pelayan DNS Pembantu ..."
 msgid "Apache2 web server"
 msgstr "Pelayan web Apache2"
 
-#: ../drakwizard.pl:42
-#: ../samba_wizard/Samba.pm:452
+#: ../drakwizard.pl:42 ../samba_wizard/Samba.pm:452
 #: ../samba_wizard/Sambaprint.pm:282
 msgid "Samba server"
 msgstr "Pelayan Samba"
@@ -631,8 +604,7 @@ msgstr "Pelayan ldap"
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../drakwizard.pl:55
-#: ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Tetapan daemon OpenSSH"
 
@@ -648,18 +620,15 @@ msgstr "Pelayan DHCP"
 msgid "DNS server"
 msgstr "Pelayan DNS"
 
-#: ../drakwizard.pl:59
-#: ../news_wizard/Inn.pm:49
+#: ../drakwizard.pl:59 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Pelayan berita"
 
-#: ../drakwizard.pl:60
-#: ../nfs_wizard/NFS.pm:56
+#: ../drakwizard.pl:60 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Pelayan NFS"
 
-#: ../drakwizard.pl:61
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../drakwizard.pl:61 ../ftp_wizard/Proftpd.pm:84
 msgid "FTP server"
 msgstr "Pelayan FTP"
 
@@ -679,7 +648,6 @@ msgid ""
 msgstr ""
 
 #: ../drakwizard.pl:167
-#: ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
@@ -704,7 +672,9 @@ msgstr "FTP:"
 
 #: ../ftp_wizard/Proftpd.pm:84
 #, fuzzy
-msgid "Your server can act as an FTP server toward your internal network (intranet) and as an FTP server for the Internet."
+msgid ""
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr "FTP Pelayan dan FTP Pelayan Internet."
 
 #: ../ftp_wizard/Proftpd.pm:86
@@ -718,7 +688,9 @@ msgid "Enable the FTP server for the Internet"
 msgstr "FTP Pelayan"
 
 #: ../ftp_wizard/Proftpd.pm:91
-msgid "Please choose whether to allow a connection to FTP server from internal or external hosts."
+msgid ""
+"Please choose whether to allow a connection to FTP server from internal or "
+"external hosts."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
@@ -743,15 +715,16 @@ msgstr "Nama pelayan:"
 msgid "Admin email:"
 msgstr "Alamat &Emel:"
 
-#: ../ftp_wizard/Proftpd.pm:106
-#: ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 #, fuzzy
 msgid "Permit root login:"
 msgstr "%s: tiada nama logmasuk\n"
 
 #: ../ftp_wizard/Proftpd.pm:110
-msgid "I can't find bash in list of shells! It seems you have modified it by hand! Please correct."
+msgid ""
+"I can't find bash in list of shells! It seems you have modified it by hand! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:113
@@ -776,8 +749,7 @@ msgstr ""
 msgid "FTP server options, step 2"
 msgstr "Sila masukkan pelayan FTP."
 
-#: ../ftp_wizard/Proftpd.pm:126
-#: ../ftp_wizard/Proftpd.pm:155
+#: ../ftp_wizard/Proftpd.pm:126 ../ftp_wizard/Proftpd.pm:155
 #, fuzzy
 msgid "FTP Port:"
 msgstr "FTP PORT gagal\n"
@@ -805,7 +777,8 @@ msgstr "ralat membaca daripada direktori %s: %s\n"
 #: ../ftp_wizard/Proftpd.pm:135
 #, fuzzy
 msgid "You are in DHCP, server may not work with your configuration."
-msgstr "Jika anda dalam dhcp, pelayan mungkin tidak berfungsi dengan tetapan anda."
+msgstr ""
+"Jika anda dalam dhcp, pelayan mungkin tidak berfungsi dengan tetapan anda."
 
 #: ../ftp_wizard/Proftpd.pm:140
 #, fuzzy
@@ -819,12 +792,16 @@ msgstr "Menetapkan pelayan DHCP"
 
 #: ../ftp_wizard/Proftpd.pm:145
 #, fuzzy
-msgid "The wizard collected the following parameters needed to configure your FTP server"
+msgid ""
+"The wizard collected the following parameters needed to configure your FTP "
+"server"
 msgstr "FTP"
 
 #: ../ftp_wizard/Proftpd.pm:145
 #, fuzzy
-msgid "To accept those values, and configure your server, click the next button or use the back button to correct them"
+msgid ""
+"To accept those values, and configure your server, click the next button or "
+"use the back button to correct them"
 msgstr "Kepada terima dan Seterusnya Undur."
 
 #: ../ftp_wizard/Proftpd.pm:156
@@ -862,13 +839,10 @@ msgstr "Izinkan masukan:"
 msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Internet FTP"
 
-#: ../ftp_wizard/Proftpd.pm:174
-#: ../postfix_wizard/Postfix.pm:278
-#: ../pxe_wizard/Pxe.pm:332
-#: ../samba_wizard/Samba.pm:356
-#: ../samba_wizard/Sambaprint.pm:154
-#: ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
+#: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
+#: ../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 ""
 
@@ -877,7 +851,8 @@ msgid "Configure an install server (via NFS and HTTP)"
 msgstr ""
 
 #: ../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 ""
 
 #: ../installsrv_wizard/Installsrv.pm:59
@@ -890,7 +865,9 @@ msgid "Install server configuration"
 msgstr "Alatan Konfigurasi Pelayan"
 
 #: ../installsrv_wizard/Installsrv.pm:59
-msgid "Path to data: specify your source directory, should be base of a Linux installation."
+msgid ""
+"Path to data: specify your source directory, should be base of a Linux "
+"installation."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:65
@@ -910,7 +887,9 @@ msgid "ie use: /var/install/mdk-release"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:78
-msgid "Error, the source path must be a directory with full Linux installation directory."
+msgid ""
+"Error, the source path must be a directory with full Linux installation "
+"directory."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:82
@@ -937,80 +916,189 @@ msgid "Configuring your system, please wait..."
 msgstr "Sistem sibuk. Sila tunggu ..."
 
 #: ../installsrv_wizard/Installsrv.pm:113
-msgid "Congratulations, Install server is now ready. You can now configure a DHCP server with PXE support, and a PXE server. So it will be very easy to install Linux through a network. Use drakpxelinux to configure your PXE server, and drakwizard DHCP to configure a DHCPD server."
+msgid ""
+"Congratulations, Install server is now ready. You can now configure a DHCP "
+"server with PXE support, and a PXE server. So it will be very easy to "
+"install Linux through a network. Use drakpxelinux to configure your PXE "
+"server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Jurucipta Konfigurasi Internet"
 
-#: ../kolab_wizard/Kolab.pm:56
-msgid "Kolab is a secure, scalable and reliable groupware server. Some of the major features include: a web administration interface, a shared address book with provision for mailbox users as well as contacts and a POP3 as well as IMAP4(rev1) access to mail"
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
+"features include: a web administration interface, a shared address book with "
+"provision for mailbox users as well as contacts and a POP3 as well as IMAP4"
+"(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
-msgid "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, Postfix, Imap, Saslauth. Wizard will make a backup of all your previous configuration files for these services."
+#: ../kolab_wizard/Kolab.pm:66
+msgid ""
+"Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
+"Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
+"configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Pelayan Konfigurasikan"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Pelayan DNS induk"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Internet FTP"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Pelayan DNS hamba"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domain:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domain:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79
-#: ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Katalaluan (sekali lagi)"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Nama:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Katalaluan (sekali lagi)"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Internet Mel."
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
 #: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Namahos:"
 
-#: ../kolab_wizard/Kolab.pm:91
-#, fuzzy
-msgid "Mail domain:"
-msgstr "_Domain NIS:"
-
-#: ../kolab_wizard/Kolab.pm:97
-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/"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "Segerak sedang berjalan"
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Menetapkan pelayan PXE pada sistem anda..."
+#: ../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/"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Menetapkan pelayan PXE pada sistem anda..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "(%ld)PELAYAN >>> %s"
@@ -1035,21 +1123,21 @@ msgid "Delete Ldap configuration"
 msgstr "Konfigurasi Pemuat But"
 
 #: ../ldap_wizard/Ldap.pm:95
-msgid "It is a lightweight protocol for accessing directory services, specifically X.500-based directory services."
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
 msgstr ""
 
 #: ../ldap_wizard/Ldap.pm:95
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:95
-#: ../ldap_wizard/Ldap.pm:103
+#: ../ldap_wizard/Ldap.pm:95 ../ldap_wizard/Ldap.pm:103
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Jurucipta Konfigurasi Internet"
 
-#: ../ldap_wizard/Ldap.pm:110
-#: ../ldap_wizard/Ldap.pm:117
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Anda mesti pertama sekali melaksanakan wizard pelayan DNS"
@@ -1082,8 +1170,7 @@ msgstr "Format pengguna salah pada URL\n"
 msgid "First Name:"
 msgstr "Nama:"
 
-#: ../ldap_wizard/Ldap.pm:139
-#: ../ldap_wizard/Ldap.pm:218
+#: ../ldap_wizard/Ldap.pm:139 ../ldap_wizard/Ldap.pm:218
 msgid "Name:"
 msgstr "Nama:"
 
@@ -1112,8 +1199,7 @@ msgstr "Anda mesti memasukkan Nama Sistem Pengoperasian"
 msgid "LDAP User Password"
 msgstr "Maklumat & Kata Laluan Pengguna"
 
-#: ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:163
+#: ../ldap_wizard/Ldap.pm:162 ../ldap_wizard/Ldap.pm:163
 #, fuzzy
 msgid "passwords must match"
 msgstr "Katalaluan tidak sepadan"
@@ -1123,14 +1209,12 @@ msgstr "Katalaluan tidak sepadan"
 msgid "Password (again):"
 msgstr "Katalaluan (sekali lagi)"
 
-#: ../ldap_wizard/Ldap.pm:167
-#: ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:200
 #, fuzzy
 msgid "You must enter a password for LDAP."
 msgstr "Masukkan kata laluan untuk pengguna yang anda telah tentukan."
 
-#: ../ldap_wizard/Ldap.pm:172
-#: ../ldap_wizard/Ldap.pm:205
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:205
 #, fuzzy
 msgid "The passwords do not match"
 msgstr "Katalaluan tidak sepadan"
@@ -1139,8 +1223,7 @@ msgstr "Katalaluan tidak sepadan"
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181
-#: ../ldap_wizard/Ldap.pm:190
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
 #, fuzzy, perl-format
 msgid "Administrator,%s"
 msgstr "Pentadbir Domain:"
@@ -1169,15 +1252,13 @@ msgstr "Pengurus direktori LDAP"
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:184
-#: ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:230
 #: ../ldap_wizard/Ldap.pm:272
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Pengurus direktori LDAP"
 
-#: ../ldap_wizard/Ldap.pm:185
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:231
 #: ../ldap_wizard/Ldap.pm:273
 #, fuzzy
 msgid "LDAP Administrator:"
@@ -1222,8 +1303,7 @@ msgstr "`(' hilang dalam `%s'"
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Terima Notis Pelayan"
 
-#: ../ldap_wizard/Ldap.pm:232
-#: ../ldap_wizard/Ldap.pm:274
+#: ../ldap_wizard/Ldap.pm:232 ../ldap_wizard/Ldap.pm:274
 #, fuzzy
 msgid "Users Container:"
 msgstr "Pengg_una Samba..."
@@ -1268,7 +1348,9 @@ msgstr " Langkau Wizard"
 
 #: ../news_wizard/Inn.pm:44
 #, fuzzy
-msgid "This wizard will help you configuring the Internet News services for your network."
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
 msgstr "Internet Berita."
 
 #: ../news_wizard/Inn.pm:44
@@ -1278,12 +1360,17 @@ msgstr "Selamat datang ke Wizard Anti Spam KMail!"
 
 #: ../news_wizard/Inn.pm:49
 #, fuzzy
-msgid "Internet host names must be in the form \"host.domain.domaintype\"; for example, if your provider is \"provider.com\", the Internet news server is usually \"news.provider.com\"."
+msgid ""
+"Internet host names must be in the form \"host.domain.domaintype\"; for "
+"example, if your provider is \"provider.com\", the Internet news server is "
+"usually \"news.provider.com\"."
 msgstr "Internet dalam."
 
 #: ../news_wizard/Inn.pm:49
 #, fuzzy
-msgid "The news server name is the name of the host providing the Internet news to your network; the name is usually provided by your provider."
+msgid ""
+"The news server name is the name of the host providing the Internet news to "
+"your network; the name is usually provided by your provider."
 msgstr "Internet."
 
 #: ../news_wizard/Inn.pm:54
@@ -1293,7 +1380,9 @@ msgstr "Nama pelayan NFS:"
 
 #: ../news_wizard/Inn.pm:60
 #, fuzzy
-msgid "Depending on the kind of Internet connection you have, an appropriate polling period can change between 6 and 24 hours."
+msgid ""
+"Depending on the kind of Internet connection you have, an appropriate "
+"polling period can change between 6 and 24 hours."
 msgstr "on dan jam."
 
 #: ../news_wizard/Inn.pm:60
@@ -1302,7 +1391,10 @@ msgstr "Jangkamasa polling"
 
 #: ../news_wizard/Inn.pm:60
 #, fuzzy
-msgid "Your server will regularly poll the News server to obtain the latest Internet News; the polling period sets the interval between two consecutive attempts."
+msgid ""
+"Your server will regularly poll the News server to obtain the latest "
+"Internet News; the polling period sets the interval between two consecutive "
+"attempts."
 msgstr "Berita Pelayan Internet Berita."
 
 #: ../news_wizard/Inn.pm:65
@@ -1326,14 +1418,19 @@ msgstr "Comment=Detik Berita"
 
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
-msgid "The wizard collected the following parameters needed to configure your Internet News service:"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr "Internet Berita:"
 
-#: ../news_wizard/Inn.pm:86
-#: ../postfix_wizard/Postfix.pm:249
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:249
 #, fuzzy
-msgid "To accept these values, and configure your server, click the next button or use the back button to correct them."
-msgstr "Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau guna butang Undur untuk membetulkan mereka."
+msgid ""
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
+msgstr ""
+"Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau "
+"guna butang Undur untuk membetulkan mereka."
 
 #: ../news_wizard/Inn.pm:88
 #, fuzzy
@@ -1347,7 +1444,8 @@ msgstr "jarakmasa `%s' tidak sah"
 
 #: ../news_wizard/Inn.pm:95
 #, fuzzy
-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 "Internet Berita."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1355,15 +1453,13 @@ msgstr "Internet Berita."
 msgid "NFS Wizard"
 msgstr " Langkau Wizard"
 
-#: ../nfs_wizard/NFS.pm:45
-#: ../proxy_wizard/Squid.pm:41
+#: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:41
 #: ../samba_wizard/Sambashare.pm:65
 #, fuzzy
 msgid "All - No access restriction"
 msgstr "Benarkan capaian dari semua hos"
 
-#: ../nfs_wizard/NFS.pm:46
-#: ../proxy_wizard/Squid.pm:42
+#: ../nfs_wizard/NFS.pm:46 ../proxy_wizard/Squid.pm:42
 #, fuzzy
 msgid "Local Network - access for local network (recommended)"
 msgstr "Rangkaian lokal"
@@ -1379,15 +1475,17 @@ msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Pelayan."
 
 #: ../nfs_wizard/NFS.pm:56
-msgid "Directory which will be exported to NFS clients. This directory will be exported in read only mode. It denies any request which requires changes to the filesystem."
+msgid ""
+"Directory which will be exported to NFS clients. This directory will be "
+"exported in read only mode. It denies any request which requires changes to "
+"the filesystem."
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:58
 msgid "Directory:"
 msgstr "Direktori:"
 
-#: ../nfs_wizard/NFS.pm:62
-#: ../web_wizard/Apache.pm:120
+#: ../nfs_wizard/NFS.pm:62 ../web_wizard/Apache.pm:120
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -1398,27 +1496,29 @@ msgstr "Utiliti senarai kawalan akses."
 
 #: ../nfs_wizard/NFS.pm:69
 #, fuzzy
-msgid "Choose the level that suits your needs. If you don't know, the local network level is usually the most appropriate. Beware that the all level may be not secure."
+msgid ""
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
+"secure."
 msgstr "Rangkaian Semua."
 
 #: ../nfs_wizard/NFS.pm:69
 msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:80
-#: ../proxy_wizard/Squid.pm:124
+#: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:124
 #, fuzzy
-msgid "Access will be allowed for hosts on the network. Here is the information found about your current local network, you can modify it if needed."
+msgid ""
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr "hos on lokal."
 
-#: ../nfs_wizard/NFS.pm:80
-#: ../proxy_wizard/Squid.pm:124
+#: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:124
 #, fuzzy
 msgid "Grant access on local network"
 msgstr "on lokal"
 
-#: ../nfs_wizard/NFS.pm:82
-#: ../proxy_wizard/Squid.pm:129
+#: ../nfs_wizard/NFS.pm:82 ../proxy_wizard/Squid.pm:129
 #, fuzzy
 msgid "Authorized network:"
 msgstr "Rangkaian tidak dapat dicapai."
@@ -1445,8 +1545,7 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:70
-#: ../nisautofs_wizard/Nisautofs.pm:75
+#: ../nisautofs_wizard/Nisautofs.pm:70 ../nisautofs_wizard/Nisautofs.pm:75
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Pelayan Berita"
@@ -1456,15 +1555,22 @@ msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:70
-msgid "Users automatically mount their home directory from server, when they log on a NIS client computer network."
+msgid ""
+"Users automatically mount their home directory from server, when they log on "
+"a NIS client computer network."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:75
-msgid "A NIS server is useful to create user, hostname database. The wizard builds autofs map, so it will provide the capabilities for NIS user to automount their home directory on a NIS client computer."
+msgid ""
+"A NIS server is useful to create user, hostname database. The wizard builds "
+"autofs map, so it will provide the capabilities for NIS user to automount "
+"their home directory on a NIS client computer."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:75
-msgid "Home NIS: home base directory for users on NIS server. This directory will be exported through NFS server."
+msgid ""
+"Home NIS: home base directory for users on NIS server. This directory will "
+"be exported through NFS server."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:75
@@ -1475,20 +1581,17 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server:"
 msgstr "_Pelayan NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:78
-#: ../nisautofs_wizard/Nisautofs.pm:96
+#: ../nisautofs_wizard/Nisautofs.pm:78 ../nisautofs_wizard/Nisautofs.pm:96
 #, fuzzy
 msgid "Home NIS:"
 msgstr "_Domain NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:79
-#: ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:79 ../nisautofs_wizard/Nisautofs.pm:97
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Nama domain DNS:"
@@ -1522,7 +1625,9 @@ msgstr " --help           Sangat jelas..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:114
 #, fuzzy
-msgid "The wizard successfully configured your machine to be a NIS server with autofs map."
+msgid ""
+"The wizard successfully configured your machine to be a NIS server with "
+"autofs map."
 msgstr "Internet Berita."
 
 #: ../nisautofs_wizard/Nisautofs.pm:276
@@ -1541,7 +1646,9 @@ msgid "Postfix wizard"
 msgstr " Langkau Wizard"
 
 #: ../postfix_wizard/Postfix.pm:93
-msgid "Error, can't find your hostname in /etc/hosts. Exiting. Please launch drakconnect and choose static IP address."
+msgid ""
+"Error, can't find your hostname in /etc/hosts. Exiting. Please launch "
+"drakconnect and choose static IP address."
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:103
@@ -1554,15 +1661,13 @@ msgstr "Pelayan Mel (SMTP)"
 msgid "Relay mail server"
 msgstr "Pelayan Mel (SMTP)"
 
-#: ../postfix_wizard/Postfix.pm:108
-#: ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
+#: ../sshd_wizard/Sshd.pm:64
 #, fuzzy
 msgid "Newbie - classical options"
 msgstr "Pilihan Pengguna Diketahui"
 
-#: ../postfix_wizard/Postfix.pm:109
-#: ../samba_wizard/Sambashare.pm:71
+#: ../postfix_wizard/Postfix.pm:109 ../samba_wizard/Sambashare.pm:71
 #, fuzzy
 msgid "Expert - advanced options"
 msgstr "_Papar pilihan lanjut"
@@ -1574,23 +1679,23 @@ msgstr "Wizard tetapan utama DNS"
 
 #: ../postfix_wizard/Postfix.pm:116
 #, fuzzy
-msgid "This wizard will help you configure a Postfix mail server or a Postfix mail relay."
+msgid ""
+"This wizard will help you configure a Postfix mail server or a Postfix mail "
+"relay."
 msgstr "FTP Pelayan."
 
-#: ../postfix_wizard/Postfix.pm:121
-#: ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69
-#: ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Maklumat"
 
 #: ../postfix_wizard/Postfix.pm:121
-msgid "It seems you previously setup a Postfix configuration. This wizard will re-read your old configuration, and show you the Postfix server type you choose"
+msgid ""
+"It seems you previously setup a Postfix configuration. This wizard will re-"
+"read your old configuration, and show you the Postfix server type you choose"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:129
-#: ../pxe_wizard/Pxe.pm:126
+#: ../postfix_wizard/Postfix.pm:129 ../pxe_wizard/Pxe.pm:126
 #, fuzzy
 msgid "What do you want to do:"
 msgstr "Apa yang anda ingin lakukan sekarang?"
@@ -1599,8 +1704,7 @@ msgstr "Apa yang anda ingin lakukan sekarang?"
 msgid "Now I need to know your understanding in Postfix server configuration"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:136
-#: ../samba_wizard/Sambashare.pm:167
+#: ../postfix_wizard/Postfix.pm:136 ../samba_wizard/Sambashare.pm:167
 #, fuzzy
 msgid "What kind of user are you:"
 msgstr "Apakah zon waktu di lokasi anda?"
@@ -1616,15 +1720,15 @@ msgid "Smtpd banner:"
 msgstr "Memulakan pemidang"
 
 #: ../postfix_wizard/Postfix.pm:158
-msgid "The myhostname parameter specifies the internet hostname of this  mail system. ie: myhostname = myhostname"
+msgid ""
+"The myhostname parameter specifies the internet hostname of this  mail "
+"system. ie: myhostname = myhostname"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domain:"
-
-#: ../postfix_wizard/Postfix.pm:159
-msgid "The mydomain parameter specifies the local internet domain name. ie: mydomain = mydomain"
+msgid ""
+"The mydomain parameter specifies the local internet domain name. ie: "
+"mydomain = mydomain"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:160
@@ -1633,7 +1737,9 @@ msgid "Origin:"
 msgstr "myorigin:"
 
 #: ../postfix_wizard/Postfix.pm:160
-msgid "The myorigin parameter specifies the domain that locally-posted mail appears to come from. ie: myorigin = $myhostname"
+msgid ""
+"The myorigin parameter specifies the domain that locally-posted mail appears "
+"to come from. ie: myorigin = $myhostname"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:164
@@ -1655,11 +1761,14 @@ msgid "Main Postfix server"
 msgstr "Terima Notis Pelayan"
 
 #: ../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 ""
 
 #: ../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."
+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 ""
 
 #: ../postfix_wizard/Postfix.pm:179
@@ -1678,15 +1787,23 @@ msgid "Masquerade domains"
 msgstr "Domain Failover"
 
 #: ../postfix_wizard/Postfix.pm:181
-msgid "This should be chosen consistently with the address you use for incoming mail. Address masquerading is a method to hide all hosts inside a domain behind their mail gateway, and to make it appear as if the mail comes from the gateway itself, instead of from individual machines."
+msgid ""
+"This should be chosen consistently with the address you use for incoming "
+"mail. Address masquerading is a method to hide all hosts inside a domain "
+"behind their mail gateway, and to make it appear as if the mail comes from "
+"the gateway itself, instead of from individual machines."
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:185
-msgid "Masquerade should be a valid domain name such as \"domain_to_masquerade.com with_this_domain.com\"!"
+msgid ""
+"Masquerade should be a valid domain name such as \"domain_to_masquerade.com "
+"with_this_domain.com\"!"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:192
-msgid "Relay domains: what destination domains (and subdomains thereof) this system will relay mail to."
+msgid ""
+"Relay domains: what destination domains (and subdomains thereof) this system "
+"will relay mail to."
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:192
@@ -1694,20 +1811,20 @@ msgstr ""
 msgid "Relay server"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../postfix_wizard/Postfix.pm:198
-#: ../postfix_wizard/Postfix.pm:251
+#: ../postfix_wizard/Postfix.pm:198 ../postfix_wizard/Postfix.pm:251
 #, fuzzy
 msgid "Relay host:"
 msgstr "Hos tidak diketahui %s."
 
-#: ../postfix_wizard/Postfix.pm:199
-#: ../postfix_wizard/Postfix.pm:252
+#: ../postfix_wizard/Postfix.pm:199 ../postfix_wizard/Postfix.pm:252
 #, fuzzy
 msgid "Relay domains:"
 msgstr "Domain Failover"
 
 #: ../postfix_wizard/Postfix.pm:199
-msgid "What destination domains (and subdomains thereof) this system will relay mail to. ie: mydomain.com"
+msgid ""
+"What destination domains (and subdomains thereof) this system will relay "
+"mail to. ie: mydomain.com"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:201
@@ -1721,21 +1838,24 @@ msgid "Network config"
 msgstr "Dialog Tetapan"
 
 #: ../postfix_wizard/Postfix.pm:215
-msgid "The network interface addresses that this mail system receives mail on. By default, the software claims all active interfaces on the machine. ie: all"
+msgid ""
+"The network interface addresses that this mail system receives mail on. By "
+"default, the software claims all active interfaces on the machine. ie: all"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:215
-#: ../postfix_wizard/Postfix.pm:260
+#: ../postfix_wizard/Postfix.pm:215 ../postfix_wizard/Postfix.pm:260
 #, fuzzy
 msgid "inet interfaces:"
 msgstr "Antaramuka untuk sokongan kebolehcapaian."
 
 #: ../postfix_wizard/Postfix.pm:216
-msgid "The list of domains that are delivered via the $local_transport mail delivery transport. ie: $myhostname, localhost.$mydomain, /etc/postfix/destinations"
+msgid ""
+"The list of domains that are delivered via the $local_transport mail "
+"delivery transport. ie: $myhostname, localhost.$mydomain, /etc/postfix/"
+"destinations"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:216
-#: ../postfix_wizard/Postfix.pm:261
+#: ../postfix_wizard/Postfix.pm:216 ../postfix_wizard/Postfix.pm:261
 #, fuzzy
 msgid "my destination:"
 msgstr "Fail destinasi"
@@ -1744,14 +1864,15 @@ msgstr "Fail destinasi"
 msgid "The list of trusted SMTP clients. ie: 127.0.0.0/32, 192.168.1.0/24"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:217
-#: ../postfix_wizard/Postfix.pm:262
+#: ../postfix_wizard/Postfix.pm:217 ../postfix_wizard/Postfix.pm:262
 #, fuzzy
 msgid "my networks:"
 msgstr "Laman Web Saya"
 
 #: ../postfix_wizard/Postfix.pm:219
-msgid "This is the list of trusted SMTP clients. For security reason, please provide one. ie: 127.0.0.0/32, 192.168.1.0/24"
+msgid ""
+"This is the list of trusted SMTP clients. For security reason, please "
+"provide one. ie: 127.0.0.0/32, 192.168.1.0/24"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:229
@@ -1766,7 +1887,9 @@ msgid "Various options to configure your message queue, delay, size..."
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:236
-msgid "Determines how long a message should stay in the queue before it is deemed undeliverable. The default is five days (5d)"
+msgid ""
+"Determines how long a message should stay in the queue before it is deemed "
+"undeliverable. The default is five days (5d)"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:236
@@ -1789,11 +1912,15 @@ msgid "Delay warning time:"
 msgstr "Masa Ketara Lokal"
 
 #: ../postfix_wizard/Postfix.pm:238
-msgid "The delay_warning_time specifies after how many hours a warning is sent that mail has not yet been delivered."
+msgid ""
+"The delay_warning_time specifies after how many hours a warning is sent that "
+"mail has not yet been delivered."
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:243
-msgid "Error, sendmail is installed. Please remove it before installing or configuring Postfix"
+msgid ""
+"Error, sendmail is installed. Please remove it before installing or "
+"configuring Postfix"
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:249
@@ -1803,7 +1930,9 @@ msgstr "Menetapkan pelayan PXE pada sistem anda..."
 
 #: ../postfix_wizard/Postfix.pm:249
 #, fuzzy
-msgid "The wizard collected the following parameters needed to configure your relay mail server:"
+msgid ""
+"The wizard collected the following parameters needed to configure your relay "
+"mail server:"
 msgstr "Internet Mel:"
 
 #: ../postfix_wizard/Postfix.pm:258
@@ -1816,8 +1945,7 @@ msgstr "Internet Mel."
 msgid "The wizard successfully configured your Postfix Mail server."
 msgstr "Internet FTP"
 
-#: ../postfix_wizard/Postfix.pm:294
-#: ../postfix_wizard/Postfix.pm:366
+#: ../postfix_wizard/Postfix.pm:294 ../postfix_wizard/Postfix.pm:366
 #: ../postfix_wizard/Postfix.pm:386
 #, fuzzy
 msgid "Postfix Server"
@@ -1827,8 +1955,7 @@ msgstr "(%ld)PELAYAN >>> %s"
 msgid "removing Sendmail to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:366
-#: ../postfix_wizard/Postfix.pm:386
+#: ../postfix_wizard/Postfix.pm:366 ../postfix_wizard/Postfix.pm:386
 #, fuzzy
 msgid "Configuring your Postfix server....."
 msgstr "Menetapkan pelayan PXE pada sistem anda..."
@@ -1858,7 +1985,9 @@ msgstr "Jurucipta Konfigurasi Internet"
 
 #: ../proxy_wizard/Squid.pm:72
 #, fuzzy
-msgid "Squid is a web caching proxy server, it allows faster web access for your local network."
+msgid ""
+"Squid is a web caching proxy server, it allows faster web access for your "
+"local network."
 msgstr "lokal."
 
 #: ../proxy_wizard/Squid.pm:72
@@ -1873,7 +2002,10 @@ msgstr "Liang proksi:"
 
 #: ../proxy_wizard/Squid.pm:77
 #, fuzzy
-msgid "Proxy port value sets what port the proxy server will listen on for http requests. Default is 3128, other common value can be 8080, the port value needs to be greater than 1024."
+msgid ""
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr "Proksi on Default."
 
 #: ../proxy_wizard/Squid.pm:83
@@ -1882,7 +2014,8 @@ msgstr "Liang proksi:"
 
 #: ../proxy_wizard/Squid.pm:88
 #, fuzzy
-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 "Seterusnya Undur."
 
 #: ../proxy_wizard/Squid.pm:88
@@ -1900,7 +2033,8 @@ msgstr "dan"
 
 #: ../proxy_wizard/Squid.pm:99
 #, fuzzy
-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 "on."
 
 #: ../proxy_wizard/Squid.pm:99
@@ -1910,7 +2044,9 @@ msgstr "on:"
 
 #: ../proxy_wizard/Squid.pm:99
 #, fuzzy
-msgid "Memory Cache is the amount of RAM dedicated to cache memory operations (note that actual memory usage of the whole squid process is bigger)."
+msgid ""
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr "Memori."
 
 #: ../proxy_wizard/Squid.pm:99
@@ -1918,15 +2054,13 @@ msgstr "Memori."
 msgid "Proxy Cache Size"
 msgstr "Saiz Cache Servis"
 
-#: ../proxy_wizard/Squid.pm:105
-#: ../proxy_wizard/Squid.pm:158
+#: ../proxy_wizard/Squid.pm:105 ../proxy_wizard/Squid.pm:158
 #: ../proxy_wizard/Squid.pm:171
 #, fuzzy
 msgid "Memory cache (MB):"
 msgstr "Ruang Swap (MB)"
 
-#: ../proxy_wizard/Squid.pm:106
-#: ../proxy_wizard/Squid.pm:159
+#: ../proxy_wizard/Squid.pm:106 ../proxy_wizard/Squid.pm:159
 #: ../proxy_wizard/Squid.pm:172
 #, fuzzy
 msgid "Disk space (MB):"
@@ -1939,7 +2073,10 @@ msgstr "Utiliti senarai kawalan akses."
 
 #: ../proxy_wizard/Squid.pm:111
 #, fuzzy
-msgid "Choose the level that suits your needs. If you don't know, the Local Network level is usually the most appropriate. Beware that the All level may be not secure."
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
 msgstr "Rangkaian Semua."
 
 #: ../proxy_wizard/Squid.pm:111
@@ -1947,69 +2084,75 @@ msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:124
-msgid "You can use either a numeric format like \"192.168.1.0/255.255.255.0\" or a text format like \".domain.net\""
+msgid ""
+"You can use either a numeric format like \"192.168.1.0/255.255.255.0\" or a "
+"text format like \".domain.net\""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:129
-msgid "Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like \".domain.net\""
+msgid ""
+"Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like "
+"\".domain.net\""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:134
 #, fuzzy
-msgid "As an option, Squid can be configured in proxy cascading. You can add a new upper level proxy by specifying its hostname and port."
+msgid ""
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr "dalam dan."
 
-#: ../proxy_wizard/Squid.pm:134
-#: ../proxy_wizard/Squid.pm:147
+#: ../proxy_wizard/Squid.pm:134 ../proxy_wizard/Squid.pm:147
 #, fuzzy
 msgid "Cache hierarchy"
 msgstr "Maklumat Cache"
 
 #: ../proxy_wizard/Squid.pm:134
-msgid "You can safely select \"No upper level proxy\" if you don't need this feature."
+msgid ""
+"You can safely select \"No upper level proxy\" if you don't need this "
+"feature."
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:147
 #, fuzzy
-msgid "Enter the qualified hostname (like \"cache.domain.net\") and the port of the proxy to use."
+msgid ""
+"Enter the qualified hostname (like \"cache.domain.net\") and the port of the "
+"proxy to use."
 msgstr "Enter dan."
 
-#: ../proxy_wizard/Squid.pm:149
-#: ../proxy_wizard/Squid.pm:161
+#: ../proxy_wizard/Squid.pm:149 ../proxy_wizard/Squid.pm:161
 msgid "Upper level proxy hostname:"
 msgstr ""
 
-#: ../proxy_wizard/Squid.pm:150
-#: ../proxy_wizard/Squid.pm:162
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:162
 msgid "Upper level proxy port:"
 msgstr ""
 
-#: ../proxy_wizard/Squid.pm:155
-#: ../proxy_wizard/Squid.pm:168
+#: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
 #, fuzzy
 msgid "Configuring the Proxy"
 msgstr "Proksi SOCKS: %s"
 
-#: ../proxy_wizard/Squid.pm:155
-#: ../proxy_wizard/Squid.pm:168
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+#: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
+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:126
+#: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
+#: ../samba_wizard/Samba.pm:332 ../web_wizard/Apache.pm:126
 #, fuzzy
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
-msgstr "Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau guna butang Undur untuk membetulkan mereka."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau "
+"guna butang Undur untuk membetulkan mereka."
 
-#: ../proxy_wizard/Squid.pm:157
-#: ../proxy_wizard/Squid.pm:170
+#: ../proxy_wizard/Squid.pm:157 ../proxy_wizard/Squid.pm:170
 msgid "Port:"
 msgstr "Port:"
 
-#: ../proxy_wizard/Squid.pm:160
-#: ../proxy_wizard/Squid.pm:173
+#: ../proxy_wizard/Squid.pm:160 ../proxy_wizard/Squid.pm:173
 #, fuzzy
 msgid "Access Control:"
 msgstr "Utiliti senarai kawalan akses."
@@ -2035,11 +2178,12 @@ msgid "PXE Wizard"
 msgstr "Wizard PXE"
 
 #: ../pxe_wizard/Pxe.pm:78
-msgid "You need to readjust your domainname, not equal to localdomain or none. Please launch drakconnect to adjust it."
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:85
-#: ../pxe_wizard/Pxe.pm:192
+#: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 #, fuzzy
 msgid "Set PXE server"
 msgstr "Tetap pelayan PXE"
@@ -2072,7 +2216,13 @@ msgid "Set a PXE server."
 msgstr "Tetapkan pelayan PXE."
 
 #: ../pxe_wizard/Pxe.pm:111
-msgid "This wizard will help you configuring the PXE server, and PXE boot image management. PXE (Pre-boot eXecution Environment) is a protocol designed by Intel that allows computers to boot through the network. PXE is stored in the ROM of new generation network cards. When the computer boots up, the BIOS loads the PXE ROM in the memory and executes it. A menu is displayed, allowing the computer to boot an operating system loaded through the network."
+msgid ""
+"This wizard will help you configuring the PXE server, and PXE boot image "
+"management. PXE (Pre-boot eXecution Environment) is a protocol designed by "
+"Intel that allows computers to boot through the network. PXE is stored in "
+"the ROM of new generation network cards. When the computer boots up, the "
+"BIOS loads the PXE ROM in the memory and executes it. A menu is displayed, "
+"allowing the computer to boot an operating system loaded through the network."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132
@@ -2080,14 +2230,16 @@ msgstr ""
 msgid "Add a boot image"
 msgstr "Tambah semua imej boot all.rdz"
 
-#: ../pxe_wizard/Pxe.pm:132
-#: ../pxe_wizard/Pxe.pm:142
-msgid "PXE description is used to explain the role of the boot image, e.g.: Mandriva Linux 10 image, Mandriva Linux cooker image.."
+#: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
+msgid ""
+"PXE description is used to explain the role of the boot image, e.g.: "
+"Mandriva Linux 10 image, Mandriva Linux cooker image.."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:132
-#: ../pxe_wizard/Pxe.pm:142
-msgid "PXE name: the name displayed in PXE menu (please provide an ASCII word or a number, with no spaces)"
+#: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
+msgid ""
+"PXE name: the name displayed in PXE menu (please provide an ASCII word or a "
+"number, with no spaces)"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132
@@ -2095,7 +2247,10 @@ msgid "Path to image: provide the full path to the network boot image"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132
-msgid "To boot through network, the network computer needs a boot image. Moreover we need to name this image, so each boot image is related to a name in PXE menu. User can then choose which image he wants to boot through PXE."
+msgid ""
+"To boot through network, the network computer needs a boot image. Moreover "
+"we need to name this image, so each boot image is related to a name in PXE "
+"menu. User can then choose which image he wants to boot through PXE."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:142
@@ -2104,7 +2259,10 @@ msgid "Add all.rdz boot image"
 msgstr "Tambah semua imej boot all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:142
-msgid "For technical reason, in case of multiple boot image, it's more simple to boot network computer through a kernel (vmlinuz), and provide one file with all drivers needed (in our case all.rdz)."
+msgid ""
+"For technical reason, in case of multiple boot image, it's more simple to "
+"boot network computer through a kernel (vmlinuz), and provide one file with "
+"all drivers needed (in our case all.rdz)."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:142
@@ -2112,11 +2270,15 @@ msgid "Path to all.rdz: provide the full path to all.rdz image"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:142
-msgid "To boot through network, network computers need a boot image. Moreover we need to name this image, so each boot image is related to a name in PXE menu. So user can choose which image he wants to boot through PXE."
+msgid ""
+"To boot through network, network computers need a boot image. Moreover we "
+"need to name this image, so each boot image is related to a name in PXE "
+"menu. So user can choose which image he wants to boot through PXE."
 msgstr ""
 
 #: ../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_wizard/Pxe.pm:153
@@ -2139,16 +2301,17 @@ msgid "Add options to boot image"
 msgstr "Tambah semua imej boot all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "In some cases, you want to add some options to the PXE boot image. This wizard provides an easy way to customize a boot image with common parameters."
+msgid ""
+"In some cases, you want to add some options to the PXE boot image. This "
+"wizard provides an easy way to customize a boot image with common parameters."
 msgstr ""
 
 #: ../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 ""
 
-#: ../pxe_wizard/Pxe.pm:163
-#: ../pxe_wizard/Pxe.pm:172
-#: ../pxe_wizard/Pxe.pm:250
+#: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
 #, fuzzy
 msgid "Boot image to modify:"
 msgstr "Gagal untuk muatkan imej \"%1\"\n"
@@ -2160,7 +2323,8 @@ msgstr "Format imej tidak diketahui"
 
 #: ../pxe_wizard/Pxe.pm:170
 #, fuzzy
-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 "Direktori: path penuh ke direktori pelayan pemasangan Mandriva Linux"
 
 #: ../pxe_wizard/Pxe.pm:170
@@ -2169,23 +2333,22 @@ msgid "Installation method: choose NFS or HTTP."
 msgstr "kaedah pemasangan: pilih NFS atau HTTP"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Server IP: IP address of the server, which contains installation directory. You can create one with Mandriva Linux install server wizard."
+msgid ""
+"Server IP: IP address of the server, which contains installation directory. "
+"You can create one with Mandriva Linux install server wizard."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:173
-#: ../pxe_wizard/Pxe.pm:251
+#: ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
 #, fuzzy
 msgid "Server IP:"
 msgstr "IP jauh pelayan X"
 
-#: ../pxe_wizard/Pxe.pm:174
-#: ../pxe_wizard/Pxe.pm:252
+#: ../pxe_wizard/Pxe.pm:174 ../pxe_wizard/Pxe.pm:252
 #, fuzzy
 msgid "Install directory:"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: ../pxe_wizard/Pxe.pm:175
-#: ../pxe_wizard/Pxe.pm:253
+#: ../pxe_wizard/Pxe.pm:175 ../pxe_wizard/Pxe.pm:253
 #, fuzzy
 msgid "Installation method:"
 msgstr "Kaedah Pemasangan"
@@ -2195,7 +2358,9 @@ msgid "ACPI option: Advanced Configuration and Power Interface"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
-msgid "Network client interface: the network interface used for the installation process."
+msgid ""
+"Network client interface: the network interface used for the installation "
+"process."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
@@ -2206,51 +2371,52 @@ msgstr ""
 msgid "VGA option: if you encounter any problem with VGA, please adjust. "
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:182
-#: ../pxe_wizard/Pxe.pm:254
+#: ../pxe_wizard/Pxe.pm:182 ../pxe_wizard/Pxe.pm:254
 #, fuzzy
 msgid "Network client interface:"
 msgstr "Ulangtetap antaramuka rangkaian"
 
-#: ../pxe_wizard/Pxe.pm:183
-#: ../pxe_wizard/Pxe.pm:255
+#: ../pxe_wizard/Pxe.pm:183 ../pxe_wizard/Pxe.pm:255
 msgid "Ramsize:"
 msgstr "Saiz RAM:"
 
-#: ../pxe_wizard/Pxe.pm:184
-#: ../pxe_wizard/Pxe.pm:256
+#: ../pxe_wizard/Pxe.pm:184 ../pxe_wizard/Pxe.pm:256
 #, fuzzy
 msgid "VGA option:"
 msgstr "Pilihan\t\tMakna\n"
 
-#: ../pxe_wizard/Pxe.pm:185
-#: ../pxe_wizard/Pxe.pm:257
+#: ../pxe_wizard/Pxe.pm:185 ../pxe_wizard/Pxe.pm:257
 #, fuzzy
 msgid "ACPI option:"
 msgstr "Pilihan\t\tMakna\n"
 
-#: ../pxe_wizard/Pxe.pm:186
-#: ../pxe_wizard/Pxe.pm:258
+#: ../pxe_wizard/Pxe.pm:186 ../pxe_wizard/Pxe.pm:258
 #, fuzzy
 msgid "APIC option:"
 msgstr "Pilihan\t\tMakna\n"
 
-#: ../pxe_wizard/Pxe.pm:187
-#: ../pxe_wizard/Pxe.pm:259
+#: ../pxe_wizard/Pxe.pm:187 ../pxe_wizard/Pxe.pm:259
 #, fuzzy
 msgid "Custom option:"
 msgstr "Pilihan\t\tMakna\n"
 
 #: ../pxe_wizard/Pxe.pm:192
-msgid "Now the wizard will configure all needed default configuration files to allow computers to boot through the network."
+msgid ""
+"Now the wizard will configure all needed default configuration files to "
+"allow computers to boot through the network."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:192
-msgid "We need to use a special dhcpd.conf file with PXE parameter. To set up such a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you don't do that, PXE query will not be answered by this server."
+msgid ""
+"We need to use a special dhcpd.conf file with PXE parameter. To set up such "
+"a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you "
+"don't do that, PXE query will not be answered by this server."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:196
-msgid "Please provide a bootable image. To boot through a network, network computers need a boot image."
+msgid ""
+"Please provide a bootable image. To boot through a network, network "
+"computers need a boot image."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
@@ -2258,30 +2424,33 @@ msgid "We need an all.rdz or a network.img image. Please add one."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:208
-msgid "Please provide an all.rdz image, which contains all drivers. You can find one on the first CD of the Mandriva Linux distribution, in the /isolinux/alt0/ directory."
+msgid ""
+"Please provide an all.rdz image, which contains all drivers. You can find "
+"one on the first CD of the Mandriva Linux distribution, in the /isolinux/"
+"alt0/ directory."
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:212
-#: ../pxe_wizard/Pxe.pm:216
+#: ../pxe_wizard/Pxe.pm:212 ../pxe_wizard/Pxe.pm:216
 #, perl-format
 msgid "Please choose an image from a different directory than %s."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:220
-msgid "Please provide a correct PXE name: one ASCII word or one number with no spaces."
+msgid ""
+"Please provide a correct PXE name: one ASCII word or one number with no "
+"spaces."
 msgstr ""
 
 #: ../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_wizard/Pxe.pm:229
-#: ../pxe_wizard/Pxe.pm:233
+#: ../pxe_wizard/Pxe.pm:229 ../pxe_wizard/Pxe.pm:233
 msgid "A similar name is already used in PXE menu"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:229
-#: ../pxe_wizard/Pxe.pm:233
+#: ../pxe_wizard/Pxe.pm:229 ../pxe_wizard/Pxe.pm:233
 #, fuzzy
 msgid "Please provide another one."
 msgstr "Sila Nyatakan Fail Kulit"
@@ -2326,8 +2495,7 @@ msgstr ""
 "masukan utk penghapusan hilang\n"
 "(satu dari %s)\n"
 
-#: ../pxe_wizard/Pxe.pm:274
-#: ../pxe_wizard/Pxe.pm:284
+#: ../pxe_wizard/Pxe.pm:274 ../pxe_wizard/Pxe.pm:284
 #, fuzzy
 msgid "The wizard will now add this PXE boot image"
 msgstr "DHCP."
@@ -2377,7 +2545,9 @@ msgstr "(%ld)PELAYAN >>> %s"
 
 #: ../samba_wizard/Samba.pm:94
 #, fuzzy
-msgid "Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
 msgstr "fail dan."
 
 #: ../samba_wizard/Samba.pm:94
@@ -2385,12 +2555,10 @@ msgstr "fail dan."
 msgid "Samba server configuration Wizard"
 msgstr "Wizard tetapan utama DNS"
 
-#: ../samba_wizard/Samba.pm:99
-msgid "It seems you previously setup a Samba server. This wizard will re-read your old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
-msgid "Domain master = yes, causes the server to register the NetBIOS name <pdc name>1B. This name will be recognized by other servers."
+msgid ""
+"Domain master = yes, causes the server to register the NetBIOS name <pdc "
+"name>1B. This name will be recognized by other servers."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:121
@@ -2398,11 +2566,14 @@ msgid "PDC server: primary domain controller"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:121
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
 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
@@ -2410,46 +2581,45 @@ msgstr ""
 msgid "Domain logons:"
 msgstr "_Domain NIS:"
 
-#: ../samba_wizard/Samba.pm:142
-#: ../samba_wizard/Samba.pm:190
+#: ../samba_wizard/Samba.pm:142 ../samba_wizard/Samba.pm:190
 #: ../samba_wizard/Samba.pm:220
 #, fuzzy
 msgid "Domain master:"
 msgstr "Zon Induk"
 
-#: ../samba_wizard/Samba.pm:143
-#: ../samba_wizard/Samba.pm:191
+#: ../samba_wizard/Samba.pm:143 ../samba_wizard/Samba.pm:191
 #: ../samba_wizard/Samba.pm:219
 #, fuzzy
 msgid "Security:"
 msgstr "Keselamatan"
 
-#: ../samba_wizard/Samba.pm:144
-#: ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:144 ../samba_wizard/Samba.pm:175
 #, fuzzy
 msgid "Wins support:"
 msgstr "Sokongan tetikus"
 
-#: ../samba_wizard/Samba.pm:145
-#: ../samba_wizard/Samba.pm:197
+#: ../samba_wizard/Samba.pm:145 ../samba_wizard/Samba.pm:197
 #, fuzzy
 msgid "admin users:"
 msgstr "Pengg_una Samba..."
 
-#: ../samba_wizard/Samba.pm:145
-#: ../samba_wizard/Samba.pm:197
+#: ../samba_wizard/Samba.pm:145 ../samba_wizard/Samba.pm:197
 #, fuzzy
 msgid "root @adm"
 msgstr "_Katalaluan root: "
 
-#: ../samba_wizard/Samba.pm:146
-#: ../samba_wizard/Samba.pm:192
+#: ../samba_wizard/Samba.pm:146 ../samba_wizard/Samba.pm:192
 #, fuzzy
 msgid "Os level:"
 msgstr "_Aras RAID:"
 
 #: ../samba_wizard/Samba.pm:146
-msgid "The global os level option dictates the operating system level at which Samba will masquerade during a browser election. If you wish to have Samba win an election and become the master browser, you can set the level above that of the operating system on your network with the highest current value. ie: os level = 34"
+msgid ""
+"The global os level option dictates the operating system level at which "
+"Samba will masquerade during a browser election. If you wish to have Samba "
+"win an election and become the master browser, you can set the level above "
+"that of the operating system on your network with the highest current value. "
+"ie: os level = 34"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:151
@@ -2462,11 +2632,18 @@ msgid "BDC server: backup domain controller"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:158
-msgid "This enables BDCs to carry much of the network logon processing. A BDC on a local segment handles logon requests and authenticates users when the PDC is busy on the local network. When a segment becomes heavily loaded, the reponsibility is offloaded to another segment's BDC or to the PDC."
+msgid ""
+"This enables BDCs to carry much of the network logon processing. A BDC on a "
+"local segment handles logon requests and authenticates users when the PDC is "
+"busy on the local network. When a segment becomes heavily loaded, the "
+"reponsibility is offloaded to another segment's BDC or to the PDC."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "This specifies the IP address (or DNS name: IP address for preference) of the WINS server that nmbd(8) should register with. If you have a WINS server on your network then you should set this to the WINS server's IP."
+msgid ""
+"This specifies the IP address (or DNS name: IP address for preference) of "
+"the WINS server that nmbd(8) should register with. If you have a WINS server "
+"on your network then you should set this to the WINS server's IP."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
@@ -2479,7 +2656,9 @@ msgid "Wins name resolve order:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:181
-msgid "Your server doesn't support Wins. Please provide a Wins server, or leave blank Wins Support entry."
+msgid ""
+"Your server doesn't support Wins. Please provide a Wins server, or leave "
+"blank Wins Support entry."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:188
@@ -2535,7 +2714,10 @@ msgid "LDAP configuration for Domain Controlling"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:232
-msgid "The account (dn) that samba uses to access the LDAP server. This account needs to have write access to the LDAP tree. You will need to give samba the password for this dn."
+msgid ""
+"The account (dn) that samba uses to access the LDAP server. This account "
+"needs to have write access to the LDAP tree. You will need to give samba the "
+"password for this dn."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:255
@@ -2544,7 +2726,10 @@ msgid "Passdb backend"
 msgstr "Antaramuka (Bahagian belakang)"
 
 #: ../samba_wizard/Samba.pm:256
-msgid " The ldap admin dn defines the Distinguished Name (DN) name used by Samba to contact the ldap server when retreiving user account information. ie: cn=Manager,dc=mydomain,dc=com"
+msgid ""
+" The ldap admin dn defines the Distinguished Name (DN) name used by Samba to "
+"contact the ldap server when retreiving user account information. ie: "
+"cn=Manager,dc=mydomain,dc=com"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:256
@@ -2558,7 +2743,10 @@ msgid "LDAP suffix"
 msgstr "Hidupkan _LDAP"
 
 #: ../samba_wizard/Samba.pm:257
-msgid "Specifies where user and machine accounts are added to the tree. Can be overriden by ldap user suffix and ldap machine suffix. It also used as the base dn for all ldap searches. ie: dc=$DOMAINNAME,dc=com"
+msgid ""
+"Specifies where user and machine accounts are added to the tree. Can be "
+"overriden by ldap user suffix and ldap machine suffix. It also used as the "
+"base dn for all ldap searches. ie: dc=$DOMAINNAME,dc=com"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:258
@@ -2572,7 +2760,9 @@ msgid "LDAP password check:"
 msgstr "Hasil Pemeriksaan Media"
 
 #: ../samba_wizard/Samba.pm:260
-msgid "It specifies where machines should be added to the ldap tree. ie: ou=Computers"
+msgid ""
+"It specifies where machines should be added to the ldap tree. ie: "
+"ou=Computers"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:260
@@ -2586,7 +2776,9 @@ msgid "LDAP user suffix:"
 msgstr "Pengguna LDAP SASL"
 
 #: ../samba_wizard/Samba.pm:261
-msgid "This parameter specifies where users are added to the tree. If this parameter is not specified, the value from ldap suffix."
+msgid ""
+"This parameter specifies where users are added to the tree. If this "
+"parameter is not specified, the value from ldap suffix."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:262
@@ -2595,7 +2787,9 @@ msgid "LDAP group suffix:"
 msgstr "Suffik penyempurnaan gelaran"
 
 #: ../samba_wizard/Samba.pm:262
-msgid "This parameters specifies the suffix that is  used for groups when these are added to the LDAP directory. ie: ou=Groups"
+msgid ""
+"This parameters specifies the suffix that is  used for groups when these are "
+"added to the LDAP directory. ie: ou=Groups"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:266
@@ -2627,8 +2821,7 @@ msgstr "Tetingkap Kumpulankerja."
 msgid "Workgroup"
 msgstr "Kumpulankerja"
 
-#: ../samba_wizard/Samba.pm:291
-#: ../samba_wizard/Samba.pm:338
+#: ../samba_wizard/Samba.pm:291 ../samba_wizard/Samba.pm:338
 msgid "Workgroup:"
 msgstr "Kumpulankerja:"
 
@@ -2644,7 +2837,9 @@ msgstr "Memulakan pemidang"
 
 #: ../samba_wizard/Samba.pm:302
 #, fuzzy
-msgid "The banner is the way this server will be described in the Windows workstations."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
 msgstr "dalam Tetingkap."
 
 #: ../samba_wizard/Samba.pm:307
@@ -2658,7 +2853,9 @@ msgid "The Server Banner is incorrect."
 msgstr "Jawapan pelayan tidak sah."
 
 #: ../samba_wizard/Samba.pm:318
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:318
@@ -2674,8 +2871,7 @@ msgstr ""
 msgid "Samba Log"
 msgstr "Fail log Samba:"
 
-#: ../samba_wizard/Samba.pm:325
-#: ../samba_wizard/Samba.pm:340
+#: ../samba_wizard/Samba.pm:325 ../samba_wizard/Samba.pm:340
 #, fuzzy
 msgid "Log file:"
 msgstr "Fail Log"
@@ -2685,8 +2881,7 @@ msgstr "Fail Log"
 msgid "Max log size:"
 msgstr "Saiz maksimum log:"
 
-#: ../samba_wizard/Samba.pm:327
-#: ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Paras log:"
@@ -2697,7 +2892,9 @@ msgid "Configuring Samba"
 msgstr "Pengg_una Samba..."
 
 #: ../samba_wizard/Samba.pm:332
-msgid "If you have previously create some shares, they will appear in this configuration. Run \"drakwizard sambashare\" to manage your share."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run \"drakwizard sambashare\" to manage your share."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:332
@@ -2719,16 +2916,11 @@ msgstr "Memulakan pemidang"
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:452
-#: ../samba_wizard/Sambaprint.pm:282
-#: ../samba_wizard/Sambashare.pm:743
-#: ../samba_wizard/Sambashare.pm:775
-#: ../samba_wizard/Sambashare.pm:818
-#: ../samba_wizard/Sambashare.pm:835
-#: ../samba_wizard/Sambashare.pm:852
-#: ../samba_wizard/Sambashare.pm:868
-#: ../samba_wizard/Sambashare.pm:884
-#: ../samba_wizard/Sambashare.pm:908
+#: ../samba_wizard/Samba.pm:452 ../samba_wizard/Sambaprint.pm:282
+#: ../samba_wizard/Sambashare.pm:743 ../samba_wizard/Sambashare.pm:775
+#: ../samba_wizard/Sambashare.pm:818 ../samba_wizard/Sambashare.pm:835
+#: ../samba_wizard/Sambashare.pm:852 ../samba_wizard/Sambashare.pm:868
+#: ../samba_wizard/Sambashare.pm:884 ../samba_wizard/Sambashare.pm:908
 #: ../samba_wizard/Sambashare.pm:941
 #, fuzzy
 msgid "Configuring your Samba server..."
@@ -2743,9 +2935,10 @@ msgstr "Konfigurasi sesi anda"
 msgid "You can enable or disable printers in your Samba server configuration."
 msgstr ""
 
-#: ../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 share."
+#: ../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 share."
 msgstr ""
 
 #: ../samba_wizard/Sambaprint.pm:76
@@ -2768,46 +2961,33 @@ msgid "Enable all printers"
 msgstr "Hidupkan Semua Kotak Dialog"
 
 #: ../samba_wizard/Sambaprint.pm:98
-msgid "Now you can configure your printers service. Change value only if you know what your are doing."
-msgstr ""
-
-#: ../samba_wizard/Sambaprint.pm:119
-#: ../samba_wizard/Sambaprint.pm:132
-#: ../samba_wizard/Sambashare.pm:200
-#: ../samba_wizard/Sambashare.pm:248
-#: ../samba_wizard/Sambashare.pm:325
-#: ../samba_wizard/Sambashare.pm:370
-#: ../samba_wizard/Sambashare.pm:390
-#: ../samba_wizard/Sambashare.pm:435
-#: ../samba_wizard/Sambashare.pm:513
-#: ../samba_wizard/Sambashare.pm:547
-#: ../samba_wizard/Sambashare.pm:558
-#: ../samba_wizard/Sambashare.pm:570
-#: ../samba_wizard/Sambashare.pm:584
-#: ../samba_wizard/Sambashare.pm:612
-#: ../samba_wizard/Sambashare.pm:626
-#: ../samba_wizard/Sambashare.pm:637
+msgid ""
+"Now you can configure your printers service. Change value only if you know "
+"what your are doing."
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:119 ../samba_wizard/Sambaprint.pm:132
+#: ../samba_wizard/Sambashare.pm:200 ../samba_wizard/Sambashare.pm:248
+#: ../samba_wizard/Sambashare.pm:325 ../samba_wizard/Sambashare.pm:370
+#: ../samba_wizard/Sambashare.pm:390 ../samba_wizard/Sambashare.pm:435
+#: ../samba_wizard/Sambashare.pm:513 ../samba_wizard/Sambashare.pm:547
+#: ../samba_wizard/Sambashare.pm:558 ../samba_wizard/Sambashare.pm:570
+#: ../samba_wizard/Sambashare.pm:584 ../samba_wizard/Sambashare.pm:612
+#: ../samba_wizard/Sambashare.pm:626 ../samba_wizard/Sambashare.pm:637
 msgid "Comment:"
 msgstr "Komen:"
 
-#: ../samba_wizard/Sambaprint.pm:121
-#: ../samba_wizard/Sambaprint.pm:134
-#: ../samba_wizard/Sambashare.pm:202
-#: ../samba_wizard/Sambashare.pm:250
-#: ../samba_wizard/Sambashare.pm:327
-#: ../samba_wizard/Sambashare.pm:372
-#: ../samba_wizard/Sambashare.pm:514
-#: ../samba_wizard/Sambashare.pm:536
-#: ../samba_wizard/Sambashare.pm:548
-#: ../samba_wizard/Sambashare.pm:559
-#: ../samba_wizard/Sambashare.pm:572
-#: ../samba_wizard/Sambashare.pm:585
+#: ../samba_wizard/Sambaprint.pm:121 ../samba_wizard/Sambaprint.pm:134
+#: ../samba_wizard/Sambashare.pm:202 ../samba_wizard/Sambashare.pm:250
+#: ../samba_wizard/Sambashare.pm:327 ../samba_wizard/Sambashare.pm:372
+#: ../samba_wizard/Sambashare.pm:514 ../samba_wizard/Sambashare.pm:536
+#: ../samba_wizard/Sambashare.pm:548 ../samba_wizard/Sambashare.pm:559
+#: ../samba_wizard/Sambashare.pm:572 ../samba_wizard/Sambashare.pm:585
 #: ../samba_wizard/Sambashare.pm:614
 msgid "Browseable:"
 msgstr ""
 
-#: ../samba_wizard/Sambaprint.pm:122
-#: ../samba_wizard/Sambaprint.pm:135
+#: ../samba_wizard/Sambaprint.pm:122 ../samba_wizard/Sambaprint.pm:135
 #, fuzzy
 msgid "Guest ok:"
 msgstr "OK"
@@ -2817,10 +2997,8 @@ msgstr "OK"
 msgid "Configuring Samba printers"
 msgstr "Konfigurasi Pelayan Samba"
 
-#: ../samba_wizard/Sambaprint.pm:133
-#: ../samba_wizard/Sambashare.pm:203
-#: ../samba_wizard/Sambashare.pm:550
-#: ../samba_wizard/Sambashare.pm:615
+#: ../samba_wizard/Sambaprint.pm:133 ../samba_wizard/Sambashare.pm:203
+#: ../samba_wizard/Sambashare.pm:550 ../samba_wizard/Sambashare.pm:615
 #, fuzzy
 msgid "Create mode:"
 msgstr "Mod bantuan"
@@ -2859,36 +3037,30 @@ msgstr "Nama perkongsian"
 msgid "User share"
 msgstr "Nama perkongsian"
 
-#: ../samba_wizard/Sambashare.pm:82
-#: ../samba_wizard/Sambashare.pm:97
+#: ../samba_wizard/Sambashare.pm:82 ../samba_wizard/Sambashare.pm:97
 #, fuzzy
 msgid "CDrom - share a CDrom"
 msgstr "Nama perkongsian"
 
-#: ../samba_wizard/Sambashare.pm:83
-#: ../samba_wizard/Sambashare.pm:98
+#: ../samba_wizard/Sambashare.pm:83 ../samba_wizard/Sambashare.pm:98
 msgid "Homes - share home user dir"
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:84
-#: ../samba_wizard/Sambashare.pm:99
+#: ../samba_wizard/Sambashare.pm:84 ../samba_wizard/Sambashare.pm:99
 msgid "Profiles - profiles directory on the fly"
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:88
-#: ../samba_wizard/Sambashare.pm:94
+#: ../samba_wizard/Sambashare.pm:88 ../samba_wizard/Sambashare.pm:94
 #, fuzzy
 msgid "Add - add a share"
 msgstr "T_ambah Perkongsian"
 
-#: ../samba_wizard/Sambashare.pm:89
-#: ../samba_wizard/Sambashare.pm:95
+#: ../samba_wizard/Sambashare.pm:89 ../samba_wizard/Sambashare.pm:95
 #, fuzzy
 msgid "Remove - remove a share"
 msgstr "Nama perkongsian"
 
-#: ../samba_wizard/Sambashare.pm:90
-#: ../samba_wizard/Sambashare.pm:96
+#: ../samba_wizard/Sambashare.pm:90 ../samba_wizard/Sambashare.pm:96
 #, fuzzy
 msgid "Modify - modify a share"
 msgstr "Nama perkongsian"
@@ -2943,42 +3115,37 @@ msgstr ""
 msgid "Modify Homes share"
 msgstr "Tambah Perkongsian NFS"
 
-#: ../samba_wizard/Sambashare.pm:200
-#: ../samba_wizard/Sambashare.pm:248
-msgid "This is a text field that is seen next to a share when a client does a queries the server"
-msgstr ""
-
-#: ../samba_wizard/Sambashare.pm:201
-#: ../samba_wizard/Sambashare.pm:251
-#: ../samba_wizard/Sambashare.pm:437
-#: ../samba_wizard/Sambashare.pm:473
-#: ../samba_wizard/Sambashare.pm:515
-#: ../samba_wizard/Sambashare.pm:538
-#: ../samba_wizard/Sambashare.pm:549
-#: ../samba_wizard/Sambashare.pm:560
-#: ../samba_wizard/Sambashare.pm:587
-#: ../samba_wizard/Sambashare.pm:613
+#: ../samba_wizard/Sambashare.pm:200 ../samba_wizard/Sambashare.pm:248
+msgid ""
+"This is a text field that is seen next to a share when a client does a "
+"queries the server"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:201 ../samba_wizard/Sambashare.pm:251
+#: ../samba_wizard/Sambashare.pm:437 ../samba_wizard/Sambashare.pm:473
+#: ../samba_wizard/Sambashare.pm:515 ../samba_wizard/Sambashare.pm:538
+#: ../samba_wizard/Sambashare.pm:549 ../samba_wizard/Sambashare.pm:560
+#: ../samba_wizard/Sambashare.pm:587 ../samba_wizard/Sambashare.pm:613
 #: ../samba_wizard/Sambashare.pm:640
 #, fuzzy
 msgid "Writable:"
 msgstr "_Boleh Tulis"
 
-#: ../samba_wizard/Sambashare.pm:204
-#: ../samba_wizard/Sambashare.pm:586
+#: ../samba_wizard/Sambashare.pm:204 ../samba_wizard/Sambashare.pm:586
 #: ../samba_wizard/Sambashare.pm:616
 #, fuzzy
 msgid "Create mask:"
 msgstr "Net_mask"
 
-#: ../samba_wizard/Sambashare.pm:205
-#: ../samba_wizard/Sambashare.pm:617
+#: ../samba_wizard/Sambashare.pm:205 ../samba_wizard/Sambashare.pm:617
 #, fuzzy
 msgid "Directory mask:"
 msgstr "Net_mask"
 
 #: ../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 "Nombor siri mesti >= 1."
 
 #: ../samba_wizard/Sambashare.pm:217
@@ -2995,41 +3162,29 @@ msgstr ""
 msgid "Please enter a share comment."
 msgstr "Sila masukkan namapengguna anda"
 
-#: ../samba_wizard/Sambashare.pm:247
-#: ../samba_wizard/Sambashare.pm:324
-#: ../samba_wizard/Sambashare.pm:389
-#: ../samba_wizard/Sambashare.pm:434
-#: ../samba_wizard/Sambashare.pm:557
-#: ../samba_wizard/Sambashare.pm:583
-#: ../samba_wizard/Sambashare.pm:625
-#: ../samba_wizard/Sambashare.pm:636
+#: ../samba_wizard/Sambashare.pm:247 ../samba_wizard/Sambashare.pm:324
+#: ../samba_wizard/Sambashare.pm:389 ../samba_wizard/Sambashare.pm:434
+#: ../samba_wizard/Sambashare.pm:557 ../samba_wizard/Sambashare.pm:583
+#: ../samba_wizard/Sambashare.pm:625 ../samba_wizard/Sambashare.pm:636
 #, fuzzy
 msgid "Name of the share:"
 msgstr "Nama perkongsian"
 
-#: ../samba_wizard/Sambashare.pm:249
-#: ../samba_wizard/Sambashare.pm:326
-#: ../samba_wizard/Sambashare.pm:391
-#: ../samba_wizard/Sambashare.pm:436
-#: ../samba_wizard/Sambashare.pm:535
-#: ../samba_wizard/Sambashare.pm:627
+#: ../samba_wizard/Sambashare.pm:249 ../samba_wizard/Sambashare.pm:326
+#: ../samba_wizard/Sambashare.pm:391 ../samba_wizard/Sambashare.pm:436
+#: ../samba_wizard/Sambashare.pm:535 ../samba_wizard/Sambashare.pm:627
 #: ../samba_wizard/Sambashare.pm:638
 msgid "Path:"
 msgstr "Path:"
 
-#: ../samba_wizard/Sambashare.pm:250
-#: ../samba_wizard/Sambashare.pm:327
+#: ../samba_wizard/Sambashare.pm:250 ../samba_wizard/Sambashare.pm:327
 msgid "Allows share to be displayed in list of share."
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:252
-#: ../samba_wizard/Sambashare.pm:328
-#: ../samba_wizard/Sambashare.pm:375
-#: ../samba_wizard/Sambashare.pm:438
-#: ../samba_wizard/Sambashare.pm:561
-#: ../samba_wizard/Sambashare.pm:575
-#: ../samba_wizard/Sambashare.pm:588
-#: ../samba_wizard/Sambashare.pm:639
+#: ../samba_wizard/Sambashare.pm:252 ../samba_wizard/Sambashare.pm:328
+#: ../samba_wizard/Sambashare.pm:375 ../samba_wizard/Sambashare.pm:438
+#: ../samba_wizard/Sambashare.pm:561 ../samba_wizard/Sambashare.pm:575
+#: ../samba_wizard/Sambashare.pm:588 ../samba_wizard/Sambashare.pm:639
 #, fuzzy
 msgid "Public:"
 msgstr "Awam"
@@ -3044,42 +3199,43 @@ msgid "Advanced options, use them if you know what you are doing."
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:258
-msgid "If you choose Write list wizard will create the samba user without password. Use: smbpasswd [username] to redefine samba user password."
+msgid ""
+"If you choose Write list wizard will create the samba user without password. "
+"Use: smbpasswd [username] to redefine samba user password."
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:270
-#: ../samba_wizard/Sambashare.pm:393
-#: ../samba_wizard/Sambashare.pm:475
-#: ../samba_wizard/Sambashare.pm:589
+#: ../samba_wizard/Sambashare.pm:270 ../samba_wizard/Sambashare.pm:393
+#: ../samba_wizard/Sambashare.pm:475 ../samba_wizard/Sambashare.pm:589
 #, fuzzy
 msgid "Read list:"
 msgstr "Segarkan senarai"
 
 #: ../samba_wizard/Sambashare.pm:270
-msgid "Specifies a list of users that have read-only access to a writable share. ie: anne"
+msgid ""
+"Specifies a list of users that have read-only access to a writable share. "
+"ie: anne"
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:271
 msgid "Specifies a user that have read-write access to a share. ie: fred"
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:271
-#: ../samba_wizard/Sambashare.pm:392
-#: ../samba_wizard/Sambashare.pm:476
-#: ../samba_wizard/Sambashare.pm:590
+#: ../samba_wizard/Sambashare.pm:271 ../samba_wizard/Sambashare.pm:392
+#: ../samba_wizard/Sambashare.pm:476 ../samba_wizard/Sambashare.pm:590
 #: ../samba_wizard/Sambashare.pm:628
 #, fuzzy
 msgid "Write list:"
 msgstr "Segarkan senarai"
 
-#: ../samba_wizard/Sambashare.pm:272
-#: ../samba_wizard/Sambashare.pm:477
+#: ../samba_wizard/Sambashare.pm:272 ../samba_wizard/Sambashare.pm:477
 #, fuzzy
 msgid "User own directory:"
 msgstr "Pergi Ke Direktori"
 
 #: ../samba_wizard/Sambashare.pm:273
-msgid "To restrict the share to a particular user. If this is empty (the default) then any user  can  login. ie: guibo"
+msgid ""
+"To restrict the share to a particular user. If this is empty (the default) "
+"then any user  can  login. ie: guibo"
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:273
@@ -3088,7 +3244,12 @@ msgid "valid users"
 msgstr "Pengg_una Samba..."
 
 #: ../samba_wizard/Sambashare.pm:274
-msgid "This is a list of users who will be granted administrative privileges on the share. This means that they will do all file operations as the super-user (root). You  should  use this option very carefully, as any user in this list will be able to do anything they like on the share, irrespective of file permissions."
+msgid ""
+"This is a list of users who will be granted administrative privileges on the "
+"share. This means that they will do all file operations as the super-user "
+"(root). You  should  use this option very carefully, as any user in this "
+"list will be able to do anything they like on the share, irrespective of "
+"file permissions."
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:274
@@ -3096,31 +3257,31 @@ msgstr ""
 msgid "admin users"
 msgstr "Pengg_una Samba..."
 
-#: ../samba_wizard/Sambashare.pm:275
-#: ../samba_wizard/Sambashare.pm:479
+#: ../samba_wizard/Sambashare.pm:275 ../samba_wizard/Sambashare.pm:479
 #, fuzzy
 msgid "Hide files:"
 msgstr "Ke Fail"
 
-#: ../samba_wizard/Sambashare.pm:275
-#: ../samba_wizard/Sambashare.pm:479
-msgid "The hide files option provides one or more directory or filename patterns to Samba. Any file matching this pattern will be treated as a hidden file from the perspective of the client. ie: /.icewm/"
+#: ../samba_wizard/Sambashare.pm:275 ../samba_wizard/Sambashare.pm:479
+msgid ""
+"The hide files option provides one or more directory or filename patterns to "
+"Samba. Any file matching this pattern will be treated as a hidden file from "
+"the perspective of the client. ie: /.icewm/"
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:276
-#: ../samba_wizard/Sambashare.pm:478
+#: ../samba_wizard/Sambashare.pm:276 ../samba_wizard/Sambashare.pm:478
 #: ../samba_wizard/Sambashare.pm:591
 #, fuzzy
 msgid "Hide dot files:"
 msgstr "Togol pemaparan fail tersorok dot"
 
-#: ../samba_wizard/Sambashare.pm:276
-#: ../samba_wizard/Sambashare.pm:478
-msgid "The hide dot files option hides any files on the server that begin with a dot (.)"
+#: ../samba_wizard/Sambashare.pm:276 ../samba_wizard/Sambashare.pm:478
+msgid ""
+"The hide dot files option hides any files on the server that begin with a "
+"dot (.)"
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:283
-#: ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:415
 #: ../samba_wizard/Sambashare.pm:485
 #, fuzzy, perl-format
 msgid "Please provide a system user, %s not present."
@@ -3136,7 +3297,12 @@ msgid "Advanced options, use them only if you know what you are doing."
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:306
-msgid "This parameter specifies a set of UNIX mode bit permissions that will always be set on a file created by Samba. This is done by bitwise 'OR'ing these bits onto the mode bits of a file that is being created or having its permissions changed. The default for this parameter is (in octal) 000. ie: force create mode = 0700 "
+msgid ""
+"This parameter specifies a set of UNIX mode bit permissions that will always "
+"be set on a file created by Samba. This is done by bitwise 'OR'ing these "
+"bits onto the mode bits of a file that is being created or having its "
+"permissions changed. The default for this parameter is (in octal) 000. ie: "
+"force create mode = 0700 "
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:306
@@ -3145,7 +3311,12 @@ msgid "force create mode"
 msgstr "rentetan mod tidak sah: %s"
 
 #: ../samba_wizard/Sambashare.pm:307
-msgid "This parameter specifies a set of UNIX mode bit permissions that will always be set on a directory created by Samba. This is done by bitwise 'OR'ing these bits onto the mode bits of a directory that is being created. The 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"
+msgid ""
+"This parameter specifies a set of UNIX mode bit permissions that will always "
+"be set on a directory created by Samba. This is done by bitwise 'OR'ing "
+"these bits onto the mode bits of a directory that is being created. The "
+"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 ""
 
 #: ../samba_wizard/Sambashare.pm:307
@@ -3154,7 +3325,11 @@ msgid "force directory mode"
 msgstr "rentetan mod tidak sah: %s"
 
 #: ../samba_wizard/Sambashare.pm:308
-msgid "This specifies a UNIX group name that will be assigned as the default primary group for all users connecting to this service. This is useful for sharing files by ensuring that all access to files on service will use the named group for their permissions checking. ie: force group = agroup"
+msgid ""
+"This specifies a UNIX group name that will be assigned as the default "
+"primary group for all users connecting to this service. This is useful for "
+"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 ""
 
 #: ../samba_wizard/Sambashare.pm:308
@@ -3173,7 +3348,9 @@ msgid "lower or upper"
 msgstr "Name=Upper Sorbian"
 
 #: ../samba_wizard/Sambashare.pm:310
-msgid "This controls if new filenames are created with the case that the client passes, or if they are forced to be the default case"
+msgid ""
+"This controls if new filenames are created with the case that the client "
+"passes, or if they are forced to be the default case"
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:310
@@ -3182,17 +3359,17 @@ msgid "preserve case"
 msgstr "Case Sens"
 
 #: ../samba_wizard/Sambashare.pm:315
-msgid "Create mask, force directory mode and force create mode should be numeric. ie: 0755."
+msgid ""
+"Create mask, force directory mode and force create mode should be numeric. "
+"ie: 0755."
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:322
-#: ../samba_wizard/Sambashare.pm:465
+#: ../samba_wizard/Sambashare.pm:322 ../samba_wizard/Sambashare.pm:465
 #, fuzzy
 msgid "Add a share"
 msgstr "T_ambah Perkongsian"
 
-#: ../samba_wizard/Sambashare.pm:322
-#: ../samba_wizard/Sambashare.pm:497
+#: ../samba_wizard/Sambashare.pm:322 ../samba_wizard/Sambashare.pm:497
 #, fuzzy
 msgid "Browseable: view share"
 msgstr "Tambah Perkongsian NFS"
@@ -3206,23 +3383,20 @@ msgstr "Comment=Fail Kerangka Penghurai Sumber"
 msgid "Writable: user can write in the share"
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:333
-#: ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:398
 #: ../samba_wizard/Sambashare.pm:444
-msgid "Share with the same name already exist or share name empty, please choose another name."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
 msgstr ""
 
-#: ../samba_wizard/Sambashare.pm:338
-#: ../samba_wizard/Sambashare.pm:344
-#: ../samba_wizard/Sambashare.pm:403
-#: ../samba_wizard/Sambashare.pm:409
-#: ../samba_wizard/Sambashare.pm:452
-#: ../samba_wizard/Sambashare.pm:458
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:344
+#: ../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 ""
 
-#: ../samba_wizard/Sambashare.pm:341
-#: ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:406
 #: ../samba_wizard/Sambashare.pm:455
 msgid "Please enter a comment for this share."
 msgstr ""
@@ -3237,14 +3411,12 @@ msgstr "Tukar CDROM"
 msgid "CDrom path:"
 msgstr "Pilihan path"
 
-#: ../samba_wizard/Sambashare.pm:373
-#: ../samba_wizard/Sambashare.pm:573
+#: ../samba_wizard/Sambashare.pm:373 ../samba_wizard/Sambashare.pm:573
 #, fuzzy
 msgid "Root preexec:"
 msgstr "_Katalaluan root: "
 
-#: ../samba_wizard/Sambashare.pm:374
-#: ../samba_wizard/Sambashare.pm:574
+#: ../samba_wizard/Sambashare.pm:374 ../samba_wizard/Sambashare.pm:574
 #, fuzzy
 msgid "Root postexec:"
 msgstr "_Katalaluan root: "
@@ -3260,7 +3432,9 @@ msgid "Add a public share"
 msgstr "Tambah Perkongsian NFS"
 
 #: ../samba_wizard/Sambashare.pm:449
-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 !"
+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 ""
 
 #: ../samba_wizard/Sambashare.pm:449
@@ -3272,7 +3446,9 @@ msgid "If you don't want to use one of this options, leave it blank."
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:475
-msgid "Specifies a list of users that have read-only access to a writable share. ie: aginies"
+msgid ""
+"Specifies a list of users that have read-only access to a writable share. "
+"ie: aginies"
 msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:476
@@ -3303,7 +3479,9 @@ msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:497
 #, fuzzy
-msgid "You have selected to allow user access their home directories via samba but you/they must use smbpasswd to set a password."
+msgid ""
+"You have selected to allow user access their home directories via samba but "
+"you/they must use smbpasswd to set a password."
 msgstr "pengguna."
 
 #: ../samba_wizard/Sambashare.pm:521
@@ -3320,13 +3498,15 @@ msgstr ""
 msgid "Guest access:"
 msgstr "Tak dapat mengakses %s"
 
-#: ../samba_wizard/Sambashare.pm:544
-#: ../samba_wizard/Sambashare.pm:580
-#: ../samba_wizard/Sambashare.pm:623
-#: ../samba_wizard/Sambashare.pm:634
+#: ../samba_wizard/Sambashare.pm:544 ../samba_wizard/Sambashare.pm:580
+#: ../samba_wizard/Sambashare.pm:623 ../samba_wizard/Sambashare.pm:634
 #, fuzzy
-msgid "If you really want to add this share, click the Next button or use the Back button."
-msgstr "Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau guna butang Undur untuk membetulkan mereka."
+msgid ""
+"If you really want to add this share, click the Next button or use the Back "
+"button."
+msgstr ""
+"Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau "
+"guna butang Undur untuk membetulkan mereka."
 
 #: ../samba_wizard/Sambashare.pm:544
 msgid "Summary add home share"
@@ -3334,8 +3514,12 @@ msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:555
 #, fuzzy
-msgid "If you really want to modify this share, click the Next button or use the Back button."
-msgstr "Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau guna butang Undur untuk membetulkan mereka."
+msgid ""
+"If you really want to modify this share, click the Next button or use the "
+"Back button."
+msgstr ""
+"Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau "
+"guna butang Undur untuk membetulkan mereka."
 
 #: ../samba_wizard/Sambashare.pm:555
 #, fuzzy
@@ -3348,8 +3532,12 @@ msgstr "CDROM"
 
 #: ../samba_wizard/Sambashare.pm:567
 #, fuzzy
-msgid "If you really want to share a CDROM, click the Next button or use the Back button."
-msgstr "Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau guna butang Undur untuk membetulkan mereka."
+msgid ""
+"If you really want to share a CDROM, click the Next button or use the Back "
+"button."
+msgstr ""
+"Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau "
+"guna butang Undur untuk membetulkan mereka."
 
 #: ../samba_wizard/Sambashare.pm:571
 #, fuzzy
@@ -3363,8 +3551,12 @@ msgstr "Tambah Perkongsian NFS"
 
 #: ../samba_wizard/Sambashare.pm:596
 #, fuzzy
-msgid "If you really want to remove this share, click the Next button or use the Back button."
-msgstr "Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau guna butang Undur untuk membetulkan mereka."
+msgid ""
+"If you really want to remove this share, click the Next button or use the "
+"Back button."
+msgstr ""
+"Untuk menerima nilai ini, dan menambah klien anda, klik butang Maju atau "
+"guna butang Undur untuk membetulkan mereka."
 
 #: ../samba_wizard/Sambashare.pm:596
 #, fuzzy
@@ -3433,20 +3625,15 @@ msgstr "Internet FTP"
 msgid "The wizard successfully remove your share."
 msgstr "Wizard telah berjaya menambah hos dalam DNS anda."
 
-#: ../samba_wizard/Sambashare.pm:743
-#: ../samba_wizard/Sambashare.pm:775
-#: ../samba_wizard/Sambashare.pm:818
-#: ../samba_wizard/Sambashare.pm:852
-#: ../samba_wizard/Sambashare.pm:868
-#: ../samba_wizard/Sambashare.pm:884
-#: ../samba_wizard/Sambashare.pm:908
-#: ../samba_wizard/Sambashare.pm:941
+#: ../samba_wizard/Sambashare.pm:743 ../samba_wizard/Sambashare.pm:775
+#: ../samba_wizard/Sambashare.pm:818 ../samba_wizard/Sambashare.pm:852
+#: ../samba_wizard/Sambashare.pm:868 ../samba_wizard/Sambashare.pm:884
+#: ../samba_wizard/Sambashare.pm:908 ../samba_wizard/Sambashare.pm:941
 #, fuzzy
 msgid "Samba share"
 msgstr "Tambah perkongsian samba"
 
-#: ../samba_wizard/Sambashare.pm:772
-#: ../samba_wizard/Sambashare.pm:938
+#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
 #, perl-format
 msgid "Can't create %s. Please check why wizard can't create this directory."
 msgstr ""
@@ -3456,202 +3643,220 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Tambah perkongsian samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 #, fuzzy
 msgid "Expert - advanced ssh options"
 msgstr "Konfigurasi _pilihan lanjutan pemuat but"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Tetapan Xorg mana yang anda hendak?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 #, fuzzy
 msgid "SSH server, classical options"
 msgstr "Tiada pilihan disediakan untuk pelaksanaan ssh."
 
-#: ../sshd_wizard/Sshd.pm:84
-#: ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Alamat IP"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85
-#: ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "nombor port"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Nombor siri mesti >= 1."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Method &Autentikasi"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 #, fuzzy
 msgid "RSA auth:"
 msgstr "ESMTP AUTH: %s."
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 #, fuzzy
 msgid "PubKey auth:"
 msgstr "ESMTP AUTH: %s."
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 #, fuzzy
 msgid "Auth key file:"
 msgstr "Fail Sijil _Kekunci:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "ESMTP AUTH: %s."
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 #, fuzzy
 msgid "Ignore rhosts file:"
 msgstr " --norc           Abai fail konfigurasi sistem."
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 #, fuzzy
 msgid "Permit empty password:"
 msgstr "Tetapkan Katalaluan Root"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Log"
 
-#: ../sshd_wizard/Sshd.pm:119
-msgid "Log level: gives the verbosity level that is used when logging messages from sshd."
+#: ../sshd_wizard/Sshd.pm:121
+msgid ""
+"Log level: gives the verbosity level that is used when logging messages from "
+"sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
-msgid "Syslog facility: gives the facility code that is used when logging messages from sshd"
+#: ../sshd_wizard/Sshd.pm:121
+msgid ""
+"Syslog facility: gives the facility code that is used when logging messages "
+"from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 #, fuzzy
 msgid "Login options"
 msgstr ""
 "\n"
 " Pilihan kompilasi:"
 
-#: ../sshd_wizard/Sshd.pm:131
-msgid "Print last log: whether sshd should print the date and time when the user last logged in"
+#: ../sshd_wizard/Sshd.pm:133
+msgid ""
+"Print last log: whether sshd should print the date and time when the user "
+"last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 #, fuzzy
 msgid "Login Grace time:"
 msgstr "Masa Ketara Lokal"
 
-#: ../sshd_wizard/Sshd.pm:139
-msgid "The server disconnects after this time if the user has not successfully logged in. If the value is 0, there is no time limit. The default is 120 seconds."
+#: ../sshd_wizard/Sshd.pm:141
+msgid ""
+"The server disconnects after this time if the user has not successfully "
+"logged in. If the value is 0, there is no time limit. The default is 120 "
+"seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 #, fuzzy
 msgid "Keep alive:"
 msgstr "Biarkan hidup"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Pengurus Pencetak"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "kira histogram log\n"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
-msgid "Strict modes: specifies whether sshd should check file modes and ownership of the user's files and home directory before accepting login. This is normally desirable because novices sometimes accidentally leave their directory or files world-writable"
+#: ../sshd_wizard/Sshd.pm:152
+msgid ""
+"Strict modes: specifies whether sshd should check file modes and ownership "
+"of the user's files and home directory before accepting login. This is "
+"normally desirable because novices sometimes accidentally leave their "
+"directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Pilihan Pengguna Diketahui"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 #, fuzzy
 msgid "Strict modes:"
 msgstr "Rentetan mod"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Pengg_una Samba..."
 
-#: ../sshd_wizard/Sshd.pm:159
-msgid "If specified, login is allowed only for user names that match one of the patterns. ie: erwan aginies guibo"
+#: ../sshd_wizard/Sshd.pm:161
+msgid ""
+"If specified, login is allowed only for user names that match one of the "
+"patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Pengg_una Samba..."
 
-#: ../sshd_wizard/Sshd.pm:160
-msgid "Login is disallowed for user names that match one of the patterns. ie: pirate guillomovitch"
+#: ../sshd_wizard/Sshd.pm:162
+msgid ""
+"Login is disallowed for user names that match one of the patterns. ie: "
+"pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
-msgid "X11 forwarding: specifies whether X11 forwarding is permitted. Note that disabling X11 forwarding does not prevent users from forwarding X11 traffic, as users can always install their own forwarders."
+#: ../sshd_wizard/Sshd.pm:167
+msgid ""
+"X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
+"disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
+"as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "- Mampatan: %s\n"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 #, fuzzy
 msgid "X11 forwarding:"
 msgstr "X11-Mod"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Tetapan daemon OpenSSH"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Internet FTP"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Menetapkan pelayan PXE pada sistem anda..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Demon pelayan OpenSSH."
@@ -3672,7 +3877,9 @@ msgid "Save config without test"
 msgstr "Simpan"
 
 #: ../time_wizard/Ntp.pm:70
-msgid "This wizard will help you to set the time of your server synchronized with an external time server."
+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
@@ -3686,7 +3893,9 @@ 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
-msgid "(we recommend using the server pool.ntp.org twice as this server randomly points to available time servers)"
+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
@@ -3698,20 +3907,17 @@ msgstr "dan."
 msgid "Time servers"
 msgstr "Pelayan waktu"
 
-#: ../time_wizard/Ntp.pm:81
-#: ../time_wizard/Ntp.pm:118
+#: ../time_wizard/Ntp.pm:81 ../time_wizard/Ntp.pm:118
 #, fuzzy
 msgid "Primary time server:"
 msgstr "Memulakan pelayan masa"
 
-#: ../time_wizard/Ntp.pm:82
-#: ../time_wizard/Ntp.pm:119
+#: ../time_wizard/Ntp.pm:82 ../time_wizard/Ntp.pm:119
 #, fuzzy
 msgid "Secondary time server:"
 msgstr "Memulakan pelayan masa"
 
-#: ../time_wizard/Ntp.pm:87
-#: ../time_wizard/Ntp.pm:102
+#: ../time_wizard/Ntp.pm:87 ../time_wizard/Ntp.pm:102
 #, fuzzy
 msgid "Choose a timezone"
 msgstr "Tetapan zonmasa"
@@ -3727,7 +3933,9 @@ msgid "Choose a city:"
 msgstr "Pilih secara manual"
 
 #: ../time_wizard/Ntp.pm:112
-msgid "If the time server is not immediately available (network or other reason), there will be about a 30 second delay."
+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
@@ -3762,7 +3970,9 @@ msgid "- other reasons..."
 msgstr "Kemungkinan Punca"
 
 #: ../time_wizard/Ntp.pm:137
-msgid "- You can try again to contact time servers, or save configuration without actually setting time."
+msgid ""
+"- You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:153
@@ -3810,7 +4020,9 @@ msgstr "Pelayan Web"
 
 #: ../web_wizard/Apache.pm:78
 #, fuzzy
-msgid "Your server can act as a Web server toward your internal network (intranet) and as a Web server for the Internet."
+msgid ""
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr "Pelayan dan Pelayan Internet."
 
 #: ../web_wizard/Apache.pm:80
@@ -3825,7 +4037,10 @@ msgstr "Pelayan"
 
 #: ../web_wizard/Apache.pm:91
 #, fuzzy
-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."
+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 "Pengguna direktori dalam onhttp://www.yourserver.com/~user direktori."
 
 #: ../web_wizard/Apache.pm:91
@@ -3835,13 +4050,16 @@ msgstr "Modul Dimuatkan: \n"
 
 #: ../web_wizard/Apache.pm:94
 #, fuzzy
-msgid "Allows users to get a directory in their home directories available on your http server via http://www.yourserver.com/~user."
+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:108
+#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:108
 #, 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"
+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:108
@@ -3854,8 +4072,7 @@ msgstr "Sila masukkan direktori pelayan HTTP."
 msgid "Type the path of the directory you want being the document root."
 msgstr "Jenis direktori."
 
-#: ../web_wizard/Apache.pm:116
-#: ../web_wizard/Apache.pm:134
+#: ../web_wizard/Apache.pm:116 ../web_wizard/Apache.pm:134
 #, fuzzy
 msgid "Document root:"
 msgstr "Direktori _Root Dokumen:"
@@ -3866,7 +4083,9 @@ msgid "Configuring the Web server"
 msgstr "Pelayan Web httpd"
 
 #: ../web_wizard/Apache.pm:126
-msgid "The wizard collected the following parameters needed to configure your Web server"
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:132
@@ -3898,3 +4117,14 @@ msgstr "(%ld)PELAYAN >>> %s"
 msgid "Configuring your system as Apache server ..."
 msgstr "Menetapkan sistem anda sebagai pelayan DNS Pembantu ..."
 
+#, fuzzy
+#~ msgid "Mail domain:"
+#~ msgstr "_Domain NIS:"
+
+#, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "Segerak sedang berjalan"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Menetapkan pelayan PXE pada sistem anda..."
diff --git a/po/mt.po b/po/mt.po
index 81f261a1..0c3853d8 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -39,7 +39,7 @@ 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:97
+#: ../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
@@ -49,7 +49,7 @@ msgstr "Problema."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Prosit!"
 
@@ -135,32 +135,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Problema"
 
@@ -351,7 +352,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Falla"
 
@@ -523,7 +524,8 @@ msgstr ""
 "Jidher li dan il-kompjuter diġà qiegħed fil-konfigurazzjoni DNS... Agħfas Li "
 "jmiss biex tkompli"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Problema:"
 
@@ -651,7 +653,7 @@ msgstr "Server ldap"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Uri konfigurazzjoni LDAP"
@@ -697,7 +699,7 @@ msgstr ""
 "%s m'hux installat\n"
 "Klikkja \"Li jmiss\" biex tinstalla jew \"Ikkanċella\" biex tieqaf"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Installazzjoni falliet"
 
@@ -764,8 +766,8 @@ msgstr "Isem is-server:"
 msgid "Admin email:"
 msgstr "Imejl tal-amministratur:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Ippermetti login root:"
 
@@ -885,7 +887,7 @@ msgstr "Is-saħħar ikkonfiguralek is-server FTP għall-intranet/internet"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Erġa' ħaddem drakwizard, u ipprova ibdel xi parametri."
 
@@ -977,11 +979,21 @@ msgstr ""
 "tikkonfigura server DHCP b'sapport għal PXE, u server PXE, sabiex ikun iżjed "
 "faċli tinstalla minn fuq in-network."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Saħħar ta' konfigurazzjoni ta' Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -993,7 +1005,7 @@ msgstr ""
 "ktieb tal-indirizz komuni għal utenti u kuntatti, kif ukoll aċċess għall-"
 "imejl permezz ta' POP3 kif ukoll IMAP4 (rev1)"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1003,39 +1015,140 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Is-saħħar iżomm kopja tal-fajls kollha "
 "ta' konfigurazzjoni għal dawn is-servizzi"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Merħba għas-saħħar ta' konfigurazzjoni ta' Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Server DNS ewlieni"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Diġà għandek server LDAP konfigurat"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Server NFS skjav"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Isem id-dominju:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Isem id-dominju:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Daħħal il-password għall-kont tal-manager tas-server Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Passwords ma jaqblux, jew password vojt. Jekk jogħġbok ikkoreġi."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Irrepeti password:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Isem proprju:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Irrepeti password:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Is-saħħar se jikkonfiguralek is-server Kolab b'dawn il-parametri"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Isem il-kompjuter:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Dominju tal-imejl:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1043,19 +1156,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Għaddejja l-installazzjoni"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Qed jiġi nstallat is-server Kolab fuq is-sistema..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Qed jiġi konfigurat is-server Kolab fuq is-sistema..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Server Kolab"
 
@@ -1585,7 +1690,7 @@ msgid "Relay mail server"
 msgstr "Server tal-imejl estern"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1604,9 +1709,8 @@ msgid ""
 "relay."
 msgstr "Dan is-saħħar jgħinek tissettja server FTP għan-network tiegħek."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informazzjoni"
 
@@ -1646,11 +1750,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Isem id-dominju:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2503,12 +2602,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Saħħar ta' konfigurazzjoni tal-web server"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2818,7 +2911,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Livell ta’ aċċess:"
@@ -3541,132 +3634,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Server Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "X'tixtieq tagħmel:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Indirizz IP minimu:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Isem proprju:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Żball: irid ikun direttorju."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Metodu ta' installazzjoni:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Password:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Printers:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Ippermetti login root:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3674,73 +3767,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Login ta' utent:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Ippermetti kompjuters:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Iċħad kompjuters:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Parametru ieħor:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Uri konfigurazzjoni LDAP"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Is-saħħar ikkonfiguralek is-server NFS."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Qed jiġi kkonfigurat is-server Samba..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Server Apache:"
@@ -3988,6 +4081,15 @@ msgstr "Server Apache:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Qed tiġi kkonfigurata s-sistema bħala server Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Dominju tal-imejl:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Għaddejja l-installazzjoni"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Qed jiġi nstallat is-server Kolab fuq is-sistema..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/nb.po b/po/nb.po
index c6921c49..a3e6e3d6 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -48,7 +48,7 @@ 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:97
+#: ../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
@@ -58,7 +58,7 @@ msgstr "Feil."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Gratulerer"
 
@@ -80,7 +80,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Trykk neste for å starte, eller Avbryt for å avslutte denne veiviseren."
+msgstr ""
+"Trykk neste for å starte, eller Avbryt for å avslutte denne veiviseren."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid ""
@@ -108,7 +109,8 @@ msgstr "Klient identifikasjon"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "Merk at den gitte IP-adressen og klientnavnet bør være unikt i nettverket."
+msgstr ""
+"Merk at den gitte IP-adressen og klientnavnet bør være unikt i nettverket."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid ""
@@ -144,32 +146,33 @@ msgstr "Du er i dhcp, tjeneren vil muligens ikke virke med ditt oppsett."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Feil"
 
@@ -233,8 +236,10 @@ msgstr ""
 "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?"
+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"
@@ -358,7 +363,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Feilet"
 
@@ -505,14 +510,16 @@ msgid "Default domain name to search:"
 msgstr "Standard domenavn som skal søkes:"
 
 #: ../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 ""
 "Dette er ikke en gyldig IP-adresse til din videresender... trykk neste for å "
 "fortsette"
 
 #: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
-msgstr "Dette er ikke en gyldig Master DNS IP-adresse... trykk neste for å fortsette"
+msgstr ""
+"Dette er ikke en gyldig Master DNS IP-adresse... trykk neste for å fortsette"
 
 #: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
@@ -526,7 +533,8 @@ msgstr ""
 "Det ser ut som om verten allerede er i ditt DNS-oppsett... trykk neste for å "
 "fortsette"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Feil:"
 
@@ -547,7 +555,8 @@ msgstr ""
 "DNS-veiviser: Master DNS-tjener."
 
 #: ../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 ""
 "Det ser ut som om du ikke er en master DNS-tjener, men bare en slave. Så jeg "
 "kan ikke legge til eller fjerne vert."
@@ -577,7 +586,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Klient med denne identifikasjonen vil bli fjernet fra din 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-tjeneren er i ferd med å bli satt opp med det følgende oppsettet"
 
 #: ../dns_wizard/Bind.pm:245
@@ -649,7 +659,7 @@ msgstr "ldap-tjener"
 msgid "Proxy"
 msgstr "Mellomtjener"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH-tjenerkonfigurasjon"
 
@@ -694,7 +704,7 @@ msgstr ""
 "%s er ikke installert\n"
 "Klikk \"Neste\" for å installere eller \"Avbryt\" for å avslutte"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Installasjon mislykket"
 
@@ -760,8 +770,8 @@ msgstr "Tjenernavn:"
 msgid "Admin email:"
 msgstr "Adminepost:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Tillat root-innlogging:"
 
@@ -874,7 +884,7 @@ msgstr "Veiviseren satte vellykket opp din Intranett/Internett FTP-tjener"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Start drakwizard på nytt, og prøv å endre noen parametre."
 
@@ -883,8 +893,10 @@ msgid "Configure an install server (via NFS and HTTP)"
 msgstr "Sett opp en Linux-installasjonstjener (via NFS og HTTP)"
 
 #: ../installsrv_wizard/Installsrv.pm:54
-msgid "Easily configure a server installation directory, with NFS and HTTP access."
-msgstr "Sett enkelt opp en Linux-tjenerinstallasjonskatalog med NFS- og http-tilgang."
+msgid ""
+"Easily configure a server installation directory, with NFS and HTTP access."
+msgstr ""
+"Sett enkelt opp en Linux-tjenerinstallasjonskatalog med NFS- og http-tilgang."
 
 #: ../installsrv_wizard/Installsrv.pm:59
 msgid "Destination directory: copy files in which directory?"
@@ -922,7 +934,8 @@ msgstr "feks. bruk: /var/install/mdk-release"
 msgid ""
 "Error, the source path must be a directory with full Linux installation "
 "directory."
-msgstr "Feil, kildekatalog må være en katalog med en full Linux-installasjonskatalog."
+msgstr ""
+"Feil, kildekatalog må være en katalog med en full Linux-installasjonskatalog."
 
 #: ../installsrv_wizard/Installsrv.pm:82
 msgid "The destination directory is already in use. Please choose another one."
@@ -956,11 +969,21 @@ msgstr ""
 "installere Linux over et nettverk. Bruk drakpxelinux for å sette opp din PXE-"
 "tjener, og drakwizard DHCP for å sette opp en DHCP-tjener."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Veiviser for å sette opp Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -972,7 +995,7 @@ msgstr ""
 "adressebok med mulighet for mailbox-brukere så vel som kontakter, og POP3- "
 "så vel som IMAP4-tilgang (rev1) til epost"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -982,39 +1005,139 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Veiviseren vil ta en sikkerhetskopi av alle "
 "dine tidligere oppsettfiler for disse tjenestene."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Velkommen til veiviseren for å sette opp Kolab Gruppevare-tjener"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Master DNS-tjener"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Du har allerede satt opp din Ldap-tjener"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Slave DNS-tjener"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domene:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domene:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Skriv inn passordet for manager-konto til Kolab-tjener."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Passord stemmer ikke overens, eller er tomt passord, vennligst rett."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Gjenta passord:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Fornavn:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Gjenta passord:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Veiviseren vil nå sette opp Kolab-tjener med de følgende parametrene"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Vertsnavn"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Epostdomene:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1022,19 +1145,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Installasjon pågår"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Installerer Kolab-tjener på ditt system..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer Kolab-tjener på ditt system..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab-tjener"
 
@@ -1347,8 +1462,10 @@ msgid "Polling interval:"
 msgstr "Sjekkeintervall:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
-msgstr "Veiviseren satte vellykket opp din Internett-njustjeneste på tjeneren din."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr ""
+"Veiviseren satte vellykket opp din Internett-njustjeneste på tjeneren din."
 
 #: ../nfs_wizard/NFS.pm:34
 msgid "NFS Wizard"
@@ -1451,7 +1568,8 @@ msgstr "NFS-tjener med autofs-kort"
 
 #: ../nisautofs_wizard/Nisautofs.pm:70
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
-msgstr "Oppsett av en NIS-server med autofs-kort, auto.home og auto.master filer."
+msgstr ""
+"Oppsett av en NIS-server med autofs-kort, auto.home og auto.master filer."
 
 #: ../nisautofs_wizard/Nisautofs.pm:70
 msgid ""
@@ -1562,7 +1680,7 @@ msgid "Relay mail server"
 msgstr "Relay epost-tjener"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Nybegynner - standardinnstillinger"
 
@@ -1583,9 +1701,8 @@ msgstr ""
 "Denne veiviseren vil hjelpe deg med å sette opp en Postfix e-posttjener "
 "eller et Postfix e-post-relay."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informasjon"
 
@@ -1604,7 +1721,8 @@ msgstr "Hva ønsker du å gjøre:"
 
 #: ../postfix_wizard/Postfix.pm:134
 msgid "Now I need to know your understanding in Postfix server configuration"
-msgstr "Nå trenger jeg å få rede på din forståelse av Postfix-tjenerens oppsett"
+msgstr ""
+"Nå trenger jeg å få rede på din forståelse av Postfix-tjenerens oppsett"
 
 #: ../postfix_wizard/Postfix.pm:136 ../samba_wizard/Sambashare.pm:167
 msgid "What kind of user are you:"
@@ -1627,10 +1745,6 @@ msgstr ""
 "Feks: myhostname = mittvertsnavn"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domene:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -1667,7 +1781,8 @@ msgid "Main Postfix server"
 msgstr "Hoved-Postfix-tjener"
 
 #: ../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-kommando: dette stopper noen teknikker brukt for å hamstre e-"
 "postadresser."
@@ -1774,7 +1889,8 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:217
 msgid "The list of trusted SMTP clients. ie: 127.0.0.0/32, 192.168.1.0/24"
-msgstr "Listen over SMTP-klienter som stoles på. Feks.: 127.0.0.0/32, 192.168.1.0/24"
+msgstr ""
+"Listen over SMTP-klienter som stoles på. Feks.: 127.0.0.0/32, 192.168.1.0/24"
 
 #: ../postfix_wizard/Postfix.pm:217 ../postfix_wizard/Postfix.pm:262
 msgid "my networks:"
@@ -1918,7 +2034,8 @@ 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 ""
 "Trykk Neste hvis du ønsker å beholde denne verdien, eller Tilbake hvis du "
 "vil endre valget."
@@ -1936,8 +2053,10 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Du må velge en port større enn 1024 og lavere enn 65535"
 
 #: ../proxy_wizard/Squid.pm:99
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
-msgstr "Disk cache er mengden av diskplass som kan brukes til caching på disken."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
+msgstr ""
+"Disk cache er mengden av diskplass som kan brukes til caching på disken."
 
 #: ../proxy_wizard/Squid.pm:99
 msgid "For your information, here is /var/spool/squid space on disk:"
@@ -2040,8 +2159,10 @@ msgid "Configuring the Proxy"
 msgstr "Konfigurerer Proxy"
 
 #: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
-msgid "The wizard collected the following parameters needed to configure your proxy:"
-msgstr "Veiviseren samlet følgende parametere som trengs for å sette opp proxyen din:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+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:126
@@ -2145,7 +2266,8 @@ msgstr ""
 msgid ""
 "PXE name: the name displayed in PXE menu (please provide an ASCII word or a "
 "number, with no spaces)"
-msgstr "PXE-navn: navn som vises i PXE-meny (oppgi et ord eller tall uten mellomrom)"
+msgstr ""
+"PXE-navn: navn som vises i PXE-meny (oppgi et ord eller tall uten mellomrom)"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid "Path to image: provide the full path to the network boot image"
@@ -2192,7 +2314,8 @@ msgstr ""
 "velge hvilken imagefil han ønsker å starte opp med igjennom 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 "Velg PXE-oppstartsimagefilen som du vil fjerne fra PXE-tjeneren."
 
 #: ../pxe_wizard/Pxe.pm:153
@@ -2223,8 +2346,10 @@ msgstr ""
 "oppstartsimagefiler med vanlige parametre."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Fra lista nedenfor, velg PXE-oppstartsimagefilen som du ønsker å endre på"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Fra lista nedenfor, velg PXE-oppstartsimagefilen som du ønsker å endre på"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
 msgid "Boot image to modify:"
@@ -2235,8 +2360,10 @@ msgid "Add option to the PXE boot image"
 msgstr "Legg til opsjon til PXE-oppstartsimagefila"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandriva Linux install server directory"
-msgstr "Installasjonskatalog: full sti til Mandriva Linux-installasjonstjenerkatalog"
+msgid ""
+"Install directory: the full path to Mandriva Linux install server directory"
+msgstr ""
+"Installasjonskatalog: full sti til Mandriva Linux-installasjonstjenerkatalog"
 
 #: ../pxe_wizard/Pxe.pm:170
 msgid "Installation method: choose NFS or HTTP."
@@ -2334,7 +2461,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "Vi trenger en all.rdz- eller en network.img-imagefil. Vennligst legg til en."
+msgstr ""
+"Vi trenger en all.rdz- eller en network.img-imagefil. Vennligst legg til en."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
@@ -2357,7 +2485,8 @@ msgid ""
 msgstr "Oppgi et korrekt PXE-navn: et ord eller et nummer uten mellomrom."
 
 #: ../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 ""
 "For å legge til/fjerne/endre PXE-oppstartsimagefilen skal du kjøre 'Set PXE "
 "server' først."
@@ -2456,15 +2585,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Veiviser for oppsett av Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Det ser ut til at du tidligere har satt opp en Samba-tjener. Denne "
-"veiviseren vil lese inn ditt gamle oppsett på nytt, og vise deg typen Samba-"
-"tjener du velger"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2484,8 +2604,10 @@ msgstr ""
 "domenet."
 
 #: ../samba_wizard/Samba.pm:121
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Enkelt-tjenerinstallasjoner kan bruke smbpasswd- eller tdbsam-bakstykker"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Enkelt-tjenerinstallasjoner kan bruke smbpasswd- eller tdbsam-bakstykker"
 
 #: ../samba_wizard/Samba.pm:141
 #, fuzzy
@@ -2550,9 +2672,10 @@ msgid ""
 "the WINS server that nmbd(8) should register with. If you have a WINS server "
 "on your network then you should set this to the WINS server's IP."
 msgstr ""
-"Dette spesifiserer IP-adressene (eller DNS-navn: IP-adresse om foretrukket) til "
-"WINS-tjeneren som nmbd(8) skal registrere seg hos. Hvis du har en WINS-tjener "
-"på nettverket ditt så burde du sette dette til WINS-tjenerens IP-adresse."
+"Dette spesifiserer IP-adressene (eller DNS-navn: IP-adresse om foretrukket) "
+"til WINS-tjeneren som nmbd(8) skal registrere seg hos. Hvis du har en WINS-"
+"tjener på nettverket ditt så burde du sette dette til WINS-tjenerens IP-"
+"adresse."
 
 #: ../samba_wizard/Samba.pm:176
 msgid "Wins server:"
@@ -2622,9 +2745,9 @@ msgid ""
 "needs to have write access to the LDAP tree. You will need to give samba the "
 "password for this dn."
 msgstr ""
-"Kontoen (dn) som samba bruker for å få tilgang til LDAP-tjeneren. Denne kontoen "
-"trenger å ha skrivetilgang til LDAP-treet. Du vil trenge å gi samba passordet for "
-"denne dn."
+"Kontoen (dn) som samba bruker for å få tilgang til LDAP-tjeneren. Denne "
+"kontoen trenger å ha skrivetilgang til LDAP-treet. Du vil trenge å gi samba "
+"passordet for denne dn."
 
 #: ../samba_wizard/Samba.pm:255
 msgid "Passdb backend"
@@ -2734,7 +2857,8 @@ msgstr "Tjener-banner."
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Banner er måten denne tjeneren vil bli omtalt i Windows arbeid- stasjonene."
+msgstr ""
+"Banner er måten denne tjeneren vil bli omtalt i Windows arbeid- stasjonene."
 
 #: ../samba_wizard/Samba.pm:307
 msgid "Banner:"
@@ -2759,7 +2883,8 @@ msgstr "Loggnivå: sette loggnivået (informativitet) (0 <= loggnivå <= 10)"
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Maks loggstørrelse:  legg en grense på størrelsen til loggfilene (i Kb)."
+msgstr ""
+"Maks loggstørrelse:  legg en grense på størrelsen til loggfilene (i Kb)."
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Samba Log"
@@ -2773,7 +2898,7 @@ msgstr "Loggfil:"
 msgid "Max log size:"
 msgstr "Maks loggstørrelse:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Loggnivå:"
 
@@ -2822,7 +2947,8 @@ msgstr "Skrivere - sett opp skriverne dine"
 
 #: ../samba_wizard/Sambaprint.pm:65
 msgid "You can enable or disable printers in your Samba server configuration."
-msgstr "Du kan aktivere eller deaktivere skriverne dine i ditt Samba-tjeneroppsett."
+msgstr ""
+"Du kan aktivere eller deaktivere skriverne dine i ditt Samba-tjeneroppsett."
 
 #: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
 #, fuzzy
@@ -2830,8 +2956,8 @@ msgid ""
 "It seems that you haven't setup a Samba server. Please setup a Samba server "
 "with Samba wizard before manage your share."
 msgstr ""
-"Det ser ut til at du ikke har satt opp en Samba-tjener. Sett opp en Samba-tjener med "
-"Samba-veiviseren for å håndtere dine delte ressurser."
+"Det ser ut til at du ikke har satt opp en Samba-tjener. Sett opp en Samba-"
+"tjener med Samba-veiviseren for å håndtere dine delte ressurser."
 
 #: ../samba_wizard/Sambaprint.pm:76
 msgid "Enable printers in Samba?"
@@ -2843,7 +2969,8 @@ msgstr "Skrivere er tilgjengelig."
 
 #: ../samba_wizard/Sambaprint.pm:86
 msgid "Select which printers you want to be accessible from known users"
-msgstr "Velg hvilke skrivere du ønsker skal være tilgjengelige fra kjente brukere"
+msgstr ""
+"Velg hvilke skrivere du ønsker skal være tilgjengelige fra kjente brukere"
 
 #: ../samba_wizard/Sambaprint.pm:92
 msgid "Enable all printers"
@@ -2854,8 +2981,8 @@ msgid ""
 "Now you can configure your printers service. Change value only if you know "
 "what your are doing."
 msgstr ""
-"Nå kan du sette opp dine skriveres tjeneste. Endre verdi bare hvis du vet hva "
-"du driver med."
+"Nå kan du sette opp dine skriveres tjeneste. Endre verdi bare hvis du vet "
+"hva du driver med."
 
 #: ../samba_wizard/Sambaprint.pm:119 ../samba_wizard/Sambaprint.pm:132
 #: ../samba_wizard/Sambashare.pm:200 ../samba_wizard/Sambashare.pm:248
@@ -2968,7 +3095,8 @@ msgstr "Opprett en spesiell delt ressurs, hvilken type?"
 
 #: ../samba_wizard/Sambashare.pm:165
 msgid "Now I need to know your understanding in Samba server configuration"
-msgstr "Nå trenger jeg å få kjennskap til din forståelse i oppsett av Samba-tjener"
+msgstr ""
+"Nå trenger jeg å få kjennskap til din forståelse i oppsett av Samba-tjener"
 
 #: ../samba_wizard/Sambashare.pm:172
 msgid "Delete which share?"
@@ -3017,8 +3145,11 @@ msgid "Directory mask:"
 msgstr "Katalogmaske:"
 
 #: ../samba_wizard/Sambashare.pm:210
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Opprettelsesmaske, opprettelsesmodus og katalogmaske bør være numerisk. Feks.: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Opprettelsesmaske, opprettelsesmodus og katalogmaske bør være numerisk. "
+"Feks.: 0755."
 
 #: ../samba_wizard/Sambashare.pm:217
 msgid "Modify a share"
@@ -3106,8 +3237,8 @@ msgid ""
 "To restrict the share to a particular user. If this is empty (the default) "
 "then any user  can  login. ie: guibo"
 msgstr ""
-"For å begrense en delt ressurs til en bestemt bruker. Hvis denne er tom (standard) "
-"så kan hvilken som helst bruker logge inn. Feks.: guibo"
+"For å begrense en delt ressurs til en bestemt bruker. Hvis denne er tom "
+"(standard) så kan hvilken som helst bruker logge inn. Feks.: guibo"
 
 #: ../samba_wizard/Sambashare.pm:273
 msgid "valid users"
@@ -3121,11 +3252,11 @@ msgid ""
 "list will be able to do anything they like on the share, irrespective of "
 "file permissions."
 msgstr ""
-"Dette er en liste over brukere som vil bli administrative privilegier på denne "
-"delte ressursen. Dette betyr at de vil gjøre alle filoperasjoner som superbrukeren "
-"(root). Du burde bruke dette valget veldig forsiktig siden hvilken som helst bruker "
-"i denne listen vil kunne gjøre hva som helst de måtte ønske på denne delte ressursen, "
-"uavhengig av filrettigheter."
+"Dette er en liste over brukere som vil bli administrative privilegier på "
+"denne delte ressursen. Dette betyr at de vil gjøre alle filoperasjoner som "
+"superbrukeren (root). Du burde bruke dette valget veldig forsiktig siden "
+"hvilken som helst bruker i denne listen vil kunne gjøre hva som helst de "
+"måtte ønske på denne delte ressursen, uavhengig av filrettigheter."
 
 #: ../samba_wizard/Sambashare.pm:274
 msgid "admin users"
@@ -3252,8 +3383,8 @@ msgid ""
 "Share with the same name already exist or share name empty, please choose "
 "another name."
 msgstr ""
-"Delt ressurs med det samme navnet eksisterer allerede eller så er delenavnet tomt, velg "
-"et annet navn."
+"Delt ressurs med det samme navnet eksisterer allerede eller så er delenavnet "
+"tomt, velg et annet navn."
 
 #: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:344
 #: ../samba_wizard/Sambashare.pm:403 ../samba_wizard/Sambashare.pm:409
@@ -3315,7 +3446,9 @@ msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:476
 msgid "Specifie a user that have read-write access to a share. ie: guibo"
-msgstr "Spesifiser en bruker som har både lese- og skrivetilgang til en delt ressurs. Feks.: guibo"
+msgstr ""
+"Spesifiser en bruker som har både lese- og skrivetilgang til en delt "
+"ressurs. Feks.: guibo"
 
 #: ../samba_wizard/Sambashare.pm:491
 msgid "Create mask should be a number. ie: 0755."
@@ -3364,8 +3497,8 @@ msgid ""
 "If you really want to add this share, click the Next button or use the Back "
 "button."
 msgstr ""
-"Hvis du virkelig ønsker å legge til denne delte ressursen, klikk Neste-knappen eller bruk "
-"Tilbake-knappen."
+"Hvis du virkelig ønsker å legge til denne delte ressursen, klikk Neste-"
+"knappen eller bruk Tilbake-knappen."
 
 #: ../samba_wizard/Sambashare.pm:544
 msgid "Summary add home share"
@@ -3376,8 +3509,8 @@ msgid ""
 "If you really want to modify this share, click the Next button or use the "
 "Back button."
 msgstr ""
-"Hvis du virkelig ønsker å endre denne delte ressursen, klikk Neste-knappen eller bruk "
-"Tilbake-knappen."
+"Hvis du virkelig ønsker å endre denne delte ressursen, klikk Neste-knappen "
+"eller bruk Tilbake-knappen."
 
 #: ../samba_wizard/Sambashare.pm:555
 msgid "Summary modify a share"
@@ -3408,8 +3541,8 @@ msgid ""
 "If you really want to remove this share, click the Next button or use the "
 "Back button."
 msgstr ""
-"Hvis du virkelig ønsker å fjerne denne delte ressursen, klikk Neste-knappen eller bruk "
-"Tilbake-knappen."
+"Hvis du virkelig ønsker å fjerne denne delte ressursen, klikk Neste-knappen "
+"eller bruk Tilbake-knappen."
 
 #: ../samba_wizard/Sambashare.pm:596
 msgid "Summary remove a share"
@@ -3484,126 +3617,126 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Delt Samba-ressurs"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Ekspert - avansert ssh-valg"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Hvilket type oppsett ønsker du å gjøre:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSH-tjener, klassiske valg"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Lytteadresse:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Spesifiserer den lokale adressen sshd skal lytte på."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Portnummer:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "Spesifiserer hvilket portnummer sshd lytter på. Standard er 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Port må være et nummer"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Autentiseringsmetode"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "RSA-autentisering:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "PubKey-autentisering:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Passordautentisering:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Overse rhosts-fil:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Tillatt tomme passord"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Logg"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Innloggingsvalg"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Skrivere:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Tillat root-innlogging:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3611,66 +3744,66 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Brukernavn-valg"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Strikt modus:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Tillat brukere:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Nekt brukere:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Komprimering: Spesifiserer hvorvidt komprimering er tillatt."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Komprimering:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11-videresending:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Sammendrag av OpenSSH-oppsett"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Veiviseren satte vellykket opp SSH-tjeneren din."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Setter opp din OpenSSH-tjener..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSH-tjener"
 
@@ -3696,7 +3829,8 @@ msgstr ""
 
 #: ../time_wizard/Ntp.pm:70
 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."
+msgstr ""
+"Derfor vil tjeneren din være den lokale tid-tjeneren for nettverket ditt."
 
 #: ../time_wizard/Ntp.pm:70
 msgid "press next to begin, or cancel to leave this wizard"
@@ -3788,7 +3922,8 @@ msgstr "Tid-tjeneroppsett lagret"
 
 #: ../time_wizard/Ntp.pm:153
 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. "
+msgstr ""
+"Tjeneren din kan nå opptre som en tid-tjener for ditt lokale nettverk. "
 
 #: ../web_wizard/Apache.pm:39
 msgid "Web wizard"
@@ -3811,7 +3946,8 @@ msgstr "Konfigurasjonsveiviser for web-tjener"
 
 #: ../web_wizard/Apache.pm:78
 msgid "Don't check any box if you don't want to activate your Web server."
-msgstr "Ikke merk av noen bokser hvis du ikke ønsker å aktivere web-tjeneren din."
+msgstr ""
+"Ikke merk av noen bokser hvis du ikke ønsker å aktivere web-tjeneren din."
 
 #: ../web_wizard/Apache.pm:78
 msgid "Select the kind of Web service you want to activate:"
@@ -3915,3 +4051,19 @@ msgstr "Apache-tjener"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer ditt system som en Apache-tjener ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Epostdomene:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Installasjon pågår"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Installerer Kolab-tjener på ditt system..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Det ser ut til at du tidligere har satt opp en Samba-tjener. Denne "
+#~ "veiviseren vil lese inn ditt gamle oppsett på nytt, og vise deg typen "
+#~ "Samba-tjener du velger"
diff --git a/po/nl.po b/po/nl.po
index 6c41a4e9..cc919136 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -38,7 +38,7 @@ 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:97
+#: ../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
@@ -48,7 +48,7 @@ msgstr "Fout."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Gefeliciteerd"
 
@@ -140,32 +140,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Fout opgetreden"
 
@@ -363,7 +364,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Mislukt"
 
@@ -536,7 +537,8 @@ msgstr ""
 "Het lijkt erop dat deze computer al in uw DNS configuratie is opgenomen. "
 "Klik op Volgende om verder te gaan"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Fout opgetreden:"
 
@@ -664,7 +666,7 @@ msgstr "ldap server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Weergeven Ldap confuiguratie"
@@ -710,7 +712,7 @@ msgstr ""
 "%s is niet geïnstalleerd\n"
 "Klik op \"Volgende\" om te installeren of \"Annuleren\" om af te sluiten"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Installatie is mislukt"
 
@@ -779,8 +781,8 @@ msgstr "Naam van de server:"
 msgid "Admin email:"
 msgstr "Systeembeheerder email:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Sta aanmelden van systeembeheerder toe:"
 
@@ -902,7 +904,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Start drakwizard opnieuw en probeer het met andere gegevens."
 
@@ -995,11 +997,21 @@ msgstr ""
 "zal op deze manier erg gemakkelijk zijn om Mandriva Linux via een netwerk te "
 "installeren."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab-configuratiewizard"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -1011,7 +1023,7 @@ msgstr ""
 "interface, een gedeelde adresboek met oog op zowel mailbox gebruikers als "
 "contacten en een POP3 en IMAP4(rev1) toegang tot mail"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1021,39 +1033,140 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. De wizard zal een reservekopie van all uw "
 "voorgaande configuratiebestanden van deze diensten aanmaken "
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Welkom bij de Kolab Groupware server-configuratiewizard"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Primaire DNS server"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "U heeft uw Ldap server reeds geconfigureerd."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Secundaire DNS server"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domeinnaam:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Domeinnaam:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Voer het wachtwoord voor de manager-account van de Kolab server in"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Wachtwoord is niet correct, voer wachtwoord opnieuw in"
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Wachtwoord (nogmaals):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Voornaam:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Wachtwoord (nogmaals):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "De wizard zal de Kolab-server nu configureren met deze parameters"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Computernaam:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "E-maildomein:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1061,19 +1174,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Bezig met installeren"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Bezig met installeren van de Kolab server op uw systeem..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Bezig met configureren van de Kolab server op uw systeem..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -1611,7 +1716,7 @@ msgid "Relay mail server"
 msgstr "Externe e-mailserver"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1631,9 +1736,8 @@ msgid ""
 msgstr ""
 "Deze wizard helpt u met het instellen van de FTP server voor uw netwerk."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informatie"
 
@@ -1673,11 +1777,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Domeinnaam:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2524,12 +2623,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Web server configuratiewizard"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2838,7 +2931,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Toegangs niveau:"
@@ -3560,132 +3653,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba server"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Wat wilt u doen:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Laagste IP adres:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Voornaam:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Er is een fout opgetreden. Dit moet een map zijn"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Installatiemethode:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Wachtwoord:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Printers:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Sta aanmelden van systeembeheerder toe:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3693,73 +3786,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Aanmeldnaam gebruiker:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Computers toestaan:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Computers niet toelaten:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Aangepaste optie:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Weergeven Ldap confuiguratie"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "De wizard heeft uw NFS server succesvol ingesteld."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "De Samba server wordt geconfigureerd..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache webserver:"
@@ -4008,6 +4101,15 @@ msgstr "Apache webserver:"
 msgid "Configuring your system as Apache server ..."
 msgstr "De computer wordt als Apache webserver geconfigureerd ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "E-maildomein:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Bezig met installeren"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Bezig met installeren van de Kolab server op uw systeem..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 3689d5f7..ea1f7133 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr "ਗਲਤੀ।"
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "ਮੁਬਾਰਕਾਂ"
 
@@ -127,32 +127,33 @@ msgstr "ਤੁਸੀਂ dhcp ਵਿੱਚ ਹੋ, ਹੋ ਸਕਦਾ ਹੈ ਕ
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
@@ -332,7 +333,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "ਅਸਫਲ"
 
@@ -494,7 +495,8 @@ msgstr ""
 "ਅਜਿਹਾ ਲਗਦਾ ਹੈ ਕਿ ਮੇਜ਼ਬਾਨ ਤੁਹਾਡੀ DNS ਸੰਰਚਨਾ ਵਿੱਚ ਪਹਿਲਾਂ ਹੀ ਸ਼ਾਮਿਲ ਹੈ... ਜਾਰੀ ਰਹਿਣ ਲਈ "
 "ਅੱਗੇ ਦਬਾਓ"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "ਗਲਤੀ:"
 
@@ -620,7 +622,7 @@ msgstr "ldap ਸਰਵਰ"
 msgid "Proxy"
 msgstr "ਪਰਾਕਸੀ"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "ldap ਸੰਰਚਨਾ ਵਿਖਾਓ"
@@ -666,7 +668,7 @@ msgstr ""
 "%s ਇੰਸਟਾਲ ਨਹੀਂ\n"
 "ਇੰਸਟਾਲ ਕਰਨ ਲਈ \"Next\" ਜਾਂ ਬਾਹਰ ਜਾਣ ਲਈ \"Cancel\" ਦਬਾਓ"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
 
@@ -732,8 +734,8 @@ msgstr "ਸਰਵਰ ਮੇਜ਼ਬਾਨ ਨਾਂ:"
 msgid "Admin email:"
 msgstr "ਪ੍ਰਬੰਧਕ ਈ-ਪੱਤਰ:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "root ਲਾਗਇਨ ਮਨਜੂਰ ਕਰੋ:"
 
@@ -847,7 +849,7 @@ msgstr "ਤਖਤੀ ਨੇ ਤੁਹਾਡਾ ਇੰਟਰਾਨੈੱਟ/ਇ�
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ drakwizard ਮੁੜ ਚਲਾਓ, ਅਤੇ ਕੁਝ ਪੈਰਾਮੀਟਰ ਤਬਦੀਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"
 
@@ -935,11 +937,21 @@ msgstr ""
 "ਮੁਬਾਰਕਾਂ, ਮੈਂਡਰਿਵ -ਲੀਨਕਸ ਇੰਸਟਾਲ ਸਰਵਰ ਹੁਣ ਤਿਆਰ ਹੈ। ਤੁਸੀਂ PXE ਸਹਿਯੋਗ ਨਾਲ DHCP ਸਰਵਰ ਸੰਰਚਿਤ "
 "ਕਰ ਸਕਦੇ ਹੋ। ਇਸ ਲਈ ਮੈਂਡਰਿਵ -ਲੀਨਕਸ ਨੈੱਟਵਰਕ ਦੁਆਰਾ ਇੰਸਟਾਲ ਕਰਨਾ ਬਹੁਤ ਸੌਖਾ ਹੈ।"
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab ਸੰਰਚਨਾ ਤਖਤੀ"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -950,7 +962,7 @@ msgstr ""
 "ਬਾਕਸ ਉਪਭੋਗੀਆਂ ਲਈ ਮਨਜੂਰੀ ਸਮੇਤ ਸ਼ੇਅਰ ਕੀਤੀ ਸਿਰਨਾਵਾਂ ਬੁੱਕ। ਨਾਲ ਹੀ ਸੰਪਰਕ ਅਤੇ POP3 ਲਈ ਅਤੇ ਪੱਤਰ "
 "ਲਈ IMAP4 (rev1) ਪਹੁੰਚ ਸਮੇਤ।"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -959,39 +971,140 @@ msgstr ""
 "ਚੇਤਾਵਨੀ: Kolab ਦੀ ਹੋਰ ਸੇਵਾਵਾਂ ਸੰਰਚਿਤ ਕਰਨ ਲਈ ਜਰੂਰਤ ਹੈ: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth। ਤਖਤੀ ਇਹਨਾਂ ਸੇਵਾਵਾਂ ਲਈ ਤੁਹਾਡੀ ਪਹਿਲੀ ਸੰਰਚਨਾ ਦਾ ਬੈਕਅੱਪ ਰੱਖੇਗੀ।"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Kolab ਗਰੁੱਪਵੇਅਰ ਸਰਵਰ ਸੰਰਚਨਾ ਤਖਤੀ ਵੱਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ।"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "ਮਾਸਟਰ DNS ਸਰਵਰ"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ Ldap ਸਰਵਰ ਸੰਰਚਿਤ ਕੀਤਾ ਹੈ"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "ਸਲੇਵ DNS ਸਰਵਰ"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "ਡੋਮੇਨ-ਨਾਂ:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "ਡੋਮੇਨ-ਨਾਂ:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Kolab ਸਰਵਰ ਦੇ ਮੈਨੇਜਰ ਖਾਤੇ ਲਈ ਗੁਪਤ-ਕੋਡ ਭਰੋ।"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "ਗੁਪਤ-ਕੋਡ ਗਲਤ, ਜਾਂ ਖਾਲੀ ਗੁਪਤ-ਕੋਡ, ਕਿਰਪਾ ਕਰਕੇ ਠੀਕ ਕਰੋ।"
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "ਗੁਪਤ-ਕੋਡ:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "ਫਿਰ ਗੁਪਤ-ਕੋਡ"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "ਪਹਿਲਾ ਨਾਂ:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "ਫਿਰ ਗੁਪਤ-ਕੋਡ"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "ਤਖਤੀ ਹੁਣ ਇਹਨਾਂ ਪੈਰਾਮੀਟਰਾਂ ਨਾਲ Kolab ਸਰਵਰ ਸੰਰਚਿਤ ਕਰੇਗਾ"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "ਮੇਜ਼ਬਾਨ ਨਾਂ:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "ਪੱਤਰ ਡੋਮੇਨ:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -999,19 +1112,11 @@ msgstr ""
 "kolab ਸਰਵਰ ਹੁਣ ਸੰਰਚਿਤ ਹੈ ਅਤੇ ਚੱਲ ਰਿਹਾ ਹੈ। ਗੁਪਤ-ਕੋਡ ਜੋ ਤੁਸੀਂ https://127.0.0.1/kolab/"
 "admin/ ਤੇ ਦਿੱਤਾ ਸੀ ਨਾਲ 'ਪ੍ਰਬੰਧਕ' ਤੌਰ ਤੇ ਲਾਗਇਨ ਕਰੋ।"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "ਇੰਸਟਾਲ ਚੱਲ ਰਹੀ ਹੈ"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ Kolab ਸਰਵਰ ਇੰਸਟਾਲ ਕਰ ਰਿਹਾ ਹੈ..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ Kolab ਸਰਵਰ ਸੰਰਚਿਤ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab ਸਰਵਰ"
 
@@ -1530,7 +1635,7 @@ msgid "Relay mail server"
 msgstr "ਬਾਹਰੀ ਪੱਤਰ ਸਰਵਰ"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1549,9 +1654,8 @@ msgid ""
 "relay."
 msgstr "ਇਹ ਤਖਤੀ ਤੁਹਾਨੂੰ ਆਪਣੇ ਨੈੱਟਵਰਕ ਲਈ FTP ਸਰਵਰ ਸੰਰਚਿਤ ਕਰਨ ਲਈ ਮਦਦ ਕਰੇਗੀ।"
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "ਜਾਣਕਾਰੀ"
 
@@ -1591,11 +1695,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "ਡੋਮੇਨ-ਨਾਂ:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2402,12 +2501,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "ਵੈਬ ਸਰਵਰ ਸੰਰਚਨਾ ਤਖਤੀ"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2715,7 +2808,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "ਪਹੁੰਚ ਪੱਧਰ:"
@@ -3434,132 +3527,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "ਸਾਂਬਾ ਸਰਵਰ"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "ਹੇਠਲਾ IP ਸਿਰਨਾਵਾਂ:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "ਪਹਿਲਾ ਨਾਂ:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "ਗਲਤੀ: ਡਾਇਰੈਕਟਰੀ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ।"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਵਿਧੀ:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "ਗੁਪਤ-ਕੋਡ:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "ਪ੍ਰਿੰਟਰ:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "root ਲਾਗਇਨ ਮਨਜੂਰ ਕਰੋ:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3567,73 +3660,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "ਉਪਭੋਗੀ ਲਾਗਇਨ:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "ਮਨਜੂਰ ਮੇਜ਼ਬਾਨ:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "ਰੋਕੇ ਮੇਜ਼ਬਾਨ:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "ਪਸੰਦੀ ਦੀ ਚੋਣ:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "ldap ਸੰਰਚਨਾ ਵਿਖਾਓ"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "ਤਖਤੀ ਨੇ ਤੁਹਾਡਾ NFS ਸਰਵਰ ਸਫਲਤਾ ਨਾਲ ਸੰਰਚਿਤ ਕੀਤਾ।"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "ਸਾਂਬਾ ਸਰਵਰ ਸੰਰਚਿਤ ਕਰ ਰਿਹਾ ਹੈ..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache ਸਰਵਰ"
@@ -3873,6 +3966,15 @@ msgstr "Apache ਸਰਵਰ"
 msgid "Configuring your system as Apache server ..."
 msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਨੂੰ Apache ਸਰਵਰ ਤੌਰ ਤੇ ਸੰਰਚਿਤ ਕਰ ਰਿਹਾ ਹੈ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "ਪੱਤਰ ਡੋਮੇਨ:"
+
+#~ msgid "Install in progress"
+#~ msgstr "ਇੰਸਟਾਲ ਚੱਲ ਰਹੀ ਹੈ"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ Kolab ਸਰਵਰ ਇੰਸਟਾਲ ਕਰ ਰਿਹਾ ਹੈ..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/pl.po b/po/pl.po
index 5c1db533..290f41d7 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-09-02 10:50+0200\n"
 "Last-Translator: Tomasz Bednarski <tomasz.bednarski@mandriva.pl>\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -42,7 +42,7 @@ 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:97
+#: ../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
@@ -52,7 +52,7 @@ msgstr "Błąd."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Gratulacje"
 
@@ -100,7 +100,8 @@ msgstr "Identyfikacja klienta:"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "Zwróć uwagę, aby podany numer IP i nazwa klienta były unikalne w sieci."
+msgstr ""
+"Zwróć uwagę, aby podany numer IP i nazwa klienta były unikalne w sieci."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid ""
@@ -136,32 +137,33 @@ msgstr "Jesteś w dhcp, serwer może nie pracować z tą konfiguracją."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Błąd"
 
@@ -181,7 +183,8 @@ msgstr "Dodawanie nowego klienta do sieci"
 msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
-msgstr "Druid zebrał poniższe parametry wymagane do dodania klienta do twojej sieci:"
+msgstr ""
+"Druid zebrał poniższe parametry wymagane do dodania klienta do twojej sieci:"
 
 #: ../client_wizard/Bind_client.pm:88
 msgid ""
@@ -224,7 +227,8 @@ msgstr ""
 "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?"
+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
@@ -297,7 +301,8 @@ msgstr "Podany zakres adresów IP nie jest poprawny."
 
 #: ../dhcp_wizard/Dhcp.pm:100
 msgid "The IP range specified is not in server address range."
-msgstr "Podany zakres adresów IP nie znajduje się w zakresie adresów sieci serwera."
+msgstr ""
+"Podany zakres adresów IP nie znajduje się w zakresie adresów sieci serwera."
 
 #: ../dhcp_wizard/Dhcp.pm:105
 msgid "The IP of the server must not be in range."
@@ -311,7 +316,8 @@ msgstr "Konfiguracja serwera DHCP"
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
-msgstr "Druid zebrał poniższe parametry wymagane do skonfigurowania usługi DHCP:"
+msgstr ""
+"Druid zebrał poniższe parametry wymagane do skonfigurowania usługi DHCP:"
 
 #: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:147
 #: ../ftp_wizard/Proftpd.pm:148 ../ftp_wizard/Proftpd.pm:149
@@ -345,7 +351,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Niepowodzenie"
 
@@ -353,7 +359,8 @@ msgstr "Niepowodzenie"
 #: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:185
 #: ../web_wizard/Apache.pm:147
 msgid "Relaunch drakwizard, and try to change some parameters."
-msgstr "Uruchom ponownie program drakwizard i spróbuj zmienić niektóre parametry."
+msgstr ""
+"Uruchom ponownie program drakwizard i spróbuj zmienić niektóre parametry."
 
 #: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
@@ -494,7 +501,8 @@ msgid "Default domain name to search:"
 msgstr "Domyślna nazwa domeny do przeszukiwania:"
 
 #: ../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 ""
 "To nie jest poprawny adres IP komp. przekierowującego... naciśnij dale, aby "
 "kontynuować"
@@ -517,7 +525,8 @@ msgstr ""
 "Wygląda na to, że komputer posiadajuż wpis w konfiguracji DNS... naciśnij "
 "dalej aby kontynuować"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Błąd:"
 
@@ -538,7 +547,8 @@ msgstr ""
 "Uruchom druida DNS: podstawowy serwer 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 ""
 "Wygląda na to, że komputer nie jest podstawowym serwerem DNS, lecz serwerem "
 "zapasowym. Tak więc nie można dodać/usunąć komputera."
@@ -568,7 +578,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Klient z tą tożsamością zostanie usunięty z 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 "Serwer DNS za chwilę skonfiguruje komputer z poniższą konfiguracją"
 
 #: ../dns_wizard/Bind.pm:245
@@ -640,7 +651,7 @@ msgstr "Serwer LDAP"
 msgid "Proxy"
 msgstr "Pośrednik"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Konfiguracja serwera OpenSSH"
 
@@ -685,7 +696,7 @@ msgstr ""
 "Pakiet %s nie jest zainstalowany\n"
 "Kliknij \"Dalej\" aby go zainstalować lub \"Anuluj aby zakończyć"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalacja nie powiodła się"
 
@@ -739,7 +750,8 @@ msgstr "Opcje serwera FTP Proftpd, krok 1"
 
 #: ../ftp_wizard/Proftpd.pm:98
 msgid "Permit root login: allow root to log on FTP server."
-msgstr "Zezwalanie na logowanie roota: pozwala na logowanie roota do serwera FTP."
+msgstr ""
+"Zezwalanie na logowanie roota: pozwala na logowanie roota do serwera FTP."
 
 #: ../ftp_wizard/Proftpd.pm:104
 msgid "Server name:"
@@ -749,8 +761,8 @@ msgstr "Nazwa serwera:"
 msgid "Admin email:"
 msgstr "E-mail administratora:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Zezwalanie na logowanie roota:"
 
@@ -863,7 +875,7 @@ msgstr "Druid pomyślnie skonfigurował twój serwera FTP dla Intranetu/Internet
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Uruchom ponownie drakwizard'a i spróbuj zmienić niektóre parametry."
 
@@ -872,7 +884,8 @@ msgid "Configure an install server (via NFS and HTTP)"
 msgstr "Konfiguracja serwera instalacyjnego (przez NFS i 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 ""
 "Łatwa konfiguracja serwera instalacyjnego przy użyciu dostępu przez NFS i "
 "HTTP."
@@ -949,11 +962,21 @@ msgstr ""
 "Linuksa będzie bardzo łatwa. Do konfiguracji serwera PXE użyj programu "
 "drakpxelinux oraz druida do konfiguracji serwera DHCP."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Druid konfiguracji Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+msgid "Master kolab server"
+msgstr "Podstawowy serwer DNS"
+
+#: ../kolab_wizard/Kolab.pm:61
+#, fuzzy
+msgid "Slave kolab server"
+msgstr "Pomocniczy serwer DNS"
+
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
 "features include: a web administration interface, a shared address book with "
@@ -965,7 +988,7 @@ msgstr ""
 "współdzielona książka adresowa z obsługą skrzynek użytkowników oraz "
 "kontaktów i dostępem do skrzynki poprzez POP3 i IMAP4 (rev1)."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -975,39 +998,139 @@ msgstr ""
 "cyrus, postfix, imap, saslauth. Druid utworzy kopię zapasową wszystkich "
 "poprzednich plików konfiguracyjnych dla tych usług."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Witaj w druidzie konfiguracji serwera do pracy grupowej Kolab."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Podstawowy serwer DNS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Serwer Ldap został już skonfigurowany"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Pomocniczy serwer DNS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domena:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domena:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Wprowadź hasło dla konta zarządczego serwera Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Hasło się nie zgadza lub jest puste. Popraw je."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Hasło ponownie:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Imię:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Hasło ponownie:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Druid zmodyfikuje teraz opcje serwera Kolab z tymi parametrami"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nazwa komputera:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Domena pocztowa:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1015,19 +1138,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Instalacja trwa"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Instalowanie serwera Kolab w systemie..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfiguracja serwera Kolab w systemie..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Serwer Kolab"
 
@@ -1057,7 +1172,8 @@ msgstr ""
 
 #: ../ldap_wizard/Ldap.pm:95
 msgid "LDAP stands for Lightweight Directory Access Protocol."
-msgstr "LDAP to skrót od angielskiego \"Lightweight Directory Access Protocol\"."
+msgstr ""
+"LDAP to skrót od angielskiego \"Lightweight Directory Access Protocol\"."
 
 #: ../ldap_wizard/Ldap.pm:95 ../ldap_wizard/Ldap.pm:103
 msgid "Ldap configuration wizard"
@@ -1247,7 +1363,8 @@ msgstr "Druid grup dyskusyjnych"
 msgid ""
 "This wizard will help you configuring the Internet News services for your "
 "network."
-msgstr "Ten druid pomoże ci skonfigurować usługi grup dyskusyjnych dla twojej sieci."
+msgstr ""
+"Ten druid pomoże ci skonfigurować usługi grup dyskusyjnych dla twojej sieci."
 
 #: ../news_wizard/Inn.pm:44
 msgid "Welcome to the News Wizard"
@@ -1339,7 +1456,8 @@ msgid "Polling interval:"
 msgstr "Okres odpytywania:"
 
 #: ../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 "Druid pomyślnie skonfigurował usługę grup dyskusyjnych serwera."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1550,7 +1668,7 @@ msgid "Relay mail server"
 msgstr "Przekaźnik poczty"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Początkujący - opcje standardowe"
 
@@ -1570,9 +1688,8 @@ msgstr ""
 "Ten druid pomoże ci skonfigurować serwer pocztowy lub przekaźnik pocztowy "
 "Postfix."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informacje"
 
@@ -1613,14 +1730,11 @@ msgstr ""
 "pocztowego. Np. myhostname = mojanazwa"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domena:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
-msgstr "Parametr mydomain określa lokalną nazwę domeny. Np. mydomain = mojadomena"
+msgstr ""
+"Parametr mydomain określa lokalną nazwę domeny. Np. mydomain = mojadomena"
 
 #: ../postfix_wizard/Postfix.pm:160
 msgid "Origin:"
@@ -1651,7 +1765,8 @@ msgid "Main Postfix server"
 msgstr "Główny serwer 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 ""
 "Instrukcja verify: wyłącza kilka technik wykorzystywanych do harvest adresów "
 "e-mail."
@@ -1692,7 +1807,9 @@ msgstr ""
 msgid ""
 "Masquerade should be a valid domain name such as \"domain_to_masquerade.com "
 "with_this_domain.com\"!"
-msgstr "Maskarada powinna być poprawną nazwą domeny jak np. \"domena_do_zamaskowania.pl za_pomoca_tej_domeny.pl\"!"
+msgstr ""
+"Maskarada powinna być poprawną nazwą domeny jak np. \"domena_do_zamaskowania."
+"pl za_pomoca_tej_domeny.pl\"!"
 
 #: ../postfix_wizard/Postfix.pm:192
 msgid ""
@@ -1734,7 +1851,9 @@ msgstr "Konfiguracja sieci"
 msgid ""
 "The network interface addresses that this mail system receives mail on. By "
 "default, the software claims all active interfaces on the machine. ie: all"
-msgstr "Interfejs sieciowy, z którego system pocztowy otrzymuje pocztę. Domyślnie, oprogramowanie wykorzystuje wszystkie instniejące interfejsy. Np.: all"
+msgstr ""
+"Interfejs sieciowy, z którego system pocztowy otrzymuje pocztę. Domyślnie, "
+"oprogramowanie wykorzystuje wszystkie instniejące interfejsy. Np.: all"
 
 #: ../postfix_wizard/Postfix.pm:215 ../postfix_wizard/Postfix.pm:260
 msgid "inet interfaces:"
@@ -1745,7 +1864,9 @@ msgid ""
 "The list of domains that are delivered via the $local_transport mail "
 "delivery transport. ie: $myhostname, localhost.$mydomain, /etc/postfix/"
 "destinations"
-msgstr "Lista domen dostarczanych za pośrednictwem $local_transport. Np.: $mojhost, localhost.$mojadomena, /etc/postfix/destinations"
+msgstr ""
+"Lista domen dostarczanych za pośrednictwem $local_transport. Np.: $mojhost, "
+"localhost.$mojadomena, /etc/postfix/destinations"
 
 #: ../postfix_wizard/Postfix.pm:216 ../postfix_wizard/Postfix.pm:261
 msgid "my destination:"
@@ -1763,7 +1884,9 @@ msgstr "moje sieci:"
 msgid ""
 "This is the list of trusted SMTP clients. For security reason, please "
 "provide one. ie: 127.0.0.0/32, 192.168.1.0/24"
-msgstr "Lista zaufanych klientów SMTP. Ze względów bezpieczeństwa podaj adresy. Np.: 127.0.0.0/32, 192.168.1.0/24"
+msgstr ""
+"Lista zaufanych klientów SMTP. Ze względów bezpieczeństwa podaj adresy. Np.: "
+"127.0.0.0/32, 192.168.1.0/24"
 
 #: ../postfix_wizard/Postfix.pm:229
 msgid "Message options"
@@ -1899,7 +2022,8 @@ msgid "Proxy port:"
 msgstr "Port pośrednika:"
 
 #: ../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 ""
 "Naciśnij Dalej jeśli chcesz zachować tą wartość, lub Wstecz aby poprawić "
 "ustawienia."
@@ -1917,7 +2041,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Musisz wybrać wartość większą niż 1024 i mniejsza niż 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 dysku jest rozmiarem przestrzeni dyskowej wykorzystywanej do zapisu "
 "plików."
@@ -2027,7 +2152,8 @@ msgid "Configuring the Proxy"
 msgstr "Konfiguracja pośrednika 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 ""
 "Druid zebrał poniższe parametry wymagane do skonfigurowania twojego "
 "pośrednika:"
@@ -2140,7 +2266,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid "Path to image: provide the full path to the network boot image"
-msgstr "Ścieżka do obrazu: podaj pełną ścieżkę do sieciowego obrazu rozruchowego"
+msgstr ""
+"Ścieżka do obrazu: podaj pełną ścieżkę do sieciowego obrazu rozruchowego"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid ""
@@ -2183,7 +2310,8 @@ msgstr ""
 "obraz, który będzie uruchamiany z 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 "Wybierz obraz rozruchowy PXE do usunięcia z serwera PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
@@ -2192,7 +2320,8 @@ msgstr "Usuń obraz rozruchowy"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "The PXE boot image, and the related entry in PXE menu will be deleted."
-msgstr "Obraz rozruchowy PXE oraz powiązany z nim wpis w menu PXE zostaną usunięte."
+msgstr ""
+"Obraz rozruchowy PXE oraz powiązany z nim wpis w menu PXE zostaną usunięte."
 
 #: ../pxe_wizard/Pxe.pm:155
 msgid "Boot image to remove:"
@@ -2212,7 +2341,8 @@ msgstr ""
 "rozruchowego."
 
 #: ../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 "Z poniższej listy wybierz obraz rozruchowy PXE do modyfikacji"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
@@ -2224,7 +2354,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Dodaj opcję do obrazu rozruchowego 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 ""
 "Katalog instalacyjny: pełna ścieżka do katalogu serwera instalacyjnego "
 "Mandriva Linux"
@@ -2256,7 +2387,8 @@ msgstr "Metoda instalacji:"
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "ACPI option: Advanced Configuration and Power Interface"
-msgstr "Opcja ACPI: Zaawansowany Interfejs Zarządzania Konfiguracją i Zasilaniem"
+msgstr ""
+"Opcja ACPI: Zaawansowany Interfejs Zarządzania Konfiguracją i Zasilaniem"
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid ""
@@ -2349,7 +2481,8 @@ msgid ""
 msgstr "Podaj poprawną nazwę PXE: jedno słowo ASCII lub liczba, bez spacji."
 
 #: ../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 ""
 "Aby dodać/usunąć/zmodyfikować obraz rozruchowy PXE, należy uruchomić "
 "najpierw polecenie 'Set PXE server'."
@@ -2446,14 +2579,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Druid konfiguracji serwera Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Wygląda na to, że serwer Samba był już konfigurowany. Druid odczyta starą "
-"konfigurację i wyświetli opcje wyboru rodzaju serwera"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2475,7 +2600,8 @@ msgstr ""
 "użytkowników systemu Windows za pośrednictwem domeny."
 
 #: ../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 ""
 "Pojedyńcze instalacje serwerowe mogą wykorzystywać smbpasswd lub tdbsam do "
 "obsługi haseł"
@@ -2517,7 +2643,12 @@ msgid ""
 "win an election and become the master browser, you can set the level above "
 "that of the operating system on your network with the highest current value. "
 "ie: os level = 34"
-msgstr "Opcja globalna os level określa poziom systemu operacyjnego, który serwer Samba będzie wykorzystywać podczas wyborów przeglądarki. Jeżeli chcesz, aby serwer Samba wygrał wybory i stał się główną przeglądarką, nadaj wartość tej opcji wyższą niż najwyższe numery, które  posiadają systemy w twojej sieci. Np. poziom systemu operacyjnego (os level) = 34"
+msgstr ""
+"Opcja globalna os level określa poziom systemu operacyjnego, który serwer "
+"Samba będzie wykorzystywać podczas wyborów przeglądarki. Jeżeli chcesz, aby "
+"serwer Samba wygrał wybory i stał się główną przeglądarką, nadaj wartość tej "
+"opcji wyższą niż najwyższe numery, które  posiadają systemy w twojej sieci. "
+"Np. poziom systemu operacyjnego (os level) = 34"
 
 #: ../samba_wizard/Samba.pm:151
 msgid "The domain is wrong."
@@ -2533,7 +2664,12 @@ msgid ""
 "local segment handles logon requests and authenticates users when the PDC is "
 "busy on the local network. When a segment becomes heavily loaded, the "
 "reponsibility is offloaded to another segment's BDC or to the PDC."
-msgstr "Ta opcja włącza BDC (zapasowy kontroler domeny), który przejmuje znaczną część procesów logowania sieciowego. BDC w segmencie lokalnym obsługuje żądania logowania i uwierzytelnia użytkowników, w sytuacji gdy PDC w sieci lokalnej jest zajęty. Jeżeli segment jest mocno obciążony odpowiedzialność jest współdzielona z BDC z innego segmentu lub z PDC."
+msgstr ""
+"Ta opcja włącza BDC (zapasowy kontroler domeny), który przejmuje znaczną "
+"część procesów logowania sieciowego. BDC w segmencie lokalnym obsługuje "
+"żądania logowania i uwierzytelnia użytkowników, w sytuacji gdy PDC w sieci "
+"lokalnej jest zajęty. Jeżeli segment jest mocno obciążony odpowiedzialność "
+"jest współdzielona z BDC z innego segmentu lub z PDC."
 
 #: ../samba_wizard/Samba.pm:176
 msgid ""
@@ -2729,15 +2865,20 @@ msgstr "Baner serwera jest nieprawidłowy."
 msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
-msgstr "Plik logu: użyj składni plik.%m, aby stworzyć osobny plik logu dla każdej łączącej się maszyny"
+msgstr ""
+"Plik logu: użyj składni plik.%m, aby stworzyć osobny plik logu dla każdej "
+"łączącej się maszyny"
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Pioziom logowania: ustaw poziom logowania (komunikowania) (0 <= poziom logowania <= 10)"
+msgstr ""
+"Pioziom logowania: ustaw poziom logowania (komunikowania) (0 <= poziom "
+"logowania <= 10)"
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Maksymalny rozmiar logów: ustaw ograniczenie rozmiaru plików z logami (w Kb)."
+msgstr ""
+"Maksymalny rozmiar logów: ustaw ograniczenie rozmiaru plików z logami (w Kb)."
 
 #: ../samba_wizard/Samba.pm:318
 msgid "Samba Log"
@@ -2751,7 +2892,7 @@ msgstr "Plik logu:"
 msgid "Max log size:"
 msgstr "Maksymalny romiar logów:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Poziom logowania:"
 
@@ -2796,7 +2937,8 @@ msgstr "Drukarki - konfiguracja drukarek"
 
 #: ../samba_wizard/Sambaprint.pm:65
 msgid "You can enable or disable printers in your Samba server configuration."
-msgstr "Możesz uwzględnić / nieuwzględnić drukarek w konfiguracji serwera Samba."
+msgstr ""
+"Możesz uwzględnić / nieuwzględnić drukarek w konfiguracji serwera Samba."
 
 #: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
 msgid ""
@@ -2914,7 +3056,8 @@ msgstr "Edytuj - zmień ustawienia udziału"
 
 #: ../samba_wizard/Sambashare.pm:108
 msgid "Manage, create special share, create public/user share"
-msgstr "Zarządzaj, utwórz udział specjalny, utwórz udział publiczny/użytkownika"
+msgstr ""
+"Zarządzaj, utwórz udział specjalny, utwórz udział publiczny/użytkownika"
 
 #: ../samba_wizard/Sambashare.pm:108
 msgid "What do you want to do?"
@@ -2981,8 +3124,11 @@ msgid "Directory mask:"
 msgstr "Maska katalogu:"
 
 #: ../samba_wizard/Sambashare.pm:210
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Maska tworzenia, tryb tworzenia i maska katalogu powinna mieć wartość liczbową. Np.: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Maska tworzenia, tryb tworzenia i maska katalogu powinna mieć wartość "
+"liczbową. Np.: 0755."
 
 #: ../samba_wizard/Sambashare.pm:217
 msgid "Modify a share"
@@ -3027,7 +3173,9 @@ msgstr "Opcje zaawansowane, krok 1"
 
 #: ../samba_wizard/Sambashare.pm:258
 msgid "Advanced options, use them if you know what you are doing."
-msgstr "Opcje zaawansowane. Możesz z nich korzystasz jeżeli wiesz dokładnie co robisz."
+msgstr ""
+"Opcje zaawansowane. Możesz z nich korzystasz jeżeli wiesz dokładnie co "
+"robisz."
 
 #: ../samba_wizard/Sambashare.pm:258
 msgid ""
@@ -3117,7 +3265,9 @@ msgstr "Opcje zaawansowane, krok 2"
 
 #: ../samba_wizard/Sambashare.pm:292
 msgid "Advanced options, use them only if you know what you are doing."
-msgstr "Opcje zaawansowane. Możesz z nich korzystasz jeżeli wiesz dokładnie co robisz."
+msgstr ""
+"Opcje zaawansowane. Możesz z nich korzystasz jeżeli wiesz dokładnie co "
+"robisz."
 
 #: ../samba_wizard/Sambashare.pm:306
 msgid ""
@@ -3273,7 +3423,9 @@ msgstr "Komentarz: opis katalgou domowego użytkownika"
 
 #: ../samba_wizard/Sambashare.pm:497
 msgid "Create mode: man chmod for more info"
-msgstr "Maska tworzenia: więcej informacji w podręczniku systemowym (polecenie man chmod)"
+msgstr ""
+"Maska tworzenia: więcej informacji w podręczniku systemowym (polecenie man "
+"chmod)"
 
 #: ../samba_wizard/Sambashare.pm:497
 msgid "Users home options"
@@ -3423,132 +3575,135 @@ msgstr "Udział serwera Samba"
 #: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
 #, perl-format
 msgid "Can't create %s. Please check why wizard can't create this directory."
-msgstr "Utworzenie %s jest niemożliwe. Sprawdź dlaczego druid nie mógł utworzyć katalogu."
+msgstr ""
+"Utworzenie %s jest niemożliwe. Sprawdź dlaczego druid nie mógł utworzyć "
+"katalogu."
 
 #: ../samba_wizard/Sambashare.pm:835
 msgid "Samba homes share"
 msgstr "Udziały domowe serwera Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Zaawansowany - zaawansowane opcje ssh"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Który rodzaj konfiguracji chcesz przeprowadzić?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "Serwer SSH. Opcje standardowe."
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Adres nasłuchiwania:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Numer portu:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Port powinien mieć wartość liczbową"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Metoda uwierzytelniania"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "Uwierzytelnianie RSA:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Uwierzytelnianie z kluczem publicznym:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Plik klucza uwierzytelniającego:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Uwierzytelnianie z hasłem:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Ignoruj plik rhosts:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Zezwalaj na puste hasła:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Logowanie"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
-msgstr "Poziom logowania: określa ilość logowanych komunikatów nadchodzących od sshd."
+msgstr ""
+"Poziom logowania: określa ilość logowanych komunikatów nadchodzących od sshd."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Mechanizm syslog:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Opcje logowania"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Drukarki:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Zezwalanie na logowanie roota:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3556,66 +3711,66 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Opcje logowania użytkownika"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Akceptuj użytkowników:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Odrzucaj użytkowników:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Kompresja: określa poziom kompresji."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Kompresja:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "Przekazywanie X11:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Podsumowanie konfiguracji OpenSSH."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Druid pomyślnie skonfigurował serwer SSH."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Konfiguracja serwera OpenSSH..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "Serwer OpenSSH"
 
@@ -3733,7 +3888,8 @@ msgstr "Zapisano konfigurację serwera czasu"
 
 #: ../time_wizard/Ntp.pm:153
 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."
+msgstr ""
+"Twój serwer może teraz pracować jako serwer czasu dla twojej sieci lokalnej."
 
 #: ../web_wizard/Apache.pm:39
 msgid "Web wizard"
@@ -3832,7 +3988,8 @@ msgstr "Konfiguracja serwera webowego"
 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"
+msgstr ""
+"Druid zebrał poniższe parametry wymagane do konfiguracji twojego serwera WWW"
 
 #: ../web_wizard/Apache.pm:132
 msgid "Intranet web server:"
@@ -3858,3 +4015,18 @@ msgstr "Serwer Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfiguracja systemu jako serwera Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Domena pocztowa:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instalacja trwa"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Instalowanie serwera Kolab w systemie..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Wygląda na to, że serwer Samba był już konfigurowany. Druid odczyta starą "
+#~ "konfigurację i wyświetli opcje wyboru rodzaju serwera"
diff --git a/po/pt.po b/po/pt.po
index 0fbcde72..4de3bc75 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-09-02 00:00+0200\n"
 "Last-Translator: Jose Jorge <jjorge@free.fr>\n"
 "Language-Team: português <pt@li.org>\n"
@@ -48,7 +48,7 @@ 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:97
+#: ../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
@@ -58,7 +58,7 @@ msgstr "Erro."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Parabéns"
 
@@ -92,7 +92,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)"
@@ -144,32 +145,33 @@ msgstr "Está em dhcp, o servidor pode não funcionar com a sua configuração."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Erro"
 
@@ -234,7 +236,8 @@ msgstr ""
 "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?"
+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
@@ -255,7 +258,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"
@@ -357,7 +361,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Falhou"
 
@@ -506,7 +510,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"
@@ -529,7 +534,8 @@ msgstr ""
 "Parece que esse endereço já está na sua configuração DNS... prima seguinte "
 "para continuar"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Erro:"
 
@@ -550,7 +556,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."
@@ -580,8 +587,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:"
@@ -652,7 +661,7 @@ msgstr "Servidor ldap"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Configuração do daemon OpenSSH"
 
@@ -697,7 +706,7 @@ msgstr ""
 "%s não está instalado\n"
 "Clique em  \"Seguinte\"para instalar ou em \"Cancelar\" para sair"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalação falhada"
 
@@ -711,7 +720,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:"
@@ -761,8 +771,8 @@ msgstr "Nome do servidor:"
 msgid "Admin email:"
 msgstr "Email admin:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Permitir login de root:"
 
@@ -790,7 +800,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"
@@ -870,12 +881,13 @@ 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
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Por favor relance o drakwizard, e tente modificar alguns parâmetros."
 
@@ -884,7 +896,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."
@@ -931,7 +944,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"
@@ -961,11 +975,21 @@ msgstr ""
 "instalar o Linux através de uma rede. Use o drakpxelinux para configurar o "
 "seu servidor PXE, e o drakwizard DHCP para configurar um servidor DHCPD."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Assistente de Configuração do Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+msgid "Master kolab server"
+msgstr "Servidor DNS master"
+
+#: ../kolab_wizard/Kolab.pm:61
+#, fuzzy
+msgid "Slave kolab server"
+msgstr "Servidor DNS slave"
+
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
 "features include: a web administration interface, a shared address book with "
@@ -977,7 +1001,7 @@ msgstr ""
 "de endereços partilhado com provisão para utilizadores mailbox como também "
 "contactos e um POP3 e ainda acesso IMAP4 (rev1) ao mail"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -987,39 +1011,140 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. O assistente fará um backup de todos os "
 "ficheiros de configuração anteriores para estes serviços."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Bemvindo ao Assistente de configuração do servidor Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Servidor DNS master"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Já configurou o seu Servidor Ldap"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Servidor DNS slave"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domínio:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domínio:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Introduza a senha para a conta do gestor do servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "As senhas diferem, ou a senha é nula, por favor corrija."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Senha de novo:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Primeiro Nome:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Senha de novo:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../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:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nome de Endereço:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Domínio Mail:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1027,19 +1152,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Instalação em progresso"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "A instalar o servidor Kolab no seu sistema..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "A configurar o servidor Kolab no seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -1146,7 +1263,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
@@ -1351,7 +1469,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."
@@ -1375,7 +1494,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 ""
@@ -1569,7 +1689,7 @@ msgid "Relay mail server"
 msgstr "Servidor mail de retransmissão"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Novato - opções clássicas"
 
@@ -1589,9 +1709,8 @@ msgstr ""
 "Este assistente irá ajudá-lo a configurar um servidor mail Postfix ou um "
 "retransmissor de correio Postfix."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informação"
 
@@ -1635,10 +1754,6 @@ msgstr ""
 "mail. p.ex. minhamaquina = minhamaquina"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domínio:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -1676,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 tecnicas usadas nos endereços email "
 "harvest."
@@ -1718,7 +1834,8 @@ 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.: \"meudominio.pt\"!"
+msgstr ""
+"A máscara deve ser um nome de domínio válido como p.ex.: \"meudominio.pt\"!"
 
 #: ../postfix_wizard/Postfix.pm:192
 msgid ""
@@ -1805,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 ""
@@ -1931,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:"
@@ -1947,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."
@@ -2055,7 +2176,8 @@ 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:"
@@ -2216,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."
@@ -2227,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:"
@@ -2247,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"
@@ -2261,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"
@@ -2363,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 ""
@@ -2389,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'."
@@ -2490,15 +2618,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Assistente de configuração do servidor Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Parece que configurou um servidor Samba anteriormente. Este assistente irá "
-"re-adicionar a sua antiga configuração. e mostra-lhe o tipo do servidor "
-"Samba que escolheu"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2520,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:"
@@ -2784,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:"
@@ -2826,7 +2948,7 @@ msgstr "Ficheiro de registo:"
 msgid "Max log size:"
 msgstr "Tamanho max do resgisto:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Nível de registo:"
 
@@ -2873,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 ""
@@ -2893,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"
@@ -3015,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?"
@@ -3066,7 +3191,8 @@ msgstr "Directório:"
 
 #: ../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 ""
 "Criar máscara, o forçamento do modo directório e do modo criar deve ser "
 "numérico. ie: 0755."
@@ -3341,7 +3467,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
@@ -3570,71 +3697,71 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Partilha Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Perito - opções ssh avançadas"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Que tipo de configuração deseja fazer:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "Servidor SSH, opções clássicas"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Endereço de escuta:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Especifica os endereços locais onde o sshd deve escutar."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Número da porta:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "Especifica o número da porta onde o sshd escuta. O predefinido é 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "A porta deve ser um número"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Método de autenticação:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "Autenticação RSA:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Autenticação de chave pública:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Ficheiro da chave de autenticação:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Autenticação de senha:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Ignorar ficheiro rhosts:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Permitir senha vazia:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Registo"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
@@ -3642,7 +3769,7 @@ msgstr ""
 "Nível de registo. dá nível de verbosidade que é usado quando a registar "
 "mensagens do ssgd."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
@@ -3650,15 +3777,15 @@ msgstr ""
 "Facilidade Syslog: dá o código de facilidade que é usado quando a registar "
 "mensagens do sshd"
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Facilidade Syslog:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Opções de login"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3666,11 +3793,11 @@ msgstr ""
 "Imprimir último registo: se o sshd deve imprimir a data e o tempo de quando "
 "o utilizador fez login pela última vez"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Tempo de graça do login:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3680,23 +3807,23 @@ msgstr ""
 "login com sucesso. Se o valor for 0, não há limite. O valor predefinido é "
 "120 segundos."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Manter vivo:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Mote de impressão:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Imprimir último registo:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "O tempo de graça do login deve ser um número"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3709,19 +3836,19 @@ msgstr ""
 "acidentalmente deixam a sua pasta pessoal ou ficheiros com permissões de "
 "escrita para todos"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Opções de Login do Utilizador"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Modos restrictos:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Permitir utilizadores:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3729,11 +3856,11 @@ msgstr ""
 "Se especificado, o login é permitido apenas para nomes de utilizadores que "
 "correspondam a um dos padrões, ie: erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Negar utilizadores:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3741,11 +3868,11 @@ msgstr ""
 "O login não é permitido para nomes de utilizadores que correspondam a um dos "
 "padrões. ie: pirata guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Compressão: Especifica se a compressão é permitida."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3755,27 +3882,27 @@ msgstr ""
 "reenvio X11 não previne os utilizadores de reenviar tráfico X11, como "
 "utilizadores podem sempre instalar os seus reenviadores."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Compressão:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "Reenvio X11:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Sumário da configuração OpenSSH"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "O assistente configurou com sucesso o seu servidor SSH."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "A configurar o seu servidor OpenSSH..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "Servidor OpenSSH"
 
@@ -3801,7 +3928,8 @@ msgstr ""
 
 #: ../time_wizard/Ntp.pm:70
 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
 msgid "press next to begin, or cancel to leave this wizard"
@@ -3908,7 +4036,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"
@@ -4021,6 +4150,23 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "A configurar o seu sistema como um servidor Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Domínio Mail:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instalação em progresso"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "A instalar o servidor Kolab no seu sistema..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Parece que configurou um servidor Samba anteriormente. Este assistente "
+#~ "irá re-adicionar a sua antiga configuração. e mostra-lhe o tipo do "
+#~ "servidor Samba que escolheu"
+
 #~ msgid "Show dot files:"
 #~ msgstr "Mostrar ficheiros com ponto:"
 
@@ -4033,4 +4179,3 @@ msgstr "A configurar o seu sistema como um servidor Apache ..."
 
 #~ msgid "OpenSSH SSH daemon configuration"
 #~ msgstr "Configuração do daemon OpenSSH SSH"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index abba293b..dfbf7c58 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-22 23:00+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-08-26 09:32-0300\n"
 "Last-Translator: Arthur R. Mello <renato@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -43,17 +43,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:97
+#: ../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:601
-#: ../samba_wizard/Sambashare.pm:609 ../samba_wizard/Sambashare.pm:614
-#: ../samba_wizard/Sambashare.pm:619 ../samba_wizard/Sambashare.pm:624
-#: ../samba_wizard/Sambashare.pm:629 ../samba_wizard/Sambashare.pm:634
-#: ../sshd_wizard/Sshd.pm:186 ../web_wizard/Apache.pm:141
+#: ../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:141
 msgid "Congratulations"
 msgstr "Parabéns"
 
@@ -75,7 +75,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 ""
@@ -87,7 +88,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)"
@@ -101,7 +103,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 ""
@@ -137,31 +140,32 @@ msgstr "Você está em DHCP; o servidor pode não funcionar com sua configuraç�
 #: ../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:111 ../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:204
-#: ../samba_wizard/Sambashare.pm:254 ../samba_wizard/Sambashare.pm:286
-#: ../samba_wizard/Sambashare.pm:304 ../samba_wizard/Sambashare.pm:309
-#: ../samba_wizard/Sambashare.pm:312 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:369 ../samba_wizard/Sambashare.pm:374
-#: ../samba_wizard/Sambashare.pm:377 ../samba_wizard/Sambashare.pm:380
-#: ../samba_wizard/Sambashare.pm:386 ../samba_wizard/Sambashare.pm:413
-#: ../samba_wizard/Sambashare.pm:418 ../samba_wizard/Sambashare.pm:421
-#: ../samba_wizard/Sambashare.pm:424 ../samba_wizard/Sambashare.pm:451
-#: ../samba_wizard/Sambashare.pm:457 ../samba_wizard/Sambashare.pm:487
-#: ../samba_wizard/Sambashare.pm:727 ../samba_wizard/Sambashare.pm:874
-#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:144
+#: ../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:120
 msgid "Error"
 msgstr "Erro."
@@ -227,7 +231,8 @@ msgstr ""
 "para ajustar isso."
 
 #: ../common/Wizcommon_gtk2.pm:95
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+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?"
@@ -250,7 +255,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"
@@ -354,8 +360,8 @@ msgstr "O assistente configurou com sucesso os serviços DHCP."
 #: ../nfs_wizard/NFS.pm:107 ../nisautofs_wizard/Nisautofs.pm:120
 #: ../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:639
-#: ../sshd_wizard/Sshd.pm:192 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Sambaprint.pm:153 ../samba_wizard/Sambashare.pm:684
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Falha"
 
@@ -504,7 +510,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"
@@ -517,7 +524,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 ""
@@ -527,7 +535,8 @@ msgstr ""
 "Parece que este servidor já está na sua configuração de DNS... pressione "
 "próximo para continuar"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Erro:"
 
@@ -548,7 +557,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."
@@ -578,7 +588,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
@@ -650,7 +661,7 @@ msgstr "Servidor ldap"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Configurando serviço OpenSSH"
 
@@ -695,7 +706,7 @@ msgstr ""
 "%s não está instalado\n"
 "Clique em \"Próximo\" para instalar ou em \"Cancelar\" para sair"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Falha na instalação"
 
@@ -709,7 +720,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:"
@@ -749,7 +761,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:"
@@ -759,8 +772,8 @@ msgstr "Nome do servidor:"
 msgid "Admin email:"
 msgstr "E-mail do administrador:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:82
-#: ../sshd_wizard/Sshd.pm:178
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Permitir login do root:"
 
@@ -788,7 +801,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"
@@ -874,8 +888,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
-#: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:640
-#: ../sshd_wizard/Sshd.pm:193
+#: ../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 "Favor reinicie o drakwizard, e tente mudar alguns parâmetros."
 
@@ -884,7 +898,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."
@@ -962,11 +977,21 @@ msgstr ""
 "configurar seu servidor PXE, e drakwizard DHCP ara configurar um servidor "
 "DHCP."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Assistente de Configuração do Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -978,7 +1003,7 @@ msgstr ""
 "compartilhado com provisão para usuários da caixa postal assim como os "
 "contatos em POP3 e IMAP4 (rev1) e acesso ao correio"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -988,39 +1013,139 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. O assistente fará um backup em todos os "
 "arquivos de configuração destes serviços."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Bem Vindo ao assistente de configuração do Kolab Groupware"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Servidor DNS mestre"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Você já configurou o seu servidor LDAP"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Servidor DNS escravo"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domínio:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domínio:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Entre com a senha para a conta que gerenciará o servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Senha errada ou nula, digite a senha correta."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Senha novamente:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Primeiro Nome:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Senha novamente:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "O assistente configurarará o usuário Kolab com estes parâmetros"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Servidor:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Domínio:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1028,19 +1153,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Instalação em andamento"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Instalando o Kolab em seu sistema..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor Kolab no seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -1175,7 +1292,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
@@ -1353,7 +1471,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."
@@ -1377,7 +1496,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 ""
@@ -1570,7 +1690,7 @@ msgid "Relay mail server"
 msgstr "Servidor de e-mail remoto"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Novato - opções clássicas"
 
@@ -1586,11 +1706,11 @@ 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/Samba.pm:98
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:191
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informações"
 
@@ -1634,10 +1754,6 @@ msgstr ""
 "internet. ex: myhostname= nome.do.meu.servidor"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domínio:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -1668,7 +1784,8 @@ msgstr ""
 "mail."
 
 #: ../postfix_wizard/Postfix.pm:168
-msgid "You must specifies the local internet domain name."
+#, fuzzy
+msgid "You must specify the local internet domain name."
 msgstr "Você deve especificar o nome do domínio local na internet."
 
 #: ../postfix_wizard/Postfix.pm:172
@@ -1676,7 +1793,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."
@@ -1714,8 +1832,12 @@ msgstr ""
 "o correio é enviado do próprio, em vez das máquinas individuais."
 
 #: ../postfix_wizard/Postfix.pm:185
-msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
-msgstr "Mascarado deve ser um nome de domínio válido tal como \"mydomain.com\"!"
+#, fuzzy
+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 \"mydomain.com\"!"
 
 #: ../postfix_wizard/Postfix.pm:192
 msgid ""
@@ -1802,7 +1924,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 ""
@@ -1928,7 +2051,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. "
@@ -1946,7 +2070,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."
@@ -1993,7 +2118,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 ""
@@ -2052,7 +2178,8 @@ 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:"
@@ -2165,7 +2292,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 ""
@@ -2208,8 +2336,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"
@@ -2217,7 +2347,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:"
@@ -2237,7 +2368,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
@@ -2249,7 +2381,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"
@@ -2374,10 +2507,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'."
@@ -2414,7 +2549,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"
@@ -2476,15 +2612,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Assistente de configuração do Servidor Samba"
 
-#: ../samba_wizard/Samba.pm:98
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Parece que você já configurou previamente um servidor Samba. O assistente "
-"irá reler suas antigas configurações, e mostrar o tipo de servidor Samba que "
-"você escolheu."
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2506,7 +2633,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"
@@ -2746,12 +2874,14 @@ msgid "Please enter an LDAP password."
 msgstr "Favor fornecer uma senha ao LDAP."
 
 #: ../samba_wizard/Samba.pm:278
-msgid "Pasword dont match."
+#, fuzzy
+msgid "Passwords do not match."
 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"
@@ -2773,7 +2903,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:"
@@ -2793,7 +2924,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)."
@@ -2813,7 +2945,7 @@ msgstr "Arquivo de Log:"
 msgid "Max log size:"
 msgstr "Tamanho máximo do log:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:125
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Nível do Log:"
 
@@ -2847,10 +2979,11 @@ msgid "The wizard successfully configured your Samba server."
 msgstr "O assistente configurou com sucesso seu servidor Samba."
 
 #: ../samba_wizard/Samba.pm:452 ../samba_wizard/Sambaprint.pm:282
-#: ../samba_wizard/Sambashare.pm:698 ../samba_wizard/Sambashare.pm:730
-#: ../samba_wizard/Sambashare.pm:773 ../samba_wizard/Sambashare.pm:791
-#: ../samba_wizard/Sambashare.pm:807 ../samba_wizard/Sambashare.pm:823
-#: ../samba_wizard/Sambashare.pm:844 ../samba_wizard/Sambashare.pm:877
+#: ../samba_wizard/Sambashare.pm:743 ../samba_wizard/Sambashare.pm:775
+#: ../samba_wizard/Sambashare.pm:818 ../samba_wizard/Sambashare.pm:835
+#: ../samba_wizard/Sambashare.pm:852 ../samba_wizard/Sambashare.pm:868
+#: ../samba_wizard/Sambashare.pm:884 ../samba_wizard/Sambashare.pm:908
+#: ../samba_wizard/Sambashare.pm:941
 msgid "Configuring your Samba server..."
 msgstr "Configurando seu servidor Samba..."
 
@@ -2865,8 +2998,9 @@ msgstr ""
 "servidor Samba."
 
 #: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
+#, fuzzy
 msgid ""
-"It seems that you don't setup a Samba server. Please setup a Samba server "
+"It seems that you haven't setup a Samba server. Please setup a Samba server "
 "with Samba wizard before manage your share."
 msgstr ""
 "Parece que você não configurou um servidor Samba. Por favor, configure um "
@@ -2899,21 +3033,23 @@ msgstr ""
 "se você souber o que está fazendo."
 
 #: ../samba_wizard/Sambaprint.pm:119 ../samba_wizard/Sambaprint.pm:132
-#: ../samba_wizard/Sambashare.pm:219 ../samba_wizard/Sambashare.pm:296
-#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:361
-#: ../samba_wizard/Sambashare.pm:406 ../samba_wizard/Sambashare.pm:479
-#: ../samba_wizard/Sambashare.pm:513 ../samba_wizard/Sambashare.pm:524
-#: ../samba_wizard/Sambashare.pm:536 ../samba_wizard/Sambashare.pm:550
-#: ../samba_wizard/Sambashare.pm:580 ../samba_wizard/Sambashare.pm:593
+#: ../samba_wizard/Sambashare.pm:200 ../samba_wizard/Sambashare.pm:248
+#: ../samba_wizard/Sambashare.pm:325 ../samba_wizard/Sambashare.pm:370
+#: ../samba_wizard/Sambashare.pm:390 ../samba_wizard/Sambashare.pm:435
+#: ../samba_wizard/Sambashare.pm:513 ../samba_wizard/Sambashare.pm:547
+#: ../samba_wizard/Sambashare.pm:558 ../samba_wizard/Sambashare.pm:570
+#: ../samba_wizard/Sambashare.pm:584 ../samba_wizard/Sambashare.pm:612
+#: ../samba_wizard/Sambashare.pm:626 ../samba_wizard/Sambashare.pm:637
 msgid "Comment:"
 msgstr "Comentário:"
 
 #: ../samba_wizard/Sambaprint.pm:121 ../samba_wizard/Sambaprint.pm:134
-#: ../samba_wizard/Sambashare.pm:221 ../samba_wizard/Sambashare.pm:298
-#: ../samba_wizard/Sambashare.pm:343 ../samba_wizard/Sambashare.pm:480
-#: ../samba_wizard/Sambashare.pm:502 ../samba_wizard/Sambashare.pm:514
-#: ../samba_wizard/Sambashare.pm:525 ../samba_wizard/Sambashare.pm:538
-#: ../samba_wizard/Sambashare.pm:551
+#: ../samba_wizard/Sambashare.pm:202 ../samba_wizard/Sambashare.pm:250
+#: ../samba_wizard/Sambashare.pm:327 ../samba_wizard/Sambashare.pm:372
+#: ../samba_wizard/Sambashare.pm:514 ../samba_wizard/Sambashare.pm:536
+#: ../samba_wizard/Sambashare.pm:548 ../samba_wizard/Sambashare.pm:559
+#: ../samba_wizard/Sambashare.pm:572 ../samba_wizard/Sambashare.pm:585
+#: ../samba_wizard/Sambashare.pm:614
 msgid "Browseable:"
 msgstr "Pesquisáveis: "
 
@@ -2925,7 +3061,8 @@ msgstr "Permite convidados:"
 msgid "Configuring Samba printers"
 msgstr "Configurando impressoras Samba"
 
-#: ../samba_wizard/Sambaprint.pm:133 ../samba_wizard/Sambashare.pm:516
+#: ../samba_wizard/Sambaprint.pm:133 ../samba_wizard/Sambashare.pm:203
+#: ../samba_wizard/Sambashare.pm:550 ../samba_wizard/Sambashare.pm:615
 msgid "Create mode:"
 msgstr "Criar modo:"
 
@@ -2983,14 +3120,18 @@ msgstr "Modificar - modifica um compartilhamento"
 
 #: ../samba_wizard/Sambashare.pm:108
 msgid "Manage, create special share, create public/user share"
-msgstr "Gerencia, cria compartilhamento especial, cria compartilhamento público/usuário"
+msgstr ""
+"Gerencia, cria compartilhamento especial, cria compartilhamento público/"
+"usuário"
 
 #: ../samba_wizard/Sambashare.pm:108
-msgid "What do you want todo?"
+#, fuzzy
+msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
 #: ../samba_wizard/Sambashare.pm:132
-msgid "What do you want todo with your share?"
+#, fuzzy
+msgid "What do you want to do with your share?"
 msgstr "O que você quer fazercom o seu compartilhamento?"
 
 #: ../samba_wizard/Sambashare.pm:132
@@ -3003,7 +3144,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?"
@@ -3021,69 +3163,94 @@ msgstr "Modificar qual compartilhamento?"
 msgid "Please choose the share you want to modify."
 msgstr "Favor escolher qual compartilhamento você quer modificar."
 
-#: ../samba_wizard/Sambashare.pm:188
+#: ../samba_wizard/Sambashare.pm:190
+#, fuzzy
+msgid "Modify Homes share"
+msgstr "Modificar um compartilhamento"
+
+#: ../samba_wizard/Sambashare.pm:200 ../samba_wizard/Sambashare.pm:248
+msgid ""
+"This is a text field that is seen next to a share when a client does a "
+"queries the server"
+msgstr ""
+"Este é um campo de texto que é visto próximo a um compartilhamento quando um "
+"cliente faz uma requisição ao servidor"
+
+#: ../samba_wizard/Sambashare.pm:201 ../samba_wizard/Sambashare.pm:251
+#: ../samba_wizard/Sambashare.pm:437 ../samba_wizard/Sambashare.pm:473
+#: ../samba_wizard/Sambashare.pm:515 ../samba_wizard/Sambashare.pm:538
+#: ../samba_wizard/Sambashare.pm:549 ../samba_wizard/Sambashare.pm:560
+#: ../samba_wizard/Sambashare.pm:587 ../samba_wizard/Sambashare.pm:613
+#: ../samba_wizard/Sambashare.pm:640
+msgid "Writable:"
+msgstr "Permissão de escrita:"
+
+#: ../samba_wizard/Sambashare.pm:204 ../samba_wizard/Sambashare.pm:586
+#: ../samba_wizard/Sambashare.pm:616
+msgid "Create mask:"
+msgstr "Criar máscara:"
+
+#: ../samba_wizard/Sambashare.pm:205 ../samba_wizard/Sambashare.pm:617
+#, fuzzy
+msgid "Directory mask:"
+msgstr "Diretório:"
+
+#: ../samba_wizard/Sambashare.pm:210
+#, fuzzy
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Criar máscara, 'force directory mode' e 'force create mode' devem ser "
+"numéricos. ex.: 0755"
+
+#: ../samba_wizard/Sambashare.pm:217
 msgid "Modify a share"
 msgstr "Modificar um compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:191
+#: ../samba_wizard/Sambashare.pm:220
 msgid "There is no share to modify, please add one."
 msgstr "Não existe compartilhamento para modificar, por favor adicione um."
 
-#: ../samba_wizard/Sambashare.pm:204
+#: ../samba_wizard/Sambashare.pm:233
 msgid "Please enter a share comment."
 msgstr "Por favor entre um comentário ao compartilhamento."
 
-#: ../samba_wizard/Sambashare.pm:218 ../samba_wizard/Sambashare.pm:295
-#: ../samba_wizard/Sambashare.pm:360 ../samba_wizard/Sambashare.pm:405
-#: ../samba_wizard/Sambashare.pm:523 ../samba_wizard/Sambashare.pm:549
-#: ../samba_wizard/Sambashare.pm:579 ../samba_wizard/Sambashare.pm:592
+#: ../samba_wizard/Sambashare.pm:247 ../samba_wizard/Sambashare.pm:324
+#: ../samba_wizard/Sambashare.pm:389 ../samba_wizard/Sambashare.pm:434
+#: ../samba_wizard/Sambashare.pm:557 ../samba_wizard/Sambashare.pm:583
+#: ../samba_wizard/Sambashare.pm:625 ../samba_wizard/Sambashare.pm:636
 msgid "Name of the share:"
 msgstr "Nome do compartilhamento:"
 
-#: ../samba_wizard/Sambashare.pm:219
-msgid ""
-"This is a text field that is seen next to a share when a client does a "
-"queries the server"
-msgstr ""
-"Este é um campo de texto que é visto próximo a um compartilhamento quando um "
-"cliente faz uma requisição ao servidor"
-
-#: ../samba_wizard/Sambashare.pm:220 ../samba_wizard/Sambashare.pm:297
-#: ../samba_wizard/Sambashare.pm:362 ../samba_wizard/Sambashare.pm:407
-#: ../samba_wizard/Sambashare.pm:501 ../samba_wizard/Sambashare.pm:581
-#: ../samba_wizard/Sambashare.pm:594
+#: ../samba_wizard/Sambashare.pm:249 ../samba_wizard/Sambashare.pm:326
+#: ../samba_wizard/Sambashare.pm:391 ../samba_wizard/Sambashare.pm:436
+#: ../samba_wizard/Sambashare.pm:535 ../samba_wizard/Sambashare.pm:627
+#: ../samba_wizard/Sambashare.pm:638
 msgid "Path:"
 msgstr "Caminho:"
 
-#: ../samba_wizard/Sambashare.pm:221 ../samba_wizard/Sambashare.pm:298
+#: ../samba_wizard/Sambashare.pm:250 ../samba_wizard/Sambashare.pm:327
 msgid "Allows share to be displayed in list of share."
 msgstr ""
 "Permite compartilhamentos de serem mostrados em uma lista de "
 "compartilhamento."
 
-#: ../samba_wizard/Sambashare.pm:222 ../samba_wizard/Sambashare.pm:439
-#: ../samba_wizard/Sambashare.pm:481 ../samba_wizard/Sambashare.pm:504
-#: ../samba_wizard/Sambashare.pm:515 ../samba_wizard/Sambashare.pm:526
-#: ../samba_wizard/Sambashare.pm:553
-msgid "Writable:"
-msgstr "Permissão de escrita:"
-
-#: ../samba_wizard/Sambashare.pm:223 ../samba_wizard/Sambashare.pm:299
-#: ../samba_wizard/Sambashare.pm:346 ../samba_wizard/Sambashare.pm:408
-#: ../samba_wizard/Sambashare.pm:527 ../samba_wizard/Sambashare.pm:541
-#: ../samba_wizard/Sambashare.pm:554 ../samba_wizard/Sambashare.pm:595
+#: ../samba_wizard/Sambashare.pm:252 ../samba_wizard/Sambashare.pm:328
+#: ../samba_wizard/Sambashare.pm:375 ../samba_wizard/Sambashare.pm:438
+#: ../samba_wizard/Sambashare.pm:561 ../samba_wizard/Sambashare.pm:575
+#: ../samba_wizard/Sambashare.pm:588 ../samba_wizard/Sambashare.pm:639
 msgid "Public:"
 msgstr "Público:"
 
-#: ../samba_wizard/Sambashare.pm:229
+#: ../samba_wizard/Sambashare.pm:258
 msgid "Advanced options, step 1"
 msgstr "Opções avançadas, passo 1"
 
-#: ../samba_wizard/Sambashare.pm:229
+#: ../samba_wizard/Sambashare.pm:258
 msgid "Advanced options, use them if you know what you are doing."
 msgstr "opções avançadas, utiliza-las somente se souber o que está fazendo."
 
-#: ../samba_wizard/Sambashare.pm:229
+#: ../samba_wizard/Sambashare.pm:258
 msgid ""
 "If you choose Write list wizard will create the samba user without password. "
 "Use: smbpasswd [username] to redefine samba user password."
@@ -3091,36 +3258,37 @@ msgstr ""
 "Se você escolher lista de escrita o assistente irá criar o usuário Samba sem "
 "senha. Use: smbpasswd [username] para redefinir a senha do usuário Samba."
 
-#: ../samba_wizard/Sambashare.pm:241 ../samba_wizard/Sambashare.pm:364
-#: ../samba_wizard/Sambashare.pm:441 ../samba_wizard/Sambashare.pm:555
+#: ../samba_wizard/Sambashare.pm:270 ../samba_wizard/Sambashare.pm:393
+#: ../samba_wizard/Sambashare.pm:475 ../samba_wizard/Sambashare.pm:589
 msgid "Read list:"
 msgstr "Lista de leitura:"
 
-#: ../samba_wizard/Sambashare.pm:241
+#: ../samba_wizard/Sambashare.pm:270
+#, fuzzy
 msgid ""
-"Specifies a list of user that have read-only access to a writable share. ie: "
-"anne"
+"Specifies a list of users that have read-only access to a writable share. "
+"ie: anne"
 msgstr ""
 "Especifique uma lista de usuários que tenham acesso somente a leitura de um "
 "arquivo compartilhado. ex.: anne"
 
-#: ../samba_wizard/Sambashare.pm:242
+#: ../samba_wizard/Sambashare.pm:271
 msgid "Specifies a user that have read-write access to a share. ie: fred"
 msgstr ""
 "Especifique um usuário que tenha acesso de escrita em um compartilhamento. "
 "ex.: fred"
 
-#: ../samba_wizard/Sambashare.pm:242 ../samba_wizard/Sambashare.pm:363
-#: ../samba_wizard/Sambashare.pm:442 ../samba_wizard/Sambashare.pm:556
-#: ../samba_wizard/Sambashare.pm:582
+#: ../samba_wizard/Sambashare.pm:271 ../samba_wizard/Sambashare.pm:392
+#: ../samba_wizard/Sambashare.pm:476 ../samba_wizard/Sambashare.pm:590
+#: ../samba_wizard/Sambashare.pm:628
 msgid "Write list:"
 msgstr "Lista de escrita:"
 
-#: ../samba_wizard/Sambashare.pm:243 ../samba_wizard/Sambashare.pm:443
+#: ../samba_wizard/Sambashare.pm:272 ../samba_wizard/Sambashare.pm:477
 msgid "User own directory:"
 msgstr "Diretório do usuário:"
 
-#: ../samba_wizard/Sambashare.pm:244
+#: ../samba_wizard/Sambashare.pm:273
 msgid ""
 "To restrict the share to a particular user. If this is empty (the default) "
 "then any user  can  login. ie: guibo"
@@ -3128,11 +3296,12 @@ msgstr ""
 "Para restringir o compartilhamento a um determinado usuário. Se estiver "
 "vazio (o padrão) então qualquer usuário poderá logar. ex.: guibo"
 
-#: ../samba_wizard/Sambashare.pm:244
-msgid "valid user"
+#: ../samba_wizard/Sambashare.pm:273
+#, fuzzy
+msgid "valid users"
 msgstr "usuário válido"
 
-#: ../samba_wizard/Sambashare.pm:245
+#: ../samba_wizard/Sambashare.pm:274
 msgid ""
 "This is a list of users who will be granted administrative privileges on the "
 "share. This means that they will do all file operations as the super-user "
@@ -3146,15 +3315,15 @@ msgstr ""
 "qualquer usuário presente nesta lista estará habilitado a fazer o que quiser "
 "no compartilhamento, independente das permissões dos arquivos."
 
-#: ../samba_wizard/Sambashare.pm:245
+#: ../samba_wizard/Sambashare.pm:274
 msgid "admin users"
 msgstr "Usuários administradores"
 
-#: ../samba_wizard/Sambashare.pm:246 ../samba_wizard/Sambashare.pm:445
+#: ../samba_wizard/Sambashare.pm:275 ../samba_wizard/Sambashare.pm:479
 msgid "Hide files:"
 msgstr "Arquivos ocultos:"
 
-#: ../samba_wizard/Sambashare.pm:246 ../samba_wizard/Sambashare.pm:445
+#: ../samba_wizard/Sambashare.pm:275 ../samba_wizard/Sambashare.pm:479
 msgid ""
 "The hide files option provides one or more directory or filename patterns to "
 "Samba. Any file matching this pattern will be treated as a hidden file from "
@@ -3165,12 +3334,13 @@ msgstr ""
 "expressão será tratado como um arquivo oculto pela perspectiva do cliente. "
 "ex.: /.icewm "
 
-#: ../samba_wizard/Sambashare.pm:247 ../samba_wizard/Sambashare.pm:444
-#: ../samba_wizard/Sambashare.pm:557
-msgid "Show dot files:"
-msgstr "Mostrar arquivos com ponto:"
+#: ../samba_wizard/Sambashare.pm:276 ../samba_wizard/Sambashare.pm:478
+#: ../samba_wizard/Sambashare.pm:591
+#, fuzzy
+msgid "Hide dot files:"
+msgstr "Arquivos ocultos:"
 
-#: ../samba_wizard/Sambashare.pm:247 ../samba_wizard/Sambashare.pm:444
+#: ../samba_wizard/Sambashare.pm:276 ../samba_wizard/Sambashare.pm:478
 msgid ""
 "The hide dot files option hides any files on the server that begin with a "
 "dot (.)"
@@ -3178,21 +3348,21 @@ msgstr ""
 "A opção ocultar arquivos com pontooculta qualquer arquivo no servidor que "
 "comece com um ponto (.)"
 
-#: ../samba_wizard/Sambashare.pm:254 ../samba_wizard/Sambashare.pm:386
-#: ../samba_wizard/Sambashare.pm:451
+#: ../samba_wizard/Sambashare.pm:283 ../samba_wizard/Sambashare.pm:415
+#: ../samba_wizard/Sambashare.pm:485
 #, perl-format
 msgid "Please provide a system user, %s not present."
 msgstr "Favor fornecer um usuário do sistema, %s não foi encontrado"
 
-#: ../samba_wizard/Sambashare.pm:263
+#: ../samba_wizard/Sambashare.pm:292
 msgid "Advanced options, step 2"
 msgstr "Opções avançadas, passo 2"
 
-#: ../samba_wizard/Sambashare.pm:263
+#: ../samba_wizard/Sambashare.pm:292
 msgid "Advanced options, use them only if you know what you are doing."
 msgstr "Opções avançadas, use elas apenas se você souber o que está fazendo."
 
-#: ../samba_wizard/Sambashare.pm:277
+#: ../samba_wizard/Sambashare.pm:306
 msgid ""
 "This parameter specifies a set of UNIX mode bit permissions that will always "
 "be set on a file created by Samba. This is done by bitwise 'OR'ing these "
@@ -3207,18 +3377,18 @@ msgstr ""
 "alteradas. O valor padrão para este parametro é (em octal) 000. ex.: force "
 "create mode = 0700"
 
-#: ../samba_wizard/Sambashare.pm:277
+#: ../samba_wizard/Sambashare.pm:306
 msgid "force create mode"
 msgstr "force create mode"
 
-#: ../samba_wizard/Sambashare.pm:278
+#: ../samba_wizard/Sambashare.pm:307
+#, fuzzy
 msgid ""
 "This parameter specifies a set of UNIX mode bit permissions that will always "
 "be set on a directory created by Samba. This is done by bitwise 'OR'ing "
 "these bits onto the mode bits of a directory that is being created. The "
 "default for this parameter is (in octal) 0000 which will not add any extra "
-"permission bits to a created directory. Default: ie: force directory mode = "
-"0755"
+"permission bits to a created directory. ie: force directory mode = 0755"
 msgstr ""
 "Este parametro especifica uma configuração para as permissões do UNIX que "
 "serão sempre utilizadas quando um diretório for criado pelo Samba. Isto é "
@@ -3227,11 +3397,11 @@ msgstr ""
 "parametro é (em octal) 000, o que não vai adicionar nenhum permissão extra "
 "ao diretório criado. ex.: force directory mode = 0755"
 
-#: ../samba_wizard/Sambashare.pm:278
+#: ../samba_wizard/Sambashare.pm:307
 msgid "force directory mode"
 msgstr "force directory mode"
 
-#: ../samba_wizard/Sambashare.pm:279
+#: ../samba_wizard/Sambashare.pm:308
 msgid ""
 "This specifies a UNIX group name that will be assigned as the default "
 "primary group for all users connecting to this service. This is useful for "
@@ -3244,19 +3414,19 @@ msgstr ""
 "arquivos em serviço terá o nome do grupo para checar as permissões. ex.: "
 "force group = umgrupo"
 
-#: ../samba_wizard/Sambashare.pm:279
+#: ../samba_wizard/Sambashare.pm:308
 msgid "force group"
 msgstr "force group"
 
-#: ../samba_wizard/Sambashare.pm:280
+#: ../samba_wizard/Sambashare.pm:309
 msgid "default case"
 msgstr "caso padrão"
 
-#: ../samba_wizard/Sambashare.pm:280
+#: ../samba_wizard/Sambashare.pm:309
 msgid "lower or upper"
 msgstr "maiúsculas ou minúsculas "
 
-#: ../samba_wizard/Sambashare.pm:281
+#: ../samba_wizard/Sambashare.pm:310
 msgid ""
 "This controls if new filenames are created with the case that the client "
 "passes, or if they are forced to be the default case"
@@ -3264,11 +3434,11 @@ msgstr ""
 "Esta opção controla se novos nomes de arquivo serão criados com a formatação "
 "que o cliente passou, ou se eles serão forçados a usar a formatação padrão"
 
-#: ../samba_wizard/Sambashare.pm:281
+#: ../samba_wizard/Sambashare.pm:310
 msgid "preserve case"
 msgstr "preservar formatação"
 
-#: ../samba_wizard/Sambashare.pm:286
+#: ../samba_wizard/Sambashare.pm:315
 msgid ""
 "Create mask, force directory mode and force create mode should be numeric. "
 "ie: 0755."
@@ -3276,24 +3446,24 @@ msgstr ""
 "Criar máscara, 'force directory mode' e 'force create mode' devem ser "
 "numéricos. ex.: 0755"
 
-#: ../samba_wizard/Sambashare.pm:293 ../samba_wizard/Sambashare.pm:431
+#: ../samba_wizard/Sambashare.pm:322 ../samba_wizard/Sambashare.pm:465
 msgid "Add a share"
 msgstr "Adicionar um compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:293 ../samba_wizard/Sambashare.pm:463
+#: ../samba_wizard/Sambashare.pm:322 ../samba_wizard/Sambashare.pm:497
 msgid "Browseable: view share"
 msgstr "Pesquisáveis: ver compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:293
+#: ../samba_wizard/Sambashare.pm:322
 msgid "Comment: description of the share"
 msgstr "Comentários: descrição do compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:293
+#: ../samba_wizard/Sambashare.pm:322
 msgid "Writable: user can write in the share"
 msgstr "Permissão de escrita: usuário pode escrever no compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:304 ../samba_wizard/Sambashare.pm:369
-#: ../samba_wizard/Sambashare.pm:413
+#: ../samba_wizard/Sambashare.pm:333 ../samba_wizard/Sambashare.pm:398
+#: ../samba_wizard/Sambashare.pm:444
 msgid ""
 "Share with the same name already exist or share name empty, please choose "
 "another name."
@@ -3301,46 +3471,58 @@ msgstr ""
 "Já existe um compartilhamento com o mesmo nome ou nome vazio, favor escolher "
 "outro nome."
 
-#: ../samba_wizard/Sambashare.pm:309 ../samba_wizard/Sambashare.pm:315
-#: ../samba_wizard/Sambashare.pm:374 ../samba_wizard/Sambashare.pm:380
-#: ../samba_wizard/Sambashare.pm:418 ../samba_wizard/Sambashare.pm:424
+#: ../samba_wizard/Sambashare.pm:338 ../samba_wizard/Sambashare.pm:344
+#: ../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 "Impossível criar o diretório, por favor entre o caminho correto."
 
-#: ../samba_wizard/Sambashare.pm:312 ../samba_wizard/Sambashare.pm:377
-#: ../samba_wizard/Sambashare.pm:421
-msgid "Please enter a Comment for this share."
+#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:406
+#: ../samba_wizard/Sambashare.pm:455
+#, fuzzy
+msgid "Please enter a comment for this share."
 msgstr "Por favor insira um comentário para esse compartilhamento."
 
-#: ../samba_wizard/Sambashare.pm:323
+#: ../samba_wizard/Sambashare.pm:352
 msgid "Share a CDROM"
 msgstr "Compartilhar um CD-ROM"
 
-#: ../samba_wizard/Sambashare.pm:342
+#: ../samba_wizard/Sambashare.pm:371
 msgid "CDrom path:"
 msgstr "Caminho ao CD-ROM:"
 
-#: ../samba_wizard/Sambashare.pm:344 ../samba_wizard/Sambashare.pm:539
+#: ../samba_wizard/Sambashare.pm:373 ../samba_wizard/Sambashare.pm:573
 msgid "Root preexec:"
 msgstr "Pré-execução do root:"
 
-#: ../samba_wizard/Sambashare.pm:345 ../samba_wizard/Sambashare.pm:540
+#: ../samba_wizard/Sambashare.pm:374 ../samba_wizard/Sambashare.pm:574
 msgid "Root postexec:"
 msgstr "Pós-execução do root:"
 
-#: ../samba_wizard/Sambashare.pm:351
+#: ../samba_wizard/Sambashare.pm:380
 msgid "Add a user share"
 msgstr "Adicionar um compartilhamento usuário"
 
-#: ../samba_wizard/Sambashare.pm:395
+#: ../samba_wizard/Sambashare.pm:424
 msgid "Add a public share"
 msgstr "Adicionar um compartilhamento público"
 
-#: ../samba_wizard/Sambashare.pm:431
-msgid "If you don't want to use one of this options, leave it blanck."
+#: ../samba_wizard/Sambashare.pm:449
+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 ""
+
+#: ../samba_wizard/Sambashare.pm:449
+msgid "WARNING"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:465
+#, fuzzy
+msgid "If you don't want to use one of this options, leave it blank."
 msgstr "Se você não quiser usar uma destas opções, deixe a em branco"
 
-#: ../samba_wizard/Sambashare.pm:441
+#: ../samba_wizard/Sambashare.pm:475
 msgid ""
 "Specifies a list of users that have read-only access to a writable share. "
 "ie: aginies"
@@ -3348,33 +3530,33 @@ msgstr ""
 "Específica uma lsita de usuário que só tem permissão de leitura em um "
 "compartilhamento. ex. aginies"
 
-#: ../samba_wizard/Sambashare.pm:442
+#: ../samba_wizard/Sambashare.pm:476
 msgid "Specifie a user that have read-write access to a share. ie: guibo"
 msgstr ""
 "Especifica um usuário que tem permissão de escrita e leitura no "
 "compartilhamento. ex.: guibo"
 
-#: ../samba_wizard/Sambashare.pm:457
+#: ../samba_wizard/Sambashare.pm:491
 msgid "Create mask should be a number. ie: 0755."
 msgstr "Máscara de criação deve ser um número. ex.: 0755."
 
-#: ../samba_wizard/Sambashare.pm:463
+#: ../samba_wizard/Sambashare.pm:497
 msgid "Comment: description of users home directory"
 msgstr "Comentário: descrição do diretório 'home' dos usuários"
 
-#: ../samba_wizard/Sambashare.pm:463
+#: ../samba_wizard/Sambashare.pm:497
 msgid "Create mode: man chmod for more info"
 msgstr "Modo de criação: 'man chmod' para mais informações"
 
-#: ../samba_wizard/Sambashare.pm:463
+#: ../samba_wizard/Sambashare.pm:497
 msgid "Users home options"
 msgstr "Opções do diretório 'home' dos usuários"
 
-#: ../samba_wizard/Sambashare.pm:463
+#: ../samba_wizard/Sambashare.pm:497
 msgid "Writable: user can write in their home"
 msgstr "Permissão de escrita: usuário pode escrever no seu diretório 'home'"
 
-#: ../samba_wizard/Sambashare.pm:463
+#: ../samba_wizard/Sambashare.pm:497
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -3383,31 +3565,32 @@ msgstr ""
 "através do samba, mas você e eles devem usar o comando smbpasswd para "
 "ajustar uma senha."
 
-#: ../samba_wizard/Sambashare.pm:487
+#: ../samba_wizard/Sambashare.pm:521
 msgid "Create mode should be a number. ie: 0755."
 msgstr "Modo de criação deve ser um número. ex.: 0755."
 
-#: ../samba_wizard/Sambashare.pm:492
+#: ../samba_wizard/Sambashare.pm:526
 msgid "Specific roving profile share, use the user's home directory"
 msgstr "Specific roving profile share, use the user's home directory"
 
-#: ../samba_wizard/Sambashare.pm:503
+#: ../samba_wizard/Sambashare.pm:537
 msgid "Guest access:"
 msgstr "Acesso de convidados:"
 
-#: ../samba_wizard/Sambashare.pm:510 ../samba_wizard/Sambashare.pm:546
+#: ../samba_wizard/Sambashare.pm:544 ../samba_wizard/Sambashare.pm:580
+#: ../samba_wizard/Sambashare.pm:623 ../samba_wizard/Sambashare.pm:634
 msgid ""
-"If you really want to add this this share, click the Next button or use the "
-"Back button."
+"If you really want to add this share, click the Next button or use the Back "
+"button."
 msgstr ""
 "Se você realmente quer adicionar este compartilhamento, clique no botão "
-"Próximo ou utilize o botão Voltar."
+"Próximo ou use o botão Voltar."
 
-#: ../samba_wizard/Sambashare.pm:510
+#: ../samba_wizard/Sambashare.pm:544
 msgid "Summary add home share"
 msgstr "Sumário para adicionar compartilhamento de diretório 'home'"
 
-#: ../samba_wizard/Sambashare.pm:521
+#: ../samba_wizard/Sambashare.pm:555
 msgid ""
 "If you really want to modify this share, click the Next button or use the "
 "Back button."
@@ -3415,15 +3598,15 @@ msgstr ""
 "Se você realmente quer modificar este compartilhamento, clique no botão "
 "Próximo ou então use o botão Voltar."
 
-#: ../samba_wizard/Sambashare.pm:521
+#: ../samba_wizard/Sambashare.pm:555
 msgid "Summary modify a share"
 msgstr "Sumário para modificar um compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:533
+#: ../samba_wizard/Sambashare.pm:567
 msgid "CDROM"
 msgstr "CD-ROM"
 
-#: ../samba_wizard/Sambashare.pm:533
+#: ../samba_wizard/Sambashare.pm:567
 msgid ""
 "If you really want to share a CDROM, click the Next button or use the Back "
 "button."
@@ -3431,19 +3614,15 @@ msgstr ""
 "Se você realmente quer compartilhar um CD-ROM, clique no botão Próximo ou "
 "então use o botão Voltar."
 
-#: ../samba_wizard/Sambashare.pm:537
+#: ../samba_wizard/Sambashare.pm:571
 msgid "Cdrom path:"
 msgstr "Caminho ao CD-ROM:"
 
-#: ../samba_wizard/Sambashare.pm:546
+#: ../samba_wizard/Sambashare.pm:580
 msgid "Summary add share"
 msgstr "Sumário para adicionar compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:552
-msgid "Create mask:"
-msgstr "Criar máscara:"
-
-#: ../samba_wizard/Sambashare.pm:562
+#: ../samba_wizard/Sambashare.pm:596
 msgid ""
 "If you really want to remove this share, click the Next button or use the "
 "Back button."
@@ -3451,143 +3630,145 @@ msgstr ""
 "Se você realmente quer remover este compartilhamento, clique no botão "
 "Próximo ou então use o botão Voltar."
 
-#: ../samba_wizard/Sambashare.pm:562
+#: ../samba_wizard/Sambashare.pm:596
 msgid "Summary remove a share"
 msgstr "Sumário para remoção de um compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:568
+#: ../samba_wizard/Sambashare.pm:602
 msgid "Delete this share:"
 msgstr "Remover este compartilhamento:"
 
-#: ../samba_wizard/Sambashare.pm:569
+#: ../samba_wizard/Sambashare.pm:603
 msgid "Comment for this share:"
 msgstr "Comentário para este compartilhamento:"
 
-#: ../samba_wizard/Sambashare.pm:575 ../samba_wizard/Sambashare.pm:588
-msgid ""
-"If you really want to add this share, click the Next button or use the Back "
-"button."
-msgstr "Se você realmente quer adicionar este compartilhamento, clique no botão Próximo ou use o botão Voltar."
+#: ../samba_wizard/Sambashare.pm:610
+#, fuzzy
+msgid "Summary of modify homes share"
+msgstr "Sumário para modificar um compartilhamento"
 
-#: ../samba_wizard/Sambashare.pm:575
+#: ../samba_wizard/Sambashare.pm:623
 msgid "Summary of add a user share"
 msgstr "Sumário para adicionar um compartilhamento entre usuários"
 
-#: ../samba_wizard/Sambashare.pm:588
+#: ../samba_wizard/Sambashare.pm:634
 msgid "Summary of add a public share"
 msgstr "Sumário para adicionar um compartilhamento público"
 
-#: ../samba_wizard/Sambashare.pm:601
-msgid "The wizard successfully configured your Samba samba."
+#: ../samba_wizard/Sambashare.pm:646
+#, fuzzy
+msgid "The wizard successfully configured your Samba."
 msgstr "O assistente configurou com sucesso seu servidor Samba."
 
-#: ../samba_wizard/Sambashare.pm:609
+#: ../samba_wizard/Sambashare.pm:654
 msgid "The wizard successfully modify your share."
 msgstr "O assistente alterou com sucesso seu compartilhamento."
 
-#: ../samba_wizard/Sambashare.pm:614
+#: ../samba_wizard/Sambashare.pm:659
 msgid "The wizard successfully add your share."
 msgstr "O assistente adicionou com sucesso seu compartilhamento."
 
-#: ../samba_wizard/Sambashare.pm:619
+#: ../samba_wizard/Sambashare.pm:664
 msgid "The wizard successfully add 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:624
+#: ../samba_wizard/Sambashare.pm:669
 msgid "The wizard successfully add your public share."
 msgstr "O assistente adicionou com sucesso seu compartilhamento público."
 
-#: ../samba_wizard/Sambashare.pm:629
+#: ../samba_wizard/Sambashare.pm:674
 msgid "The wizard successfully add your Profiles share."
 msgstr "O assistente adicionou com sucesso o perfil do seu compartilhamento."
 
-#: ../samba_wizard/Sambashare.pm:634
+#: ../samba_wizard/Sambashare.pm:679
 msgid "The wizard successfully remove your share."
 msgstr "O assistente removeu com sucesso seu compartilhamento."
 
-#: ../samba_wizard/Sambashare.pm:698 ../samba_wizard/Sambashare.pm:730
-#: ../samba_wizard/Sambashare.pm:773 ../samba_wizard/Sambashare.pm:791
-#: ../samba_wizard/Sambashare.pm:807 ../samba_wizard/Sambashare.pm:823
-#: ../samba_wizard/Sambashare.pm:844 ../samba_wizard/Sambashare.pm:877
+#: ../samba_wizard/Sambashare.pm:743 ../samba_wizard/Sambashare.pm:775
+#: ../samba_wizard/Sambashare.pm:818 ../samba_wizard/Sambashare.pm:852
+#: ../samba_wizard/Sambashare.pm:868 ../samba_wizard/Sambashare.pm:884
+#: ../samba_wizard/Sambashare.pm:908 ../samba_wizard/Sambashare.pm:941
 msgid "Samba share"
 msgstr "Compartilhamento Samba"
 
-#: ../samba_wizard/Sambashare.pm:727 ../samba_wizard/Sambashare.pm:874
+#: ../samba_wizard/Sambashare.pm:772 ../samba_wizard/Sambashare.pm:938
 #, perl-format
 msgid "Can't create %s. Please check why wizard can't create this directory."
 msgstr ""
 "Impossível criar %s. Favor checar porque o assistente não pode criar este "
 "diretório."
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../samba_wizard/Sambashare.pm:835
+#, fuzzy
+msgid "Samba homes share"
+msgstr "Compartilhamento Samba"
+
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Expert - Opções avançadas de SSH"
 
-#: ../sshd_wizard/Sshd.pm:68
-msgid "OpenSSH SSH daemon configuration"
-msgstr "OpenSSH configuração do serviço SSH"
-
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Que tipo de configuração você quer fazer:"
 
-#: ../sshd_wizard/Sshd.pm:75
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "Servidor SSH, opções clássicas"
 
-#: ../sshd_wizard/Sshd.pm:83 ../sshd_wizard/Sshd.pm:179
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Endereço à escutar:"
 
-#: ../sshd_wizard/Sshd.pm:83
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Especifica o endereço local que o sshd deve escutar."
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Número da porta:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "Especifique o número da porta que o sshd deve escutar. O padrão é 22."
 
-#: ../sshd_wizard/Sshd.pm:87
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Porta deve ser um número"
 
-#: ../sshd_wizard/Sshd.pm:98
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Método de Autenticação:"
 
-#: ../sshd_wizard/Sshd.pm:108
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "Autenticação RSA:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Autenticação PubKey:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Arquivo key para autenticação:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Autenticação de senha:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Ignorar arquivo rhosts:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Permitir senha em branco:"
 
-#: ../sshd_wizard/Sshd.pm:118
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Log"
 
-#: ../sshd_wizard/Sshd.pm:118
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
@@ -3595,7 +3776,7 @@ msgstr ""
 "Nível de Log. passa o nível de armazenamento que é usado quando armazenando "
 "mensagens do sshhd."
 
-#: ../sshd_wizard/Sshd.pm:118
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
@@ -3603,15 +3784,15 @@ msgstr ""
 "Facilidades do Syslog: passa os os códigosusados quando armazenando "
 "mensagens do sshd"
 
-#: ../sshd_wizard/Sshd.pm:124
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Facilidades do Syslog:"
 
-#: ../sshd_wizard/Sshd.pm:130
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Opções de login"
 
-#: ../sshd_wizard/Sshd.pm:130
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3619,11 +3800,11 @@ msgstr ""
 "Imprimir último log: caso o sshd deva imprimir o data e a hora do último "
 "acesso do usuário. "
 
-#: ../sshd_wizard/Sshd.pm:138
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Limite de tempo de login:"
 
-#: ../sshd_wizard/Sshd.pm:138
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3632,23 +3813,23 @@ msgstr ""
 "O servidor desconecta depois deste tempo se o usuário não se conectou com "
 "sucesso. Se o valor é 0 não existe limite de tempo. O padrão é 120 segundos."
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Manter ativo:"
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Print motd:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Imprimir último login:"
 
-#: ../sshd_wizard/Sshd.pm:144
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Limite de tempo de login deve ser um númro"
 
-#: ../sshd_wizard/Sshd.pm:149
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3661,19 +3842,19 @@ msgstr ""
 "deixam seu diretório e/ou arquivos com permissão de escrita para todos, "
 "acidentalmente."
 
-#: ../sshd_wizard/Sshd.pm:149
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Opções de Login do usuário:"
 
-#: ../sshd_wizard/Sshd.pm:157
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Strict modes:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Permitir usuários:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3681,11 +3862,11 @@ msgstr ""
 "se especificado, login só é permitido para nomes de usuário que casem com as "
 "expressões. ex.: erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Bloquear usuários:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3693,11 +3874,11 @@ msgstr ""
 "Login não é permitido para usuários cujos nomes casam com as expressões. ex: "
 "pirate guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:164
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Compressão: Especifica se compressão está permitida."
 
-#: ../sshd_wizard/Sshd.pm:164
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3707,27 +3888,27 @@ msgstr ""
 "desabilitando X11 repasse não previne usuários de repassar o processamento "
 "do X11, pois os usuários podem, sempre, instalar seus próprios repassadores."
 
-#: ../sshd_wizard/Sshd.pm:170
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Compressão:"
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11 forwarding:"
 
-#: ../sshd_wizard/Sshd.pm:176
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Sumário da configuração do OpenSSH."
 
-#: ../sshd_wizard/Sshd.pm:186
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "O assistente configurou com sucesso seu servidor SSH"
 
-#: ../sshd_wizard/Sshd.pm:248
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Configurando seu servidor OpenSSH..."
 
-#: ../sshd_wizard/Sshd.pm:248
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "Servidor OpenSSH"
 
@@ -3757,7 +3938,8 @@ msgstr "Dessa forma seu servidor será o servidor de hora local para sua rede"
 
 #: ../time_wizard/Ntp.pm:70
 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
 msgid ""
@@ -3931,7 +4113,8 @@ msgstr "sub-diretório http do usuário: ~/"
 
 #: ../web_wizard/Apache.pm:113
 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:116 ../web_wizard/Apache.pm:134
 msgid "Document root:"
@@ -3973,3 +4156,32 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando seu sistema como servidor Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Domínio:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Instalação em andamento"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Instalando o Kolab em seu sistema..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Parece que você já configurou previamente um servidor Samba. O assistente "
+#~ "irá reler suas antigas configurações, e mostrar o tipo de servidor Samba "
+#~ "que você escolheu."
+
+#~ msgid "Show dot files:"
+#~ msgstr "Mostrar arquivos com ponto:"
+
+#~ msgid ""
+#~ "If you really want to add this this share, click the Next button or use "
+#~ "the Back button."
+#~ msgstr ""
+#~ "Se você realmente quer adicionar este compartilhamento, clique no botão "
+#~ "Próximo ou utilize o botão Voltar."
+
+#~ msgid "OpenSSH SSH daemon configuration"
+#~ msgstr "OpenSSH configuração do serviço SSH"
diff --git a/po/ro.po b/po/ro.po
index c55cfd5a..a1ef7ea3 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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."
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Eroare."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Felicitări!"
 
@@ -137,32 +137,33 @@ msgstr "Sunteţi în DHCP, serverul poate nu va rula în configuraţia dvs."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Eroare"
 
@@ -345,7 +346,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Eşec"
 
@@ -512,7 +513,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 #, fuzzy
 msgid "Error:"
 msgstr "Eroare"
@@ -645,7 +647,7 @@ msgstr "Server Samba"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "asistent de configurare"
@@ -693,7 +695,7 @@ msgstr ""
 "%s nu este instalat\n"
 "Apăsaţi \"Înainte\" pentru a instala sau \"Renunţă\" pentru a ieşi"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalarea a eşuat"
 
@@ -759,8 +761,8 @@ msgstr "Antet server:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -877,7 +879,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -958,12 +960,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Asistent de configurare Samba"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -971,71 +983,160 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Asistent de configurare server Web"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Server NFS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, 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
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Server NFS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Nume de domeniu 'mascaradat':%s"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Nume de domeniu 'mascaradat':%s"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Primul nume:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+msgid "CA passphrase again:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Asistentul a configurat cu succes serviciul de poştă în Internet a "
 "serverului dvs."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Nume maşină:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "Director utilizator:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Configurez serverul FTP"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurez serverul FTP"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Server Samba"
@@ -1578,7 +1679,7 @@ msgid "Relay mail server"
 msgstr "Server de email"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1600,9 +1701,8 @@ msgstr ""
 "Acest asistent vă va ajuta la configurarea serverului FTP pentru reţeaua "
 "dumneavoastră."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informaţii"
 
@@ -1641,11 +1741,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Nume de domeniu 'mascaradat':%s"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2449,12 +2544,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Asistent de configurare server Web"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2760,7 +2849,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Nivel acces:"
@@ -3482,132 +3571,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Server Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Ce doriţi să fac?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Cea mai mică adresă IP:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Primul nume:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Director partajat:"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Instalarea a eşuat"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Parolă:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Imprimante:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Lista scriere:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3615,73 +3704,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Nume server de ştiri:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Permite gazdelor:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Refuză gazdele:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Opţiuni personalizate:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "asistent de configurare"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Asistentul a configurat cu succes serviciul NFS al serverului dvs."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Configurez serverul FTP"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Server web Apache"
@@ -3938,6 +4027,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Configurez serverul DNS"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "Director utilizator:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Configurez serverul FTP"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/ru.po b/po/ru.po
index 524fe6ca..2fd2f5c2 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2005-08-24 23:07+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <docteam@lafox.net>\n"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Ошибка."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Поздравляем"
 
@@ -131,32 +131,33 @@ msgstr "Вы используете dhcp, сервер может не рабо�
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Ошибка"
 
@@ -345,7 +346,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Завершился неудачей"
 
@@ -516,7 +517,8 @@ msgstr ""
 "Похоже, что этот хост уже есть в конфигурации вашей DNS... Нажмите Далее для "
 "продолжения"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Ошибка:"
 
@@ -643,7 +645,7 @@ msgstr "Сервер LDAP"
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Настройка демона OpenSSH"
 
@@ -688,7 +690,7 @@ msgstr ""
 "%s не установлен\n"
 "Нажмите Далее для установки или Отмена для выхода"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Установка завершилась неудачей"
 
@@ -752,8 +754,8 @@ msgstr "Имя сервера:"
 msgid "Admin email:"
 msgstr "E-mail админа:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Разрешить вход root'a:"
 
@@ -868,7 +870,7 @@ msgstr "Мастер успешно настроил ваш Интернет/И�
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Пожалуйста, перезапустите drakwizard и попробуйте изменить некоторые "
@@ -955,11 +957,21 @@ msgstr ""
 "Linux по сети будет очень просто. Используйте drakpxelinux для настройки "
 "своего сервера PXE и drakwizard DHCP для настройки сервера DHCPD."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Мастер настройки Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -972,7 +984,7 @@ msgstr ""
 "предоставлением пользователям почтовых ящиков, а также контакты и доступ к "
 "почте через POP3 и IMAP4 (rev1)."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -982,39 +994,139 @@ msgstr ""
 "Proftpd, LDAP, Cyrus, Postfix, Imap, Saslauth. Мастер сделает резервную "
 "копию всех ваших конфигурационных файлов для этих служб."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Добро пожаловать в мастер конфигурации сервера Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Ведущий сервер DNS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Вы уже настроили свой сервер LDAP"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Подчиненный сервер DNS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Домен:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Домен:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Введите пароль для учетной записи менеджера сервера Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Пароль не совпадает или отсутствует. Пожалуйста, исправьте."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Пароль (еще раз):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Первое имя:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Пароль (еще раз):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Сейчас мастер настроит сервер Kolab с этими параметрами"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Имя хоста:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Почтовый домен:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1022,19 +1134,11 @@ msgstr ""
 "Сервер kolab теперь настроен и запущен. Войдите в систему как 'manager' с "
 "введенным ранее паролем по адресу https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Выполняется установка"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "В вашу систему устанавливается сервер Kolab..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Настраивается сервер Kolab для вашей системы..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Сервер Kolab"
 
@@ -1564,7 +1668,7 @@ msgid "Relay mail server"
 msgstr "Ретрансляционный почтовый сервер"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Новичок - классические параметры"
 
@@ -1584,9 +1688,8 @@ msgstr ""
 "Этот мастер поможет вам настроить почтовый сервер Postfix или ретранслятор "
 "почты Postfix."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Информация"
 
@@ -1628,10 +1731,6 @@ msgstr ""
 "системы. Пример: myhostname = mailserver"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Домен:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2485,14 +2584,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Мастер настройки сервера Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Похоже, что вы уже ранее настраивали Samba. Этот мастер заново прочитает "
-"вашу старую конфигурацию и покажет вам тип сервера Samba для выбора"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2824,7 +2915,7 @@ msgstr "Файл журнала:"
 msgid "Max log size:"
 msgstr "Максимальный размер журнала:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Уровень журналирования:"
 
@@ -3577,72 +3668,72 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Общий ресурс Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Эксперт - дополнительные параметры ssh"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Какой тип настройки вы хотите выполнить:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "Сервер SSH, классические параметры"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Адрес прослушивания:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Определяет локальные адреса, которые будет прослушивать sshd."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Номер порта:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 "Определяет номер порта, прослушиваемого sshd. По умолчанию используется 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Порт должен быть числом"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Метод аутентификации"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "RSA-аутентификация:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Публичный ключ:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Файл с ключом аутентификации:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Парольная аутентификация:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Игнорировать файл rhosts:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Разрешить пустые пароли:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Журнал"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
@@ -3650,7 +3741,7 @@ msgstr ""
 "Уровень журналирования: определяет уровень информативности, используемый при "
 "регистрации сообщений sshd."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
@@ -3658,15 +3749,15 @@ msgstr ""
 "Функция системного журнала: выводит служебный код, используемый при "
 "регистрации сообщений sshd"
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Функция системного журнала:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Параметры входа в систему"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3674,11 +3765,11 @@ msgstr ""
 "Вывод времени последнего входа в систему: должен ли sshd выводить дату и "
 "время, когда пользователь последний раз входил в систему"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Допустимое время входа в систему:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3688,23 +3779,23 @@ msgstr ""
 "смог войти в систему. Если это значение равно 0, значит ограничения по "
 "времени нет. Значение по умолчанию - 120 секунд."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Поддержание соединения:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Выводить сообщение дня:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Выводить время последнего входа в систему:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Допустимое время входа в систему должно быть числом"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3716,19 +3807,19 @@ msgstr ""
 "войти в систему. Обычно это было бы желательным, потому как новички иногда "
 "случайно оставляют свои каталоги или файлы с правами на запись для всех."
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Параметры входа в систему пользователей"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Ограниченный режим:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Разрешённые пользователи:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3736,11 +3827,11 @@ msgstr ""
 "Если определён, входить в систему разрешается только пользователям, чьи "
 "имена соответствуют одному из шаблонов. Пример: erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Запрещённые пользователи:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3748,11 +3839,11 @@ msgstr ""
 "Пользователям, чьи имена соответствуют одному из шаблонов, входить в систему "
 "запрещено. Пример: pirate guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Сжатие: определяет, разрешено ли сжатие."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3762,27 +3853,27 @@ msgstr ""
 "что его отключение не запрещает пользователям форвардить X11-трафик, т.к. "
 "они вегда могут установить свои собственные форвардеры."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Сжатие:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11-форвардинг:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Сводка с конфигурацией OpenSSH"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Мастер успешно настроил ваш сервер SSH."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Настраивается сервер SSH..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "Сервер OpenSSH"
 
@@ -4032,6 +4123,22 @@ msgstr "Сервер Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ваша система настраивается для работы в качестве сервера Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Почтовый домен:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Выполняется установка"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "В вашу систему устанавливается сервер Kolab..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Похоже, что вы уже ранее настраивали Samba. Этот мастер заново прочитает "
+#~ "вашу старую конфигурацию и покажет вам тип сервера Samba для выбора"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/sc.po b/po/sc.po
index be61cf2e..04cc0d6b 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Faddina."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Cumprimentus"
 
@@ -132,32 +132,33 @@ msgstr "Ses in dhcp, forsis su server no at a funtzionai cun s'assètiu tuu."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Faddina"
 
@@ -344,7 +345,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Faddiu"
 
@@ -510,7 +511,8 @@ msgid ""
 msgstr ""
 "Parit ki s'host siat jai in s'assètiu DNS... craca \"sighi\" po prosighiri"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Faddina:"
 
@@ -634,7 +636,7 @@ msgstr "Server ldap"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Wizard de assètiu de su DNS Master"
@@ -680,7 +682,7 @@ msgstr ""
 "%s no est aposentau\n"
 "Crica \"Sighi\" po d'aposentai o \"Annudda\" po bessiri"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Aposentadura faddia"
 
@@ -741,8 +743,8 @@ msgstr "Hostname de su server:"
 msgid "Admin email:"
 msgstr "Admin email:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -852,7 +854,7 @@ msgstr "Su wizard at acabau de assetiai su server FTP de intranet/internet"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -929,11 +931,21 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -941,64 +953,153 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Server DNS Master"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid "You choose to configure a master Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Server DNS Slave"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Nòmini de domìniu:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Nòmini de domìniu:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:86
-msgid "The wizard will now configure Kolab server with these parameters"
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
-msgid "Hostname:"
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+msgid "Organisation name:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:150
 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/"
+"Kolab can create and manage a certificate authority that can be used to "
+"create SSL certificates for use within the Kolab environment."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
+#: ../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 ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+msgid "CA passphrase again:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
+msgid "The wizard will now configure Kolab server with these parameters"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
+msgid "Hostname:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+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/"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Server Kolab"
 
@@ -1486,7 +1587,7 @@ msgid "Relay mail server"
 msgstr "Server de curreu"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1505,9 +1606,8 @@ msgid ""
 "relay."
 msgstr "Custu wizard t'at a ajudai a assetiai is serbìtzius DHCP de su server."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Sceda"
 
@@ -1545,11 +1645,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Nòmini de domìniu:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2302,12 +2397,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "wizard de assètiu "
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2603,7 +2692,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr ""
 
@@ -3301,126 +3390,126 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Server Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Ita bolis fai:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Bivimentu IP prus basçu:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3428,69 +3517,69 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Allow FXP:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Su wizard at acabau de assetiai is serbìtziuis DHCP."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Assètiu su sistema ke server DNS Slave ..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Server NFS"
diff --git a/po/sk.po b/po/sk.po
index cd4289bc..420afa65 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -32,7 +32,7 @@ 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:97
+#: ../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
@@ -42,7 +42,7 @@ msgstr "Chyba."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Gratulujem"
 
@@ -127,32 +127,33 @@ msgstr "Máte nastavené dhcp, server nemusí fungovať s touto konfiguráciou."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Chyba"
 
@@ -338,7 +339,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Zlyhalo"
 
@@ -507,7 +508,8 @@ msgid ""
 msgstr ""
 "Zdá sa, že tento názov už je vo vašej konfigurácii DNS... kliknite na Ďalej"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Chyba:"
 
@@ -635,7 +637,7 @@ msgstr "LDAP server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Ukázať konfiguráciu LDAP"
@@ -681,7 +683,7 @@ msgstr ""
 "%s nie je nainštalovaný\n"
 "Kliknite na \"Ďalej\" pre inštaláciu, alebo \"Zrušiť\" pre ukončenie"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Inštalácia zlyhala"
 
@@ -747,8 +749,8 @@ msgstr "Meno servera:"
 msgid "Admin email:"
 msgstr "Email administrátora:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Povoliť prihlásenie pre root-a:"
 
@@ -867,7 +869,7 @@ msgstr "Sprievodca úspešne nakonfiguroval váš Intranet/Internet FTP server"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Spustite znova drakwizard a pokúste sa zmeniť niektoré nastavenia."
 
@@ -958,11 +960,21 @@ msgstr ""
 "nastaviť DHCP server s podporou PXE a PXE server. Potom bude veľmi "
 "jednoduché nainštalovať Mandriva Linux pomocou siete."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Sprievodca konfiguráciou kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -974,7 +986,7 @@ msgstr ""
 "možnosťou použitia pre mailové schránky používateľov a prístup k e-mailom "
 "pomocou POP3 i IMAP4."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -984,40 +996,141 @@ msgstr ""
 "Postfix, Imap, Saslauth. Sprievodca urobí zálohy všetkých vašich "
 "konfiguračných súborov týchto služieb."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Vitajte v Sprievodcovi nastavením Kolab Groupware servera."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Master DNS server"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Už ste nastavili váš LDAP server"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Slave DNS server"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Meno domény:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Meno domény:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Vložte heslo pre manažéra konta na serveri Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Heslá sú rôzne alebo žiadne, prosím opravte ich."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Heslo (znova):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Krstné meno:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Heslo (znova):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Sprievodca bude teraz konfigurovať server Kolab s nasledovnými parametrami:"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Meno servera:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "E-mailová doména:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1025,19 +1138,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Inštalácia beží"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Inštalácia servera Kolab na vašom systéme..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurácia Kolab servera na vašom systéme..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -1565,7 +1670,7 @@ msgid "Relay mail server"
 msgstr "Externý mail server"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1584,9 +1689,8 @@ msgid ""
 "relay."
 msgstr "Tento sprievodca vám pomôže nastaviť FTP server pre vašu sieť."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informácie"
 
@@ -1626,11 +1730,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Meno domény:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2474,12 +2573,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Sprievodca konfiguráciou web servera"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2789,7 +2882,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Prístupova úroveň:"
@@ -3510,132 +3603,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba server"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Čo si želáte spraviť:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Najnižšia IP adresa:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Krstné meno:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Chyba, mal by to byť adresár."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Inštalačná metóda:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Heslo:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Tlačiarne:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Povoliť prihlásenie pre root-a:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3643,73 +3736,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Používateľské meno:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Povolení hostitelia:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Zakázaní hostitelia:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Rozšírené nastavenie:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Ukázať konfiguráciu LDAP"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Sprievodca úspešne nakonfiguroval váš NFS server"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Konfigurovať váš Samba server..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache server"
@@ -3956,6 +4049,15 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavovanie vášho systému ako Apache server ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "E-mailová doména:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Inštalácia beží"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Inštalácia servera Kolab na vašom systéme..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/sl.po b/po/sl.po
index 5fc8d46e..0a7188e4 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -41,7 +41,7 @@ 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:97
+#: ../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
@@ -51,7 +51,7 @@ msgstr "Napaka."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Čestitke"
 
@@ -135,32 +135,33 @@ msgstr "Ste v  strežnik dhcp morda ne bo deloval z vašimi nastavitvami."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Napaka"
 
@@ -347,7 +348,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Spodletelo"
 
@@ -519,7 +520,8 @@ msgstr ""
 "Zdi se, da je gostitelj že v vaši konfiguraciji DNS ... kliknite Naprej za "
 "nadaljevanje"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Napaka:"
 
@@ -649,7 +651,7 @@ msgstr "Strežnik ldap"
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Prikaži nastavitve Ldap"
@@ -695,7 +697,7 @@ msgstr ""
 "%s ni nameščen\n"
 "Kliknite \"Naprej\" za namestitev ali \"Prekliči\" za izhod"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Namestitev ni uspela"
 
@@ -763,8 +765,8 @@ msgstr "Strežnikovo ime gostitelja:"
 msgid "Admin email:"
 msgstr "Administratorjev email:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Dovoli prijavo uporabniku root:"
 
@@ -883,7 +885,7 @@ msgstr "Čarovnik je uspešno nastavil intranetni/internetni strežnik FTP"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Prosim ponovno zaženite drakwizard in poizkušajte spremeniti nekaj "
@@ -977,11 +979,21 @@ msgstr ""
 "lahko nastavite strežnik DHCP s PXE podporo, in strežnik PXE. Tako bo zelo "
 "enostavno namestiti Mandriva Linux preko omrežja."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab nastavitveni čarovnik"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -993,7 +1005,7 @@ msgstr ""
 "deljeni adresar s podporo za uporabnike poštnih predalov, kot tudi za stike "
 "ter POP3 in IMAP4 (rev1) dostop do pošte"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1003,39 +1015,140 @@ msgstr ""
 "Postfix, Imap, Saslauth. Čarovnik bo ustvaril varnostno kopijo vseh vaših "
 "predhodnih nastavitvenih datotek teh servisov."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Dobrodošli v Kolab namestitveni čarovnik strežnika za skupinsko delo."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Glavni strežnik DNS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Vaš strežnik Ldap ste že nastavili"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Podrejeni strežnik DNS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Ime domene:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Ime domene:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Vnesite geslo za upraviteljski račun strežnika Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Napačno ali manjkajoče geslo, prosim popravite."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Geslo (ponovno):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Ime:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Geslo (ponovno):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Čarovnik bo zdaj nastavil strežnik Kolab s temi parametri"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Ime gostitelja:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Poštna domena:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1043,19 +1156,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Namestitev v teku"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Nameščanje strežnika Kolab na vaš sistem ..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavljanje strežnika Kolab na vašem sistemu ..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Strežnik Kolab"
 
@@ -1588,7 +1693,7 @@ msgid "Relay mail server"
 msgstr "Zunanji poštni strežnik"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1607,9 +1712,8 @@ msgid ""
 "relay."
 msgstr "Ta čarovnik vam bo pomagal nastaviti strežnik FTP za vaše omrežje."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Obvestilo"
 
@@ -1649,11 +1753,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Ime domene:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2492,12 +2591,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Čarovnik za nastavitev spletnega strežnika"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2806,7 +2899,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Stopnja dostopa:"
@@ -3528,132 +3621,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Strežnik Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Kaj želite narediti:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Najnižji naslov IP:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Ime:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Napaka: biti mora imenik."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Namestitvena metoda:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Geslo:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Tiskalniki:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Dovoli prijavo uporabniku root:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3661,73 +3754,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Uporabniško ime:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Dovoli gostiteljska imena:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Zavrni gostiteljska imena:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Možnost po meri:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Prikaži nastavitve Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Čarovnik je uspešno nastavil vaš strežnik NFS."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Nastavljanje strežnika Samba ..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Strežnik Apache"
@@ -3978,6 +4071,15 @@ msgstr "Strežnik Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavljanje vašega sistema kot strežnik Apache ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Poštna domena:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Namestitev v teku"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Nameščanje strežnika Kolab na vaš sistem ..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/sq.po b/po/sq.po
index 9d582e53..943f7ec7 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "Gabim."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Urime"
 
@@ -142,32 +142,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Gabim"
 
@@ -356,7 +357,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Dështoi"
 
@@ -524,7 +525,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 #, fuzzy
 msgid "Error:"
 msgstr "Gabim."
@@ -661,7 +663,7 @@ msgstr "Server i Bazës së të Dhënave"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Asistenti Konfigurues"
@@ -711,7 +713,7 @@ msgstr ""
 "%s nuk është instaluar\n"
 "Kliko mbi \"Tjetri\" për ta instaluar apo mbi \"Anulo\" për ta braktisur"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalimi dështio"
 
@@ -777,8 +779,8 @@ msgstr "Emri i Serverit:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -896,7 +898,7 @@ msgstr "Aistenti e ka konfiguruar me sukses Serverin FTP Intranet/Internet"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -977,12 +979,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Asistent Konfigurues Samba"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -990,72 +1002,162 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Asistenti Konfigurues për Server Web"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Server NFS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, 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
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Server NFS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Emri i pronës llogaritëse:%s"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Emri i pronës llogaritëse:%s"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Parulla:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Parulla:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Emri i Ftuesit:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Parulla:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Asistenti i ka konfiguruar me sukses shërbimet e lajmëruesit Internet për "
 "rrjetin tuaj."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Emri i host:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "Repertori i përdoruesit:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Konfigurimi i Serverit FTP"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurimi i Serverit FTP"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Server i Bazës së të Dhënave"
@@ -1599,7 +1701,7 @@ msgid "Relay mail server"
 msgstr "Emri i Serverit Mail:"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1621,9 +1723,8 @@ msgstr ""
 "Ky asistent do të ju ndihmojë në konfigurmin e një Serveri FTP për rrjetin "
 "tuaj."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informacion"
 
@@ -1662,11 +1763,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Emri i pronës llogaritëse:%s"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2473,12 +2569,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Asistenti Konfigurues për Server Web"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2783,7 +2873,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Nivel i Hyrjeve:"
@@ -3499,131 +3589,131 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Server i Bazës së të Dhënave"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Adresë më e ultë IP:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Emri i Ftuesit:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Repertor i Shpërndar:"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "instalimi dështoi"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Parulla:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Stampuesit:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "drejtë shkrimi:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3631,72 +3721,72 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Shtimi i përdoruesit"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Ftues të autorizuar:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Ftues të pa autorizuar:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Asistenti Konfigurues"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj NFS"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Konfigurimi i Serverit FTP"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Server Web Intranet:"
@@ -3960,6 +4050,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurimi i Serverit DNS"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "Repertori i përdoruesit:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Konfigurimi i Serverit FTP"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/sr.po b/po/sr.po
index 343feb38..7b0c9393 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Грешка."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Честитке"
 
@@ -135,32 +135,33 @@ msgstr "Ви сте у dhcp, сервер може да не ради уз ов�
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Грешка"
 
@@ -342,7 +343,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Неуспело"
 
@@ -509,7 +510,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Грешка:"
 
@@ -645,7 +647,7 @@ msgstr "Сервер бази података"
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Чаробњак за подешавање"
@@ -690,7 +692,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Инсталација није успела"
 
@@ -754,8 +756,8 @@ msgstr "Име сервера:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -871,7 +873,7 @@ msgstr "Чаробњак је успешно подесио Ваш интерн�
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -952,12 +954,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Чаробњак за подешавање Samba-е"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -965,71 +977,161 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Чаробњак за подешавање Web сервера"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "NFS сервер"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Овај чаробњак је успешно подесио Samba сервер."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "NFS сервер"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Прпрачунато Име домена%s"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Прпрачунато Име домена%s"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Име:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Лозинка:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Овај чаробњак је успешно подесио сервис интернет поште на Вашем серверу."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Име рачунара:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "КОриснички директоријум:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Подешавање FTP сервера"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Подешавање FTP сервера"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Сервер бази података"
@@ -1566,7 +1668,7 @@ msgid "Relay mail server"
 msgstr "Име сервера поште:"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1586,9 +1688,8 @@ msgid ""
 "relay."
 msgstr "Овај чаробњак ће вам помоћи да подесите FTP сервер на Вашој мрежи."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Информације"
 
@@ -1627,11 +1728,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Прпрачунато Име домена%s"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2428,12 +2524,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Чаробњак за подешавање Web сервера"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2738,7 +2828,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Ниво приступа:"
@@ -3459,131 +3549,131 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Сервер бази података"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Шта желите да радите?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Најнижа IP адреса:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Име:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Дељени директоријум:"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Лозинка:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Штампачи:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "листа писања:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3591,73 +3681,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Додавање корисника"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Дозволи домаћине:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Одбиј домаћине:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Посебна опција:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Чаробњак за подешавање"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Чаробњак је успешно подесио Ваш NFS сервер"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Подешавање FTP сервера"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Интранет Web сервер:"
@@ -3912,6 +4002,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Подешавање DNS сервера"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "КОриснички директоријум:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Подешавање FTP сервера"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 6f211ea8..07aedad5 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "Greška."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Čestitke"
 
@@ -136,32 +136,33 @@ msgstr "Vi ste u dhcp, server može da ne radi uz ovakva podešavanja."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Greška"
 
@@ -344,7 +345,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Neuspelo"
 
@@ -511,7 +512,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Greška:"
 
@@ -647,7 +649,7 @@ msgstr "Server bazi podataka"
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Čarobnjak za podešavanje"
@@ -692,7 +694,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Instalacija nije uspela"
 
@@ -756,8 +758,8 @@ msgstr "Ime servera:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -873,7 +875,7 @@ msgstr "Čarobnjak je uspešno podesio Vaš internet/intranet FTP server"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -954,12 +956,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "Čarobnjak za podešavanje Samba-e"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -967,71 +979,161 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Čarobnjak za podešavanje Web servera"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "NFS server"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "NFS server"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Prpračunato Ime domena%s"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Prpračunato Ime domena%s"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Lozinka:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Ime:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Lozinka:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Ovaj čarobnjak je uspešno podesio servis internet pošte na Vašem serveru."
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Ime računara:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "KOrisnički direktorijum:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Podešavanje FTP servera"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavanje FTP servera"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Server bazi podataka"
@@ -1568,7 +1670,7 @@ msgid "Relay mail server"
 msgstr "Ime servera pošte:"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1588,9 +1690,8 @@ msgid ""
 "relay."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite FTP server na Vašoj mreži."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informacije"
 
@@ -1629,11 +1730,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "Prpračunato Ime domena%s"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2431,12 +2527,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Čarobnjak za podešavanje Web servera"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2741,7 +2831,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Nivo pristupa:"
@@ -3463,131 +3553,131 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Server bazi podataka"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Šta želite da radite?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Najniža IP adresa:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Ime:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Deljeni direktorijum:"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Lozinka:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Štampači:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "lista pisanja:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3595,73 +3685,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Dodavanje korisnika"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Dozvoli domaćine:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Odbij domaćine:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Posebna opcija:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Čarobnjak za podešavanje"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Čarobnjak je uspešno podesio Vaš NFS server"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Podešavanje FTP servera"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Intranet Web server:"
@@ -3918,6 +4008,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje DNS servera"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "KOrisnički direktorijum:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Podešavanje FTP servera"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/sv.po b/po/sv.po
index dd353f76..84764f90 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -42,7 +42,7 @@ 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:97
+#: ../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
@@ -52,7 +52,7 @@ msgstr "Fel."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Gratulerar"
 
@@ -138,32 +138,33 @@ msgstr "Du är i DHCP, servern kanske inte fungerar med din konfiguration."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Fel"
 
@@ -351,7 +352,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Misslyckades"
 
@@ -522,7 +523,8 @@ msgstr ""
 "Det verkar som om värden redan finns i din DNS konfiguration... klicka på "
 "nästa för att fortsätta"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Fel:"
 
@@ -650,7 +652,7 @@ msgstr "ldap server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Visa Ldap konfiguration"
@@ -696,7 +698,7 @@ msgstr ""
 "%s är inte installerad.\n"
 "Klicka på \"Nästa\" för att installera eller \"Avbryt\" för att avsluta."
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Installation misslyckades"
 
@@ -764,8 +766,8 @@ msgstr "Servervärddatornamn:"
 msgid "Admin email:"
 msgstr "Admin e-post:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Tillåt root login:"
 
@@ -882,7 +884,7 @@ msgstr "Guiden lyckades med att konfigurera FTP-servern för Intranät/Internet"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Var vänlig kör om drakwizard och försök ändra några parametrar."
 
@@ -974,11 +976,21 @@ msgstr ""
 "konfigurera en DHCP server med PXE stöd och en PXE server. Så att blir "
 "mycket enkelt att installera Mandriva Linux via nätverket."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Konfigurationsguide för Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -990,7 +1002,7 @@ msgstr ""
 "adressbok förberedd för e-postanvändare och kontakter, samt POP3 och IMAP4"
 "(rev1) åtkomst till e-post"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1000,39 +1012,140 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Guiden kommer att göra en säkerhetskopia av "
 "alla dina tidigare konfigurationsfiler för dessa tjänster."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Välkommen till konfigurationsguiden för Kolab grupprogramvaruserver."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "DNS-huvudserver"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Du har redan konfigurerat din Ldap Server"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "DNS-slavserver"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domännamn:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Domännamn:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Ange lösenord för administratörens konto på Kolab servern."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Felaktigt lösenord, eller inget lösenord, var vänlig åtgärda."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Lösenord igen:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Förnamn:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Lösenord igen:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Guiden kommer nu att konfigurera Kolab servern med dessa parametrar"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Värddatornamn:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "E-post domän:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1040,19 +1153,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Installation pågår"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Installerar Kolab servern på ditt system..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerar Kolab servern på ditt system..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -1582,7 +1687,7 @@ msgid "Relay mail server"
 msgstr "Extern e-postserver"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1603,9 +1708,8 @@ msgstr ""
 "Den här guide kommer att hjälpa dig att konfigurera en FTP server för ditt "
 "nätverk."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Information"
 
@@ -1645,11 +1749,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Domännamn:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2493,12 +2592,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Konfigurationsguide för webbserver"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2808,7 +2901,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Åtkomstnivå:"
@@ -3528,132 +3621,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba-server"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Vad vill du göra:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Lägsta IP-adress:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Förnamn:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Fel: skall vara en katalog"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Installationsmetod:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Lösenord:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Skrivare:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Tillåt root login:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3661,73 +3754,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Användarnamn:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Tillåt datorer:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Neka datorer:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Egen parameter:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Visa Ldap konfiguration"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Guiden lyckades med att konfigurera NFS-servern."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Konfigurerar din Samba server..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache server"
@@ -3973,6 +4066,15 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerar ditt system som Apache server ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "E-post domän:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Installation pågår"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Installerar Kolab servern på ditt system..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/ta.po b/po/ta.po
index d24620c9..1f82a3ff 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -36,7 +36,7 @@ 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:97
+#: ../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
@@ -46,7 +46,7 @@ msgstr "பிழை. "
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "வாழ்த்துக்கள்"
 
@@ -137,32 +137,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "பிழை"
 
@@ -344,7 +345,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "தோல்வி"
 
@@ -511,7 +512,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 #, fuzzy
 msgid "Error:"
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
@@ -648,7 +650,7 @@ msgstr "தரவுத்தளச் சேவையகம்"
 msgid "Proxy"
 msgstr "பினாமி"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "வடிவமைப்பு மாயாவி"
@@ -697,7 +699,7 @@ msgstr ""
 "\"அடுத்து\" என்றால் நிறுவப்படும்,\n"
 "இல்ைலயெனில் \"தவிர்\" என்றால் நிறுவப்படாமல் வெளிச்ெசல்லும்"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "நிறுவுதலில் பிழை நேர்ந்துள்ளது"
 
@@ -761,8 +763,8 @@ msgstr "கணினியின் பெயர்:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -878,7 +880,7 @@ msgstr "மாயாவி உங்கள் FTP இணையச் சேவ�
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -959,12 +961,22 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "சம்பா வடிவமைப்பு மாயாவி"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -972,72 +984,162 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "வலையத்தளச் சேவையக வடிவமைப்பு மாயாவி"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "NFS சேவையகம்"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "NFS சேவையகம்"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்%s"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்%s"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "முதல் பெயர்"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "கடவுச்ெசால்:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "இந்த மாயாவி மின்னஞ்சல் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக "
 "வடிவமைத்துவிட்டது"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "புரவலன் பெயர்:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "பயனர் அடைவு:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "தரவுத்தளச் சேவையகம்"
@@ -1576,7 +1678,7 @@ msgid "Relay mail server"
 msgstr "மின்னஞ்சல் சேவையகத்தின் பெயர்:"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1596,9 +1698,8 @@ msgid ""
 "relay."
 msgstr "இந்த மாயாவி உங்கள் வலையமைப்பிற்கு FTP சேவையகத்ைத வடிவமைத்து தரும்"
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "தகவல்"
 
@@ -1637,11 +1738,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
-msgid "Domain:"
-msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்%s"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2434,12 +2530,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "வலையத்தளச் சேவையக வடிவமைப்பு மாயாவி"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2742,7 +2832,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "அணுகல் நிலை:"
@@ -3465,131 +3555,131 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "தரவுத்தளச் சேவையகம்"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "நீங்கள் என்ன செய்ய விரும்புகிறீர்கள்?"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "குறைந்தபட்ச IP முகவரி:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "முதல் பெயர்"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "பகிர்ந்துள்ள அைடவு"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "அச்சுப்ெபாறிகள்:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "பட்டியலை எழுது:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3597,73 +3687,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "பயனர் சேர்க்ைக"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "கணினிகளை அனுமதி"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "கணினிகளை மறுக்கவும்"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "விருப்பத்தனிப்பயன்"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "இந்த மாயாவி NFS சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "உள்ளமை வலையத்தளச் சேவையகம்:"
@@ -3915,6 +4005,14 @@ msgid "Configuring your system as Apache server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
 #, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "பயனர் அடைவு:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/tg.po b/po/tg.po
index 5dc6fe60..6569f75d 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+0800\n"
 "PO-Revision-Date: 2004-12-04 07:49+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team: Tajik\n"
@@ -41,7 +41,7 @@ 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:97
+#: ../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
@@ -51,7 +51,7 @@ msgstr "Хатогӣ."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Табрик мекунем"
 
@@ -140,32 +140,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Хатогӣ"
 
@@ -359,7 +360,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Бо нокомӣ анҷомид"
 
@@ -530,7 +531,8 @@ msgstr ""
 "Эҳтимолан ин соҳиб аллакай дар танзимоти DNS-и шумо ҳаст... барои идомадиҳӣ "
 "Оянда-ро пахш кунед"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Хатогӣ:"
 
@@ -660,7 +662,7 @@ msgstr "Хидматрасони ldap"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Намоиш додани танзимоти Ldap"
@@ -707,7 +709,7 @@ msgstr ""
 "Пахш намоед \"Оянда\" барои насб намудан ё ин ки \"Бекор кардан\" барои "
 "хориҷшавӣ"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Коргузорӣ бо нокомӣ анҷомид"
 
@@ -778,8 +780,8 @@ msgstr "Номи Соҳиби Хидматрасон:"
 msgid "Admin email:"
 msgstr "Пости электронии идоракунанда:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Воридшавии решаро иҷозат диҳед:"
 
@@ -903,7 +905,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Drakwizard-ро дубора сар диҳед ва кӯшиш кунед, ки баъзе параметрҳоро тағир "
@@ -1003,11 +1005,21 @@ msgstr ""
 "хидматрасонро танзим кунед. Ҳамин тавр коргузории Mandriva Linux дар шабака "
 "хеле осон мегардад."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Устоди батанзимдарории Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -1019,7 +1031,7 @@ msgstr ""
 "бо пуштибонии китобҳои mailbox, инчунин алоқаҳо ва дастёбӣ ба пост ба "
 "воситаи POP3 инчунин IMAP4(rev1)"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1029,40 +1041,141 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Устод нусхаи захиравии ҳамаи файлҳои "
 "танзимкуниро барои ин хидматҳо мекунад."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Марҳамат намоед ба Устоди танзими хидматрасонии Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Хидматрасони соҳиби DNS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Шумо аллакай Хидматрасони LDAP-и худро танзим кардаед"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Хидматрасони фармонбари DNS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Номи домен:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Номи домен:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Барои ҳисоби мудири хидматрасони Kolab гузарвожаро ворид кунед."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 "Гузарвожа мувофиқат намекунад ё мавҷуд нест, марҳамат карда ислоҳ кунед."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "гузарвожа"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Бори дигар гузарвожа:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Ном аввала:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Бори дигар гузарвожа:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Устод хидматрасони Kolab-ро бо параметрҳои зерин танзим мекунад"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Номи Соҳиб:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Пости домен:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1071,19 +1184,11 @@ msgstr ""
 "'мудир' бо гузарвожаи воридкардаатон дар https://127.0.0.1/kolab/admin/, "
 "ворид шавед."
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Коргузорӣ иҷро шуда истодааст"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Ба танзим даровардани хидматрасони FTP"
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Танзимкунии хидматрасони Kolab дар системаи шумо..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Хидматрасони Kolab"
 
@@ -1616,7 +1721,7 @@ msgid "Relay mail server"
 msgstr "Хидматрасони постии беруна"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1637,9 +1742,8 @@ msgstr ""
 "Ин устод ба шумо оиди танзими хидматрасони FTP-ро барои шабакаи шумо ёрӣ "
 "медиҳад."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Маълумот"
 
@@ -1679,11 +1783,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Номи домен:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2539,12 +2638,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Устоди Танзимдарории WebХидматрасон"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2853,7 +2946,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Дараҷаи пайвастшавӣ:"
@@ -3580,132 +3673,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Хидматрасони Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Чӣ кор кардан мехоҳед:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "IP адреси пастарин"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Ном аввала:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Хатогӣ, бояд феҳрист бошад."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Усули коргузорӣ:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "гузарвожа"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Чопгарҳо:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Воридшавии решаро иҷозат диҳед:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3713,73 +3806,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Вориди Корванд:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Соҳибони иҷозатшуда:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Инкори соҳибҳо:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Хосияти дигар:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Намоиш додани танзимоти Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "устод бомуввафақатиян хидматрасони NFS ба танзим дароварда шуд"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Хидматрасони Samba-и шумо ба танзим дароварда шуда истодааст..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Хидматрасони Apache"
@@ -4039,6 +4132,15 @@ msgstr ""
 "Системаи шумо ҳамчун хидматрасони Apache ба танзим дороварда шуда "
 "истодааст ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Пости домен:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Коргузорӣ иҷро шуда истодааст"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Ба танзим даровардани хидматрасони FTP"
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/tl.po b/po/tl.po
index 02b59558..b458cd16 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "Error."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Maligayang bati"
 
@@ -138,32 +138,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Error"
 
@@ -357,7 +358,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Nabigo"
 
@@ -531,7 +532,8 @@ msgstr ""
 "Tila itong host ay nasa DNS configuration mo na... pindutin ang 'Kasunod' "
 "para magpatuloy"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Error:"
 
@@ -660,7 +662,7 @@ msgstr "ldap server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Ipakita ang configuration ng Ldap"
@@ -706,7 +708,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 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Nabigo ang pag-i-install"
 
@@ -775,8 +777,8 @@ msgstr "Server Hostname:"
 msgid "Admin email:"
 msgstr "Admin email:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Payagan ang root login:"
 
@@ -897,7 +899,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Ilunsad muli ang drakwizard, at subukang baguhin ang ilang parameter."
 
@@ -992,11 +994,21 @@ msgstr ""
 "server. Para maging masyadong madali ang pag-install ng Mandriva Linux sa "
 "pamamagitan ng network."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab configuration wizard"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -1008,7 +1020,7 @@ msgstr ""
 "interface; (2) nakapamahaging address book na may provision para sa mga "
 "mailbox user at mga contact; at (3) POP3 at IMAP4 (rev1) access sa mail"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1019,40 +1031,141 @@ msgstr ""
 "backup ng lahat ng mga dati mong mga configuration file para sa mga service "
 "na ito."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Maligayang pagdating sa Kolab Groupware server configuration Wizard."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Master DNS server"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Nai-configure niyo na ang inyong Ldap Server"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Slave DNS server"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domainname:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Domainname:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Magpasok ng password para sa account ng manager ng Kolab server."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Password di-magkatugma, o null password, pakitama."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Password ulit:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Unang pangalan:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Password ulit:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Ico-configure ngayon ng wizard ang Kolab server gamit itong mga parameter"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1061,19 +1174,11 @@ msgstr ""
 "'manager', gamit ang password na ipinasok mo, sa https://127.0.0.1/kolab/"
 "admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Tumatakbo ang pag-i-install"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Ini-install ang Kolab server sa iyong sistema..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Kino-configure ang Kolab server sa iyong sistema..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -1610,7 +1715,7 @@ msgid "Relay mail server"
 msgstr "Panglabas na mail server"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1631,9 +1736,8 @@ msgstr ""
 "Itong wizard ay tutulong sa iyo na mag-configure ng FTP server para sa "
 "network mo."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Inpormasyon"
 
@@ -1673,11 +1777,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Domainname:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2536,12 +2635,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Web server configuration wizard"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2852,7 +2945,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Level ng access:"
@@ -3577,132 +3670,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba server"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Ano ang gusto mong gawin:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Pinakamababang IP address:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Unang pangalan:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Error: dapat ay isang directory."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Paraan ng pag-i-install:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Password:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Mga printer:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Payagan ang root login:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3710,73 +3803,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "User Login:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Payagan ang host:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Tanggihan ang host:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Custom option:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Ipakita ang configuration ng Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Matagumpay na na-configure ng wizard ang iyong NFS server"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Kino-configure ang Samba server mo..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache server"
@@ -4036,6 +4129,15 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Kino-configure ang sistema mo bilang Apache server ..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Mail domain:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Tumatakbo ang pag-i-install"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Ini-install ang Kolab server sa iyong sistema..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/tr.po b/po/tr.po
index b24132a3..eeb976ec 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -41,7 +41,7 @@ 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:97
+#: ../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
@@ -51,7 +51,7 @@ msgstr "Hata."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Tebrikler"
 
@@ -137,32 +137,33 @@ msgstr "dhcp kullanıyorsunuz, sunucu bu yapılandırmanızla çalışmayabilir.
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Hata"
 
@@ -356,7 +357,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Başarısız"
 
@@ -531,7 +532,8 @@ msgstr ""
 "Makine ismi zaten DNS yapılandırmanızın içinde yer almakta... devam etmek "
 "için 'İleri'ye basın"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Hata:"
 
@@ -664,7 +666,7 @@ msgstr "Samba sunucusu"
 msgid "Proxy"
 msgstr "Vekil (Proxy) sunucu"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "LDAP yapılandırma sihirbazı"
@@ -711,7 +713,7 @@ msgstr ""
 "\"Sonraki\" tuşuna basarak kurulumu başlatabilirsiniz veya\n"
 "\"İptal\" tuşuna basarak yüklemekten vazgeçebilirsiniz"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Kurulum başarısız oldu"
 
@@ -786,8 +788,8 @@ msgstr "Sunucu Makine İsmi:"
 msgid "Admin email:"
 msgstr "Yönetici e-postası:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 #, fuzzy
 msgid "Permit root login:"
 msgstr "Root girişine izin ver:"
@@ -916,7 +918,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Lütfen, Drakwizard'ı kapatıp açın ve bazı parametreleri değiştirmeyi deneyin."
@@ -1011,12 +1013,22 @@ msgstr ""
 "DHCP sunucu ve bir PXE sunucu yapılandırabilirsiniz. Yani artık Mandriva'nin "
 "ağ üzerinden yüklenmesi son derece kolay olacak."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 #, fuzzy
 msgid "Kolab configuration wizard"
 msgstr "yapılandırma sihirbazı"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -1024,72 +1036,161 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Web Sunucusu Yapılandırma Sihirbazı"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Ana DNS sunucusu"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, 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
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "İkincil DNS sunucusu"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Alanadı:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Alanadı:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 #, fuzzy
 msgid "Password again:"
 msgstr "Parola:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "İlk isim:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Parola:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Sihirbaz, açılış seçeneklerini şu parametreler doğrultusunda değiştirecek:"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Makina adı:"
 
-#: ../kolab_wizard/Kolab.pm:91
-#, fuzzy
-msgid "Mail domain:"
-msgstr "NIS Alan:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Install in progress"
-msgstr "Kurulum dizini:"
-
-#: ../kolab_wizard/Kolab.pm:106
-#, fuzzy
-msgid "Installing Kolab server on your system..."
-msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 #, fuzzy
 msgid "Kolab server"
 msgstr "Samba sunucusu"
@@ -1646,7 +1747,7 @@ msgid "Relay mail server"
 msgstr "Harici Posta sunucusu"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1667,9 +1768,8 @@ msgstr ""
 "Bu sihirbaz ağınız için bir FTP Sunucusu yapılandırmanızda size yardımcı "
 "olacaktır."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Bilgiler"
 
@@ -1709,11 +1809,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Alanadı:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2551,12 +2646,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Web Sunucusu Yapılandırma Sihirbazı"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2863,7 +2952,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Erişim seviyesi:"
@@ -3590,132 +3679,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba sunucusu"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Ne yapmak istiyorsunuz:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "En Düşük IP Adresi:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "İlk isim:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Hata bir dizin belirtmelisiniz."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Kurulum yöntemi:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Parola:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Yazıcılar:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Root girişine izin ver:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3723,73 +3812,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Kullanıcı eklenmesi"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "İzin verilen Makineler:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Reddedilmiş makinalar:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Özel seçenek:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "LDAP yapılandırma sihirbazı"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Sihirbaz, NFS sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Samba sunucunuz yapılandırılıyor....."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache web sunucusu"
@@ -4051,6 +4140,18 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Apache Web Sunucu olarak yapılandırılıyor ..."
 
 #, fuzzy
+#~ msgid "Mail domain:"
+#~ msgstr "NIS Alan:"
+
+#, fuzzy
+#~ msgid "Install in progress"
+#~ msgstr "Kurulum dizini:"
+
+#, fuzzy
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
+
+#, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."
diff --git a/po/uk.po b/po/uk.po
index 61314742..5f27980d 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.115 2005-08-31 06:36:12 fwang Exp $
+# $Id: uk.po,v 1.116 2005-09-04 06:32:04 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -39,7 +39,7 @@ 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:97
+#: ../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
@@ -49,7 +49,7 @@ msgstr "Помилка."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Поздоровляємо"
 
@@ -135,32 +135,33 @@ msgstr "Ви знаходитесь в dhcp, сервер може не прац
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Помилка"
 
@@ -351,7 +352,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Збій"
 
@@ -520,7 +521,8 @@ msgstr ""
 "Здається, ця машина вже є конфігурації DNS... натисніть \"Далі\" для "
 "продовження"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Помилка:"
 
@@ -649,7 +651,7 @@ msgstr "Сервер ldap"
 msgid "Proxy"
 msgstr "Проксі"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Показати налаштування Ldap"
@@ -695,7 +697,7 @@ msgstr ""
 "%s не встановлено\n"
 "Натисніть \"Далі\", щоб встановити, або \"Скасувати\", щоб вийти"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Встановлення завершилося невдало"
 
@@ -762,8 +764,8 @@ msgstr "Назва сервера:"
 msgid "Admin email:"
 msgstr "Admin email:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Дозволяти реєстрацію root:"
 
@@ -880,7 +882,7 @@ msgstr "Помічник успішно налаштував Ваш інтран
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Будь ласка, перезапустіть drakwizard і спробуйте змінити деякі параметри. "
@@ -973,11 +975,21 @@ msgstr ""
 "налаштувати сервер DHCP з підтримкою PXE і сервер PXE. Після цього стане "
 "дуже легко встановлювати Мандріва лінакс по мережі."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Помічник налаштування Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -989,7 +1001,7 @@ msgstr ""
 "адрес з доступом і контактами для користувачів mailbox, з доступом до пошти "
 "по POP3 і IMAP4 (rev1)"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -999,40 +1011,141 @@ msgstr ""
 "Proftpd, LDAP, Cyrus, Postfix, Imap, Saslauth. Помічник зробить резервну "
 "копію попередніх конфігураційних файлів для цих сервісів."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 "Ласкаво просимо до помічника налаштування сервера групової розробки Kolab."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Головний сервер DNS"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Сервер Ldap вже було налаштовано"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Підлеглий сервер DNS"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Назва домена:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Назва домена:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Введіть пароль для менеджера рахунку сервера Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Пароль не співпадає або порожній, будь ласка, виправте."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Пароль ще раз:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Ім'я:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Пароль ще раз:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Помічник зараз налаштує сервер Kolab з цими параметрами"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Назва машини:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Головний домен:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1040,19 +1153,11 @@ msgstr ""
 "Сервер kolab налаштовано і запущено. Зареєструйтеся з ім'ям 'manager' і "
 "паролем, який Ви ввели, за адресою https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Встановлення в процесі"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Встановлюється сервер kolab на Вашій системі..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Налаштовується сервер kolab на Вашій системі..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Сервер Kolab"
 
@@ -1582,7 +1687,7 @@ msgid "Relay mail server"
 msgstr "Зовнішній сервер пошти"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1601,9 +1706,8 @@ msgid ""
 "relay."
 msgstr "Цей Помічник допоможе Вам налаштувати FTP-сервер для Вашої мережі."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Інформація"
 
@@ -1643,11 +1747,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Назва домена:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2492,12 +2591,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Помічник налаштування веб-сервера"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2808,7 +2901,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Рівень доступу:"
@@ -3534,132 +3627,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Сервер самба"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Що Ви хочете зробити:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Найнижча IP-адреса:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Ім'я:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Помилка: повинна бути тека."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Метод встановлення:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Пароль:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Друкарки:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Дозволяти реєстрацію root:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3667,73 +3760,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Ім'я користувача:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Дозволити машини:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Заборонити машини:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Типовий параметр:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Показати налаштування Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Помічник успішно налаштував Ваш NFS-сервер"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Налаштування сервера Samba..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Сервер Апачі"
@@ -3978,6 +4071,15 @@ msgstr "Сервер Апачі"
 msgid "Configuring your system as Apache server ..."
 msgstr "Налаштовую Вашу систему в якості сервера Апачі..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Головний домен:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Встановлення в процесі"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Встановлюється сервер kolab на Вашій системі..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/uz.po b/po/uz.po
index 69304ae8..ca71788f 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr "Хато."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Табриклаймиз"
 
@@ -128,32 +128,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Хато"
 
@@ -325,7 +326,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Муваффақиятсиз тугади"
 
@@ -474,7 +475,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Хато:"
 
@@ -597,7 +599,7 @@ msgstr "Kolab сервери"
 msgid "Proxy"
 msgstr "Прокси"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Samba серверини мослаш учун ёрдамчи"
@@ -643,7 +645,7 @@ msgstr ""
 "%s ўрнатилмаган\n"
 "Ўрнатиш учун \"Кейинги\" ёки чиқиш учун \"Бекор қилиш\" тугмасини босинг"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
 
@@ -707,8 +709,8 @@ msgstr "Сервернинг номи:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -820,7 +822,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -897,11 +899,21 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab серверини мослаш учун ёрдамчи"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -909,64 +921,154 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Асосий DNS сервери"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Ёрдамчи Samba серверингизни муваффақиятли мослади."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Иккиламчи DNS сервери"
+
+#: ../kolab_wizard/Kolab.pm:98
+msgid "Kolab Domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Махфий сўз:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Махфий сўз (яна):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Исми:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Махфий сўз (яна):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Ёрдамчи Kolab серверини қуйидаги параметрлар билан мослайди"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Компьютернинг номи:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Ўрнатиш давом этмоқда"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Kolab сервери мосланмоқда..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab сервери мосланмоқда..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab сервери"
 
@@ -1479,7 +1581,7 @@ msgid "Relay mail server"
 msgstr "Ташқи хат-хабар сервери"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1498,9 +1600,8 @@ msgid ""
 "relay."
 msgstr "Бу ёрдамчи тармоғингиз учун FTP серверини мослашда сизга ёрдам беради."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Маълумот"
 
@@ -1538,10 +1639,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr ""
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2302,12 +2399,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Веб серверини мослаш учун ёрдамчи"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2605,7 +2696,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr ""
 
@@ -3311,129 +3402,129 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba сервери"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Сиз нима қилмоқчисиз:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Энг кичкина IP рақам:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Исми:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Махфий сўз:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Принтерлар:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3442,70 +3533,70 @@ msgid ""
 msgstr ""
 
 # M:
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Фойдаланувчи:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Samba серверини мослаш учун ёрдамчи"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Ёрдамчи NFS серверни муваффақиятли мослади."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Samba сервери мосланмоқда..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache сервери"
@@ -3737,6 +3828,12 @@ msgstr "Apache сервери"
 msgid "Configuring your system as Apache server ..."
 msgstr "Тизим Apache сервер сифатида мосланмоқда..."
 
+#~ msgid "Install in progress"
+#~ msgstr "Ўрнатиш давом этмоқда"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Kolab сервери мосланмоқда..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 7949715f..550ebfbc 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -35,7 +35,7 @@ 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:97
+#: ../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
@@ -45,7 +45,7 @@ msgstr "Xato."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Tabriklaymiz"
 
@@ -129,32 +129,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Xato"
 
@@ -330,7 +331,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Muvaffaqiyatsiz tugadi"
 
@@ -479,7 +480,8 @@ msgid ""
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Xato:"
 
@@ -602,7 +604,7 @@ msgstr "Kolab serveri"
 msgid "Proxy"
 msgstr "Proksi"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Samba serverini moslash uchun yordamchi"
@@ -649,7 +651,7 @@ msgstr ""
 "O'rnatish uchun \"Keyingi\" yoki chiqish uchun \"Bekor qilish\" tugmasini "
 "bosing"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 
@@ -714,8 +716,8 @@ msgstr "Serverning nomi:"
 msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr ""
 
@@ -828,7 +830,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
@@ -905,11 +907,21 @@ msgid ""
 "server, and drakwizard DHCP to configure a DHCPD server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab serverini moslash uchun yordamchi"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -917,64 +929,154 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
 "configuration files for these services."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Asosiy DNS serveri"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Yordamchi Samba serveringizni muvaffaqiyatli mosladi."
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Ikkilamchi DNS serveri"
+
+#: ../kolab_wizard/Kolab.pm:98
+msgid "Kolab Domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Maxfiy so'z (yana):"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Ismi:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Maxfiy so'z (yana):"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Yordamchi Kolab serverini quyidagi parametrlar bilan moslaydi"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Kompyuterning nomi:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "O'rnatish davom etmoqda"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Kolab serveri moslanmoqda..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab serveri moslanmoqda..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab serveri"
 
@@ -1490,7 +1592,7 @@ msgid "Relay mail server"
 msgstr "Tashqi xat-xabar serveri"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1510,9 +1612,8 @@ msgid ""
 msgstr ""
 "Bu yordamchi tarmog'ingiz uchun FTP serverini moslashda sizga yordam beradi."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Ma'lumot"
 
@@ -1550,10 +1651,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr ""
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2316,12 +2413,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Veb serverini moslash uchun yordamchi"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2619,7 +2710,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr ""
 
@@ -3330,129 +3421,129 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba serveri"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Siz nima qilmoqchisiz:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Eng kichkina IP raqam:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Ismi:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Maxfiy so'z:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Printerlar:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3461,70 +3552,70 @@ msgid ""
 msgstr ""
 
 # M:
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Foydalanuvchi:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Samba serverini moslash uchun yordamchi"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Yordamchi NFS serverni muvaffaqiyatli mosladi."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Samba serveri moslanmoqda..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Apache serveri"
@@ -3758,6 +3849,12 @@ msgstr "Apache serveri"
 msgid "Configuring your system as Apache server ..."
 msgstr "Tizim Apache server sifatida moslanmoqda..."
 
+#~ msgid "Install in progress"
+#~ msgstr "O'rnatish davom etmoqda"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Kolab serveri moslanmoqda..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/vi.po b/po/vi.po
index 213c45bf..62e38b82 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -39,7 +39,7 @@ 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:97
+#: ../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
@@ -49,7 +49,7 @@ msgstr "Lỗi."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Chúc mừng"
 
@@ -136,32 +136,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Lỗi"
 
@@ -347,7 +348,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Lỗi"
 
@@ -517,7 +518,8 @@ msgid ""
 "continue"
 msgstr "Có lẽ host đó đã có trong cấu hình DNS... nhấn Tiếp Theo để tiếp tục"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Lỗi:"
 
@@ -643,7 +645,7 @@ msgstr "ldap server"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "OpenSSH daemon configuration"
 msgstr "Hiển thị cấu hình Ldap"
@@ -689,7 +691,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 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Cài đặt không được"
 
@@ -755,8 +757,8 @@ msgstr "Hostname máy chủ:"
 msgid "Admin email:"
 msgstr "Admin email:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Cho phép đăng nhập root:"
 
@@ -871,7 +873,7 @@ msgstr "Đồ thuật đã hoàn thành cấu hình máy chủ FTP cho Intranet/
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Hãy khởi chạy lại drakwizard và thử thay đổi một vài tham số."
 
@@ -962,11 +964,21 @@ msgstr ""
 "hình DHCP  server có hỗ trợ PXE và máy chủ PXE. Do đó sẽ rất dễ cài đặt "
 "Mandriva Linux qua mạng."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Đồ Thuật Cấu Hình Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -978,7 +990,7 @@ msgstr ""
 "người dùng mailbox cũng như các địa chỉ liên lạc, truy cập mail POP3 và IMAP4"
 "(rev1)."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -988,39 +1000,140 @@ msgstr ""
 "Postfix, Imap, Saslauth. Đồ thuật sẽ sao lưu lại toàn bộ các tập tin cấu "
 "hình trước đây của các dịch vụ này."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Chào Mừng Đồ Thuật Cấu hình Máy Chủ Kolab Groupware!"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Máy chủ DNS chính"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, 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
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Máy chủ DNS phụ"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Tên miền:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+#, fuzzy
+msgid "Domain:"
+msgstr "Tên miền:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Hãy nhập mật khẩu để quản trị tài khoản cho Kolab server."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Mật khẩu không khớp hoặc để trống, hãy kiểm tra lại."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Nhập lại mật khẩu:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Tên đầu:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Nhập lại mật khẩu:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Bây giờ đồ thuật sẽ cấu hình máy chủ Kolab với các tham số này"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Mail domain:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+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/"
@@ -1028,19 +1141,11 @@ 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:106
-msgid "Install in progress"
-msgstr "Đang cài đặt"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Đang cài đặt máy chủ Kolab..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Đang cấu hình máy chủ Kolab...."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -1562,7 +1667,7 @@ msgid "Relay mail server"
 msgstr "External mail server"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr ""
 
@@ -1581,9 +1686,8 @@ msgid ""
 "relay."
 msgstr "Đồ thuật này giúp cấu hình máy chủ FTP."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Thông tin"
 
@@ -1623,11 +1727,6 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
 #, fuzzy
-msgid "Domain:"
-msgstr "Tên miền:"
-
-#: ../postfix_wizard/Postfix.pm:159
-#, fuzzy
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2452,12 +2551,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Đồ Thuật Cấu hình Máy Chủ WEB"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2766,7 +2859,7 @@ msgstr ""
 msgid "Max log size:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 #, fuzzy
 msgid "Log level:"
 msgstr "Mức độ truy cập:"
@@ -3485,132 +3578,132 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Máy chủ Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 #, fuzzy
 msgid "Which type of configuration do you you want to do:"
 msgstr "Cái bạn muốn làm là:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 #, fuzzy
 msgid "Listen address:"
 msgstr "Địa chỉ IP thấp nhất:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 #, fuzzy
 msgid "Port number:"
 msgstr "Tên đầu:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 #, fuzzy
 msgid "Port should be a number"
 msgstr "Lỗi: nên là thư mục."
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 #, fuzzy
 msgid "Authentication Method"
 msgstr "Phương thức cài đặt:"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Mật khẩu:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 #, fuzzy
 msgid "Print motd:"
 msgstr "Máy in:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 #, fuzzy
 msgid "Print last log:"
 msgstr "Cho phép đăng nhập root:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3618,73 +3711,73 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 #, fuzzy
 msgid "User Login options"
 msgstr "Đăng nhập người dùng:"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 #, fuzzy
 msgid "Allow users:"
 msgstr "Cho phép host:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 #, fuzzy
 msgid "Deny users:"
 msgstr "Từ chối host:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 #, fuzzy
 msgid "Compression:"
 msgstr "Tùy chọn của người dùng:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 #, fuzzy
 msgid "Summary of OpenSSH configuration."
 msgstr "Hiển thị cấu hình Ldap"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 #, fuzzy
 msgid "The wizard successfully configured your SSH server."
 msgstr "Đồ thuật đã hoàn thành cấu hình máy chủ NFS của bạn"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "Configuring your OpenSSH server..."
 msgstr "Đang cấu hình máy chủ Samba..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 #, fuzzy
 msgid "OpenSSH server"
 msgstr "Máy chủ Apache"
@@ -3931,6 +4024,15 @@ msgstr "Máy chủ Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Cấu hình hệ thống làm máy chủ Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Mail domain:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Đang cài đặt"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Đang cài đặt máy chủ Kolab..."
+
 #, fuzzy
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
diff --git a/po/wa.po b/po/wa.po
index 56734562..d7d8f96a 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-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "Aroke."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Complumints"
 
@@ -136,32 +136,33 @@ msgstr ""
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Aroke"
 
@@ -353,7 +354,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Berwete"
 
@@ -528,7 +529,8 @@ msgstr ""
 "I shonnreut ki ci lodjoe chal est ddja dins vost apontiaedje DNS... clitchîz "
 "so shuvant po continouwer"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Aroke:"
 
@@ -653,7 +655,7 @@ msgstr "Sierveu LDAP"
 msgid "Proxy"
 msgstr "Procsi"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "Apontiaedje do démon OpenSSH"
 
@@ -698,7 +700,7 @@ msgstr ""
 "%s n' est nén astalé\n"
 "Clitchîz so «Shuvant» po l' astaler ou so «Rinoncî» po cwiter"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "L' astalaedje a fwait berwete"
 
@@ -765,8 +767,8 @@ msgstr "No do sierveu:"
 msgid "Admin email:"
 msgstr "Emile do manaedjeu:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Permete l' elodjaedje di root:"
 
@@ -884,7 +886,7 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Renondez l' macrea, et s' sayîz d' candjî kékes parametes."
 
@@ -973,11 +975,21 @@ msgstr ""
 "Eployîz drakpxelinux po-z apontî vosse sierveu PXE, eyet l' macrea DHCP po-z "
 "apontyî l' sierveu DHCP."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Macrea d' apontiaedje di Kolab"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+msgid "Master kolab server"
+msgstr "Sierveu DNS mwaisse"
+
+#: ../kolab_wizard/Kolab.pm:61
+#, fuzzy
+msgid "Slave kolab server"
+msgstr "Sierveu DNS esclåve"
+
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
 "features include: a web administration interface, a shared address book with "
@@ -990,7 +1002,7 @@ msgstr ""
 "d' adresses pårtaedjî avou l' possbilité d' aveur des boesses ås letes eyet "
 "accès åzès emiles vie POP3 ou co IMAP4."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -1000,42 +1012,144 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Li macrea frè-st ene copeye di såvrité des "
 "vîs apontiaedjes k' i gn a ddja po ces siervices la."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 "Bénvnowe å macrea d' apontiaedje do sierveu d' ovraedje e groupe Kolab."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Sierveu DNS mwaisse"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Vos avoz ddja apontyî vosse sierveu Ldap"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Sierveu DNS esclåve"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Dominne:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Dominne:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Tapez l' sicret pol conte di manaedjeu do sierveu Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 "Les screts n' corespondèt nén, oudonbén end a onk k' est vude, coridjîz s' i "
 "vs plait."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Ritapez l' sicret:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Organizåcion LDAP:"
+
+#: ../kolab_wizard/Kolab.pm:139
+#, fuzzy
+msgid "Organisational unit:"
+msgstr "Organizåcion LDAP:"
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Ritapez l' sicret:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Li macrea va asteure apontyî li sierveu Kolab avou ces parametes ci:"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "No do lodjoe:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "Dominne d' emilreye:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+#, fuzzy
+msgid "Organisationnal unit:"
+msgstr "Organizåcion LDAP:"
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1044,19 +1158,11 @@ msgstr ""
 "«manager» (manaedjeu), avou li scret ki vos avoz dné, sol hårdêye "
 "https://127.0.0.1/kolab/admin/."
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Fijhant l' astalaedje"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Astalaedje do sierveu Kolab so vosse sistinme..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Apontiaedje do sierveu Kolab so vosse sistinme..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Sierveu Kolab"
 
@@ -1594,7 +1700,7 @@ msgid "Relay mail server"
 msgstr "Sierveu d' emilaedje di relais"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Apurdisse - tchuzes classikes"
 
@@ -1614,9 +1720,8 @@ msgstr ""
 "Ci macrea chal vos aidrè a-z apontyî on sierveu d' emilaedje Postfix "
 "oudonbén on relais Postfix."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Informåcion"
 
@@ -1655,10 +1760,6 @@ msgstr ""
 "d' emilaedje ci. eg: myhostname = mail.walon.org"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Dominne:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2508,12 +2609,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Macrea d' apontiaedje do sierveu Samba"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2806,7 +2901,7 @@ msgstr "Fitchî djournå:"
 msgid "Max log size:"
 msgstr "Grandeu macsimom do djournå:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Livea do djournå:"
 
@@ -3498,74 +3593,74 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Pårtaedje di ridants måjhon di Samba"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Sipepieus - avanceyès tchuzes di ssh"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Kéne sôre d' apontiaedje voloz vs fé:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "Sierveu SSH, tchuzes classikes"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Adresse di schoûtaedje:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Especifyî l' adresse locåle ki l' sierveu sshd î doet schoûter."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Limero d' pôrt:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr ""
 "Especifyî l' limero do pôrt ki l' sierveu sshd î doet schoûter. Li prémetou "
 "pôrt c' est l' 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Li pôrt doet esse diné come on limero"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Metôde d' otintifiaedje"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 #, fuzzy
 msgid "Password auth:"
 msgstr "Sicret:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Passer houte do fitchî rhosts:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Permete les vudes sicrets:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Djournå"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
@@ -3573,54 +3668,54 @@ msgstr ""
 "Livea do djournå: dene li livea di spepieusté a-z eployî po les messaedjes "
 "do sierveu sshd a mete e djournå."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Tchuzes d' elodjaedje"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Håyner «motd»:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Håyner l' informåcion do dierin elodjaedje:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3628,19 +3723,19 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Tchuzes d' elodjaedje des uzeus"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Permete les uzeus:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3648,11 +3743,11 @@ msgstr ""
 "Si specifyî, l' elodjaedje n' est possibe ki seulmint po les nos d' uzeus ki "
 "corespondèt a onk des patrons. eg: erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Rifuzer les uzeus:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3660,13 +3755,13 @@ msgstr ""
 "L' elodjaedje n' est nén permetou po les nos d' uzeus ki corespondèt a onk "
 "des patrons. eg: pirate guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 "Sitrindaedje: specifyî si l' sitrindjaedje (compression) do trafik est "
 "permetou."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3678,27 +3773,27 @@ msgstr ""
 "l' minme redjibler l' trafik X11, la k' les uzeus polèt todi astaler des "
 "redjibleus da zels."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Sitrindaedje:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "Redjiblaedje X11:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "Rascourti d' l' apontiaedje OpenSSH."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Li macrea a-st apontyî comifåt vosse sierveu OpenSSH."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "Apontiaedje do sierveu OpenSSH da vosse..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "Sierveu OpenSSH"
 
@@ -3950,6 +4045,15 @@ msgstr "Sierveu waibe apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu waibe Apache..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "Dominne d' emilreye:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Fijhant l' astalaedje"
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Astalaedje do sierveu Kolab so vosse sistinme..."
+
 #~ msgid "Show dot files:"
 #~ msgstr "Mostrer les fitchîs-pont:"
 
@@ -4212,9 +4316,6 @@ msgstr "Apontiaedje di vosse sistinme come sierveu waibe Apache..."
 #~ msgid "You must enter a suffix for LDAP."
 #~ msgstr "Vos dvoz dner ene cawete po LDAP."
 
-#~ msgid "Organisation LDAP:"
-#~ msgstr "Organizåcion LDAP:"
-
 #~ msgid "The wizard successfully added a user in LDAP"
 #~ msgstr "Li macrea a radjouté comifåt èn uzeu LDAP."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c60d54a5..4ce7b14e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-30 20:30+0200\n"
-"PO-Revision-Date: 2005-07-25 20:24+0800\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ 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:97
+#: ../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
@@ -47,7 +47,7 @@ msgstr "出错。"
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "恭喜"
 
@@ -127,32 +127,33 @@ msgstr "您在使用 dhcp，服务器可能无法按照您的配置工作。"
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "出错"
 
@@ -331,7 +332,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "失败"
 
@@ -489,7 +490,8 @@ msgid ""
 "continue"
 msgstr "看起来主机已经在您的 DNS 配置中了...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "错误:"
 
@@ -610,7 +612,7 @@ msgstr "ldap 服务器"
 msgid "Proxy"
 msgstr "代理服务器"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH 守护程序配置"
 
@@ -655,7 +657,7 @@ msgstr ""
 "%s 未安装\n"
 "单击“下一步”安装，单击“取消”退出"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "安装失败"
 
@@ -717,8 +719,8 @@ msgstr "服务器名称:"
 msgid "Admin email:"
 msgstr "管理员电子邮件:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "允许 root 登录:"
 
@@ -825,7 +827,7 @@ msgstr "向导成功地配置了您的 Intranet/Internet FTP 服务器"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "请重新调用配置向导，然后试着更新一些参数。"
 
@@ -905,11 +907,19 @@ msgstr ""
 "了。这样，通过网络安装 Linux 将非常简单。使用 drakpxelinux 可配置您的 PXE 服"
 "务器，而 drakwizard DHCP 可配置 DHCPD 服务器。"
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolab 配置向导"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -920,7 +930,7 @@ msgstr ""
 "面，一个提供给邮箱用户和联系人的共享地址簿，以及通过 POP3 和 IMAP4(rev1)访问"
 "邮件的功能。"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -929,39 +939,137 @@ msgstr ""
 "警告: Kolab 需要配置许多其它服务: Proftpd、LDAP、Cyrus、Postfix、Imap、"
 "Saslauth。向导将会为您先行备份这些服务的配置文件。"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "欢迎使用 Kolab 群件服务器配置向导。"
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
-msgstr "输入 Kolab 服务器管理员账户的密码。"
+#: ../kolab_wizard/Kolab.pm:71
+msgid "Master or slave Kolab server"
+msgstr "主或从 Kolab 服务器"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr "您选择了主 Kolab 服务器"
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+"输入从 kolab 服务器的全称主机名，如 thishost.domain.tld (如果没有的话，请留空)。"
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid "You choose to configure a master Kolab server."
+msgstr "您选择配置主 Kolab 服务器。"
+
+#: ../kolab_wizard/Kolab.pm:93
+msgid "Slave kolab server:"
+msgstr "从 kolab 服务器:"
+
+#: ../kolab_wizard/Kolab.pm:98
+msgid "Kolab Domain"
+msgstr "Kolab 域"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+"请输入您的邮件域 - 如果您不知道您的邮件域，请使用上面的全程域名。Kolab 的主邮件地址"
+"将会是 user@yourdomain"
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "域名:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr "您需要有 Kolab 域"
+
+#: ../kolab_wizard/Kolab.pm:114
+msgid "Enter password for the 'manager' account of Kolab server."
+msgstr "输入 Kolab 服务器管理员账户“manager”的密码。"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "密码不相配，或者密码为空，请纠正。"
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "密码:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "重输密码:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr "输入组织名称和组织单元"
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+msgid "Organisation name:"
+msgstr "组织名:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr "组织单元:"
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr "您需要输入组织名称和组织单元"
+
+#: ../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 可以创建并管理颁发中心，您可以使用该中心创建在 Kolab 环境内使用的 SSL 证书。"
+
+#: ../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 ""
+"如果您的 Kolab 服务器已经有 CA 和证书的话，可以选择跳过此步。"
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr "请输入 CA 的密码句，以及 RSA 密钥的密码句。"
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr "CA 密码句:"
+
+#: ../kolab_wizard/Kolab.pm:186
+msgid "CA passphrase again:"
+msgstr "重输 CA 密码句:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr "RSA 密钥密码句:"
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "向导现在将用此参数配置 Kolab 服务器"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "主机名:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "邮件域名:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr "组织单元:"
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr "带 CA"
+
+#: ../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/"
@@ -969,19 +1077,11 @@ msgstr ""
 "kolab 服务器现已配置并运行起来了。请在 https://127.0.0.1/kolab/admin/ 以用户"
 "名“manager”及您输入的密码登录"
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "安装进行中"
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "正在您的系统中安装 Kolab 服务器..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 Kolab 服务器..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolab 服务器"
 
@@ -1485,7 +1585,7 @@ msgid "Relay mail server"
 msgstr "转发邮件服务器"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "新手 - 经典选项"
 
@@ -1504,9 +1604,8 @@ msgid ""
 msgstr ""
 "此向导将帮助您在网络中配置 Postfix 邮件服务器或 Postfix 邮件转发服务器。"
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "信息"
 
@@ -1543,10 +1642,6 @@ msgid ""
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "域名:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2330,14 +2425,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Samba 服务器配置向导"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"如果您先前设置过 Samba 服务器。此向导将会重新读取您的旧配置，然后显示您所选择"
-"的 Samba 服务器类型"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2643,7 +2730,7 @@ msgstr "日志文件:"
 msgid "Max log size:"
 msgstr "日志最大大小:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "日志级别:"
 
@@ -3145,18 +3232,17 @@ msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:449
 msgid "WARNING"
-msgstr ""
+msgstr "警告"
 
 #: ../samba_wizard/Sambashare.pm:465
 msgid "If you don't want to use one of this options, leave it blank."
 msgstr "如果您不想使用此选项，请将其留空。"
 
 #: ../samba_wizard/Sambashare.pm:475
-#, fuzzy
 msgid ""
 "Specifies a list of users that have read-only access to a writable share. "
 "ie: aginies"
-msgstr "指定"
+msgstr ""
 
 #: ../samba_wizard/Sambashare.pm:476
 msgid "Specifie a user that have read-write access to a share. ie: guibo"
@@ -3260,9 +3346,8 @@ msgid "Comment for this share:"
 msgstr "此共享的注释:"
 
 #: ../samba_wizard/Sambashare.pm:610
-#, fuzzy
 msgid "Summary of modify homes share"
-msgstr "修改共享概要"
+msgstr "修改主目录共享概要"
 
 #: ../samba_wizard/Sambashare.pm:623
 msgid "Summary of add a user share"
@@ -3316,125 +3401,124 @@ msgstr "无法创建 %s。请检查为何向导无法创建此目录。"
 msgid "Samba homes share"
 msgstr "Samba 主目录共享"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "专家 - 高级 ssh 选项"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "您想要执行何种配置:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSH 服务器，经典选项"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "监听地址:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "指定 sshd 应监听的本地地址。"
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "端口号:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "请指定 sshd 应监听的端口号。默认为 22。"
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "端口号应该是数字"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "身份验证方式"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "RSA 验证:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "公钥验证:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "验证密钥文件:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "密码验证:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "忽略 rhosts 文件:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "允许空密码:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "日志"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "登录选项"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
 "seconds."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:141
-#, fuzzy
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
-msgstr "打印机:"
+msgstr "打印 motd:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "打印上次登录:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3442,66 +3526,66 @@ msgid ""
 "directory or files world-writable"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "用户登录选项"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "严格模式:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "允许用户:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "禁止的用户:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
 "as users can always install their own forwarders."
 msgstr ""
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "压缩:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11 转发:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "OpenSSH 配置概要。"
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "向导成功地配置了您的 SSH 服务器。"
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "正在配置您的 OpenSSH 服务器..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSH 服务器"
 
@@ -3736,24 +3820,3 @@ msgstr "Apache 服务器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
 
-#~ msgid ""
-#~ "If you really want to add this this share, click the Next button or use "
-#~ "the Back button."
-#~ msgstr ""
-#~ "如果您真的像要添加此共享，请单击“下一步”按钮或使用“上一步”按钮来修改。"
-
-#, fuzzy
-#~ msgid ""
-#~ "It seems that you hadn't setup a Samba server. Please setup a Samba "
-#~ "server with Samba wizard before manage your share."
-#~ msgstr ""
-#~ "似乎您没有设置 Samba 服务器。请在管理您的共享之前先设置 Samba 服务器。"
-
-#~ msgid "Please enter a Comment for this share."
-#~ msgstr "请输入此共享的注释。"
-
-#~ msgid "Show dot files:"
-#~ msgstr "显示点文件:"
-
-#~ msgid "OpenSSH SSH daemon configuration"
-#~ msgstr "OpenSSH SSH 守护程序配置"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 84d5ab27..525f0fa8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-30 20:30+0200\n"
+"POT-Creation-Date: 2005-09-04 14:18+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"
@@ -34,7 +34,7 @@ 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:97
+#: ../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
@@ -44,7 +44,7 @@ msgstr "Viga."
 #: ../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:187 ../web_wizard/Apache.pm:141
+#: ../sshd_wizard/Sshd.pm:189 ../web_wizard/Apache.pm:141
 msgid "Congratulations"
 msgstr "Õnnitlused"
 
@@ -131,32 +131,33 @@ msgstr "Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
 #: ../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:111 ../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:88
-#: ../sshd_wizard/Sshd.pm:145 ../web_wizard/Apache.pm:120
+#: ../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:120
 msgid "Error"
 msgstr "Viga"
 
@@ -342,7 +343,7 @@ 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:193 ../web_wizard/Apache.pm:146
+#: ../sshd_wizard/Sshd.pm:195 ../web_wizard/Apache.pm:146
 msgid "Failed"
 msgstr "Ebaõnnestus"
 
@@ -512,7 +513,8 @@ msgstr ""
 "Paistab, et see masin on juba DNS-seadistuses... vajutage jätkamiseks nupule "
 "\"Järgmine\""
 
-#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:121
+#: ../kolab_wizard/Kolab.pm:171 ../kolab_wizard/Kolab.pm:175
 msgid "Error:"
 msgstr "Viga:"
 
@@ -637,7 +639,7 @@ msgstr "LDAP-server"
 msgid "Proxy"
 msgstr "Puhverserver"
 
-#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:68
+#: ../drakwizard.pl:55 ../sshd_wizard/Sshd.pm:70
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH deemoni seadistamine"
 
@@ -683,7 +685,7 @@ msgstr ""
 "Klõpsake paigaldamiseks nupule \"Järgmine\" või \"Loobu\", kui soovite "
 "loobuda"
 
-#: ../drakwizard.pl:167 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:167
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
@@ -745,8 +747,8 @@ msgstr "Serveri nimi:"
 msgid "Admin email:"
 msgstr "Administraatori e-posti aadress:"
 
-#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:83
-#: ../sshd_wizard/Sshd.pm:179
+#: ../ftp_wizard/Proftpd.pm:106 ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:181
 msgid "Permit root login:"
 msgstr "Administraatori sisselogimise lubamine:"
 
@@ -856,7 +858,7 @@ msgstr "Nõustaja seadistas edukalt intraneti/Interneti FTP-serveri"
 #: ../ftp_wizard/Proftpd.pm:174 ../postfix_wizard/Postfix.pm:278
 #: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:356
 #: ../samba_wizard/Sambaprint.pm:154 ../samba_wizard/Sambashare.pm:685
-#: ../sshd_wizard/Sshd.pm:194
+#: ../sshd_wizard/Sshd.pm:196
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
 
@@ -939,11 +941,21 @@ msgstr ""
 "drakpxelinuxit ning DHCP-serveri seadistamiseks drakwizardi vastavat "
 "tööriista."
 
-#: ../kolab_wizard/Kolab.pm:40
+#: ../kolab_wizard/Kolab.pm:42
 msgid "Kolab configuration wizard"
 msgstr "Kolabi seadistamise nõustaja"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:60
+#, fuzzy
+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 "
 "features include: a web administration interface, a shared address book with "
@@ -955,7 +967,7 @@ msgstr ""
 "kasutajatele kui kontaktidele ning nii POP3 kui IMAP4 (rev1) kirjade "
 "vastuvõtmiseks"
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -965,39 +977,139 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth). Nõustaja teeb Teie nende teenuste "
 "varasematest konfiguratsioonifailidest varukoopia."
 
-#: ../kolab_wizard/Kolab.pm:56
+#: ../kolab_wizard/Kolab.pm:66
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Tere tulemast kasutama Kolabi grupitööserveri seadistamise nõustajat."
 
-#: ../kolab_wizard/Kolab.pm:70
-msgid "Enter password for the manager account of Kolab server."
+#: ../kolab_wizard/Kolab.pm:71
+#, fuzzy
+msgid "Master or slave Kolab server"
+msgstr "Esmane nimeserver"
+
+#: ../kolab_wizard/Kolab.pm:87
+msgid "You choose a Master Kolab server"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid ""
+"Enter fully qualified hostname of slave kolab server e.g. thishost.domain."
+"tld (leave empty if none)."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+#, fuzzy
+msgid "You choose to configure a master Kolab server."
+msgstr "Te olete juba seadistanud oma LDAP-serveri"
+
+#: ../kolab_wizard/Kolab.pm:93
+#, fuzzy
+msgid "Slave kolab server:"
+msgstr "Teisene nimeserver"
+
+#: ../kolab_wizard/Kolab.pm:98
+#, fuzzy
+msgid "Kolab Domain"
+msgstr "Domeen:"
+
+#: ../kolab_wizard/Kolab.pm:98
+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 ""
+
+#: ../kolab_wizard/Kolab.pm:103 ../kolab_wizard/Kolab.pm:197
+#: ../kolab_wizard/Kolab.pm:210 ../postfix_wizard/Postfix.pm:159
+msgid "Domain:"
+msgstr "Domeen:"
+
+#: ../kolab_wizard/Kolab.pm:108
+msgid "You need a Kolab domain"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:114
+#, fuzzy
+msgid "Enter password for the 'manager' account of Kolab server."
 msgstr "Sisestage Kolabi serveri haldurikonto parool."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:121 ../kolab_wizard/Kolab.pm:171
+#: ../kolab_wizard/Kolab.pm:175
 msgid "Password mismatch, or null password, please correct."
 msgstr "Parool ei ole õige või jäi andmata, palun parandage viga."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
+#: ../kolab_wizard/Kolab.pm:126 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../kolab_wizard/Kolab.pm:81
+#: ../kolab_wizard/Kolab.pm:127
 msgid "Password again:"
 msgstr "Parool teist korda:"
 
-#: ../kolab_wizard/Kolab.pm:86
+#: ../kolab_wizard/Kolab.pm:132
+msgid "Enter organisation name and organisational unit"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:138 ../kolab_wizard/Kolab.pm:199
+#: ../kolab_wizard/Kolab.pm:212
+#, fuzzy
+msgid "Organisation name:"
+msgstr "Eesnimi:"
+
+#: ../kolab_wizard/Kolab.pm:139
+msgid "Organisational unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:143
+msgid "You need to enter an Organisation name and an organisational unit"
+msgstr ""
+
+#: ../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_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 ""
+
+#: ../kolab_wizard/Kolab.pm:168
+msgid "Enter the passpahre for CA, and the passphrase for the RSA key."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:185
+msgid "CA passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:186
+#, fuzzy
+msgid "CA passphrase again:"
+msgstr "Parool teist korda:"
+
+#: ../kolab_wizard/Kolab.pm:188 ../kolab_wizard/Kolab.pm:189
+msgid "RSA key passphrase:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:194 ../kolab_wizard/Kolab.pm:207
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Nõustaja seadistab nüüd Kolabi serveri järgmiselt:"
 
-#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:158
+#: ../kolab_wizard/Kolab.pm:196 ../kolab_wizard/Kolab.pm:209
+#: ../postfix_wizard/Postfix.pm:158
 msgid "Hostname:"
 msgstr "Masina nimi:"
 
-#: ../kolab_wizard/Kolab.pm:91
-msgid "Mail domain:"
-msgstr "E-posti domeen:"
+#: ../kolab_wizard/Kolab.pm:200 ../kolab_wizard/Kolab.pm:213
+msgid "Organisationnal unit:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:201
+msgid "With CA"
+msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:97
+#: ../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/"
@@ -1006,19 +1118,11 @@ msgstr ""
 "(manager) aadressil https://127.0.0.1/kolab/admin/, kasutades äsja "
 "sisestatud parooli."
 
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Install in progress"
-msgstr "Paigaldamine..."
-
-#: ../kolab_wizard/Kolab.pm:106
-msgid "Installing Kolab server on your system..."
-msgstr "Kolabi serveri paigaldamine Teie süsteemi..."
-
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Configuring Kolab server on your system..."
 msgstr "Teie süsteemi seadistamine Kolabi serveriks..."
 
-#: ../kolab_wizard/Kolab.pm:128
+#: ../kolab_wizard/Kolab.pm:236 ../kolab_wizard/Kolab.pm:242
 msgid "Kolab server"
 msgstr "Kolabi server"
 
@@ -1543,7 +1647,7 @@ msgid "Relay mail server"
 msgstr "E-posti edastusserver"
 
 #: ../postfix_wizard/Postfix.pm:108 ../samba_wizard/Sambashare.pm:70
-#: ../sshd_wizard/Sshd.pm:62
+#: ../sshd_wizard/Sshd.pm:64
 msgid "Newbie - classical options"
 msgstr "Algaja - klassikalised valikud"
 
@@ -1563,9 +1667,8 @@ msgstr ""
 "See nõustaja aitab seadistada Teie Postfixi e-posti serveri või Postfixi e-"
 "posti edastusserveri."
 
-#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Samba.pm:99
-#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:111
-#: ../samba_wizard/Sambashare.pm:220
+#: ../postfix_wizard/Postfix.pm:121 ../samba_wizard/Sambaprint.pm:69
+#: ../samba_wizard/Sambashare.pm:111 ../samba_wizard/Sambashare.pm:220
 msgid "Information"
 msgstr "Info"
 
@@ -1607,10 +1710,6 @@ msgstr ""
 "nt. myhostname = minu_masinanimi"
 
 #: ../postfix_wizard/Postfix.pm:159
-msgid "Domain:"
-msgstr "Domeen:"
-
-#: ../postfix_wizard/Postfix.pm:159
 msgid ""
 "The mydomain parameter specifies the local internet domain name. ie: "
 "mydomain = mydomain"
@@ -2448,14 +2547,6 @@ msgstr ""
 msgid "Samba server configuration Wizard"
 msgstr "Veebiserveri seadistamise nõustaja"
 
-#: ../samba_wizard/Samba.pm:99
-msgid ""
-"It seems you previously setup a Samba server. This wizard will re-read your "
-"old configuration, and show you the Samba server type you choose"
-msgstr ""
-"Paistab, et Teil on juba Samba-serveri seadistus olemas. Nõustaja loeb selle "
-"ja näitab, millise Samba-serveri tüübi olete varem valinud"
-
 #: ../samba_wizard/Samba.pm:121
 msgid ""
 "Domain master = yes, causes the server to register the NetBIOS name <pdc "
@@ -2779,7 +2870,7 @@ msgstr "Logifail:"
 msgid "Max log size:"
 msgstr "Maksimaalne logi suurus:"
 
-#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:126
+#: ../samba_wizard/Samba.pm:327 ../sshd_wizard/Sshd.pm:128
 msgid "Log level:"
 msgstr "Logi tase:"
 
@@ -3514,91 +3605,91 @@ msgstr ""
 msgid "Samba homes share"
 msgstr "Samba 分享"
 
-#: ../sshd_wizard/Sshd.pm:63
+#: ../sshd_wizard/Sshd.pm:65
 msgid "Expert - advanced ssh options"
 msgstr "Ekspert - täielikud ssh valikud"
 
-#: ../sshd_wizard/Sshd.pm:68
+#: ../sshd_wizard/Sshd.pm:70
 msgid "Which type of configuration do you you want to do:"
 msgstr "Seadistamistüübi valik:"
 
-#: ../sshd_wizard/Sshd.pm:76
+#: ../sshd_wizard/Sshd.pm:78
 msgid "SSH server, classical options"
 msgstr "SSH server, klassikalised valikud"
 
-#: ../sshd_wizard/Sshd.pm:84 ../sshd_wizard/Sshd.pm:180
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
 msgid "Listen address:"
 msgstr "Jälgitav aadress:"
 
-#: ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:86
 msgid "Specifies the local addresses sshd should listen on."
 msgstr "Määrab kohaliku aadressi, mida sshd peab jälgima."
 
-#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#: ../sshd_wizard/Sshd.pm:87 ../sshd_wizard/Sshd.pm:183
 msgid "Port number:"
 msgstr "Pordi number:"
 
-#: ../sshd_wizard/Sshd.pm:85
+#: ../sshd_wizard/Sshd.pm:87
 msgid "Specifies the port number that sshd listens on. The default is 22."
 msgstr "Määrab pordi, mida sshd jälgib. Vaikimisi on see 22."
 
-#: ../sshd_wizard/Sshd.pm:88
+#: ../sshd_wizard/Sshd.pm:90
 msgid "Port should be a number"
 msgstr "Port peab olema arv"
 
-#: ../sshd_wizard/Sshd.pm:99
+#: ../sshd_wizard/Sshd.pm:101
 msgid "Authentication Method"
 msgstr "Autentimisviis"
 
-#: ../sshd_wizard/Sshd.pm:109
+#: ../sshd_wizard/Sshd.pm:111
 msgid "RSA auth:"
 msgstr "RSA:"
 
-#: ../sshd_wizard/Sshd.pm:110
+#: ../sshd_wizard/Sshd.pm:112
 msgid "PubKey auth:"
 msgstr "Avalik võti:"
 
-#: ../sshd_wizard/Sshd.pm:111
+#: ../sshd_wizard/Sshd.pm:113
 msgid "Auth key file:"
 msgstr "Autentimisvõtme fail:"
 
-#: ../sshd_wizard/Sshd.pm:112
+#: ../sshd_wizard/Sshd.pm:114
 msgid "Password auth:"
 msgstr "Parool:"
 
-#: ../sshd_wizard/Sshd.pm:113
+#: ../sshd_wizard/Sshd.pm:115
 msgid "Ignore rhosts file:"
 msgstr "Faili rhosts ignoreerimine:"
 
-#: ../sshd_wizard/Sshd.pm:114
+#: ../sshd_wizard/Sshd.pm:116
 msgid "Permit empty password:"
 msgstr "Tühja parooli lubamine:"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid "Log"
 msgstr "Logi"
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Log level: gives the verbosity level that is used when logging messages from "
 "sshd."
 msgstr "Logi tase: määrab sshd teadete logimisel kasutatava infotaseme."
 
-#: ../sshd_wizard/Sshd.pm:119
+#: ../sshd_wizard/Sshd.pm:121
 msgid ""
 "Syslog facility: gives the facility code that is used when logging messages "
 "from sshd"
 msgstr "Syslogi vahend: määrab vahendi, mida kasutada sshd teadete logimisel."
 
-#: ../sshd_wizard/Sshd.pm:125
+#: ../sshd_wizard/Sshd.pm:127
 msgid "Syslog facility:"
 msgstr "Syslogi vahend:"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid "Login options"
 msgstr "Sisselogimise valikud"
 
-#: ../sshd_wizard/Sshd.pm:131
+#: ../sshd_wizard/Sshd.pm:133
 msgid ""
 "Print last log: whether sshd should print the date and time when the user "
 "last logged in"
@@ -3606,11 +3697,11 @@ msgstr ""
 "Viimase sisselogimise näitamine: määrab, kas sshd peab näitama kuupäeva ja "
 "kellaaega, mil kasutaja viimati sisse logis."
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid "Login Grace time:"
 msgstr "Sisselogimise armuaeg:"
 
-#: ../sshd_wizard/Sshd.pm:139
+#: ../sshd_wizard/Sshd.pm:141
 msgid ""
 "The server disconnects after this time if the user has not successfully "
 "logged in. If the value is 0, there is no time limit. The default is 120 "
@@ -3620,23 +3711,23 @@ msgstr ""
 "jooksul edukalt sisse loginud. 0 tähendab ajapiirangu puudumist. Vaikimisi "
 "on see 120 sekundit."
 
-#: ../sshd_wizard/Sshd.pm:140
+#: ../sshd_wizard/Sshd.pm:142
 msgid "Keep alive:"
 msgstr "Elushoidmine:"
 
-#: ../sshd_wizard/Sshd.pm:141
+#: ../sshd_wizard/Sshd.pm:143
 msgid "Print motd:"
 msgstr "Päevasõnumi näitamine:"
 
-#: ../sshd_wizard/Sshd.pm:142
+#: ../sshd_wizard/Sshd.pm:144
 msgid "Print last log:"
 msgstr "Viimase sisselogimise näitamine:"
 
-#: ../sshd_wizard/Sshd.pm:145
+#: ../sshd_wizard/Sshd.pm:147
 msgid "Login grace time should be a number"
 msgstr "Sisselogimise armuaeg peab olema arv"
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid ""
 "Strict modes: specifies whether sshd should check file modes and ownership "
 "of the user's files and home directory before accepting login. This is "
@@ -3648,19 +3739,19 @@ msgstr ""
 "sest eriti algajad jätavad mõnikord teadmatusest oma kataloogi või failid "
 "kogu maailmale kättesaadavaks."
 
-#: ../sshd_wizard/Sshd.pm:150
+#: ../sshd_wizard/Sshd.pm:152
 msgid "User Login options"
 msgstr "Kasutaja sisselogimise valikud"
 
-#: ../sshd_wizard/Sshd.pm:158
+#: ../sshd_wizard/Sshd.pm:160
 msgid "Strict modes:"
 msgstr "Karm režiim:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid "Allow users:"
 msgstr "Lubatud kasutajad:"
 
-#: ../sshd_wizard/Sshd.pm:159
+#: ../sshd_wizard/Sshd.pm:161
 msgid ""
 "If specified, login is allowed only for user names that match one of the "
 "patterns. ie: erwan aginies guibo"
@@ -3668,11 +3759,11 @@ msgstr ""
 "Määramise korral on sisselogimine lubatud ainult kasutajatele, kelle nimi "
 "sobib mõne antud mustriga, nt. erwan aginies guibo"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid "Deny users:"
 msgstr "Keelatud kasutajad:"
 
-#: ../sshd_wizard/Sshd.pm:160
+#: ../sshd_wizard/Sshd.pm:162
 msgid ""
 "Login is disallowed for user names that match one of the patterns. ie: "
 "pirate guillomovitch"
@@ -3680,11 +3771,11 @@ msgstr ""
 "Sisselogimine on keelatud kasutajatele, kelle nimi sobib mõne antud "
 "mustriga, nt. piraat guillomovitch"
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid "Compression: Specifies whether compression is allowed."
 msgstr "Tihendus: määrab, kas tihendus on lubatud."
 
-#: ../sshd_wizard/Sshd.pm:165
+#: ../sshd_wizard/Sshd.pm:167
 msgid ""
 "X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
 "disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
@@ -3694,27 +3785,27 @@ msgstr ""
 "suunamise keelamine ei takista kasutajal suunamast X11 liiklust, sest "
 "kasutaja võib selleks alati paigaldada omaenda vahendid."
 
-#: ../sshd_wizard/Sshd.pm:171
+#: ../sshd_wizard/Sshd.pm:173
 msgid "Compression:"
 msgstr "Tihendus:"
 
-#: ../sshd_wizard/Sshd.pm:172
+#: ../sshd_wizard/Sshd.pm:174
 msgid "X11 forwarding:"
 msgstr "X11 suunamine:"
 
-#: ../sshd_wizard/Sshd.pm:177
+#: ../sshd_wizard/Sshd.pm:179
 msgid "Summary of OpenSSH configuration."
 msgstr "OpenSSH seadistamise kokkuvõte."
 
-#: ../sshd_wizard/Sshd.pm:187
+#: ../sshd_wizard/Sshd.pm:189
 msgid "The wizard successfully configured your SSH server."
 msgstr "Nõustaja seadistas edukalt Teie SSH serveri."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "Configuring your OpenSSH server..."
 msgstr "SSH serveri seadistamine..."
 
-#: ../sshd_wizard/Sshd.pm:249
+#: ../sshd_wizard/Sshd.pm:251
 msgid "OpenSSH server"
 msgstr "OpenSSH server"
 
@@ -3960,6 +4051,22 @@ msgstr "Apache'i server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Süsteemi seadistamine Apache'i serveriks..."
 
+#~ msgid "Mail domain:"
+#~ msgstr "E-posti domeen:"
+
+#~ msgid "Install in progress"
+#~ msgstr "Paigaldamine..."
+
+#~ msgid "Installing Kolab server on your system..."
+#~ msgstr "Kolabi serveri paigaldamine Teie süsteemi..."
+
+#~ msgid ""
+#~ "It seems you previously setup a Samba server. This wizard will re-read "
+#~ "your old configuration, and show you the Samba server type you choose"
+#~ msgstr ""
+#~ "Paistab, et Teil on juba Samba-serveri seadistus olemas. Nõustaja loeb "
+#~ "selle ja näitab, millise Samba-serveri tüübi olete varem valinud"
+
 #~ msgid ""
 #~ "If you really want to add this this share, click the Next button or use "
 #~ "the Back button."