updated pot file

61 files changed, 20634 insertions, 18875 deletions

diff --git a/po/ar.po b/po/ar.po
index d102c1ca..d8a1182c 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-10 14:35+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabeyes <support@arabeyes.org>\n"
@@ -30,31 +30,31 @@ msgstr "معالج التهيئة"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "تحذير."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "خطأ."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "تهانينا"
 
@@ -93,17 +93,17 @@ msgstr "هذا المعالح سيساعدك على اضافة عميل جديد
 msgid "(you don't need to type the domain after the name)"
 msgstr "(لن تحتاج الى كتابة النطاق بعد الإسم)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "تعريف العميل:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "لاحظ أن رقم IP و اسم العميل يجب أن يكون غير متكرر في الشبكة."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,33 +112,33 @@ msgstr ""
 "سيتم التعرف على العميل بالإسم, مثل clientname.company.net. كل جهاز كمبيوتر "
 "يجب أن يكون لديه عنوان IP خاص به, بالصيغة المنقوطة المعروفة."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "اسم الجهاز:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "عنوان IP الخاصّ بالجهاز:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "تحذير"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "تحذيرأنت في DHCP, الخادم قد لا يعمل بهذه التهيئة."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "خطأ"
@@ -182,12 +182,30 @@ msgstr "عنوان IP للعميل:"
 msgid "The wizard successfully added the client."
 msgstr "قام المعالج بإضافة العميل بنجاح."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"تحتاج لإعادة ضبط إسم مجالك. لخادم DNS، تحتاج لإسم مجال صحيح، غير مساو للمجال "
+"المحلّي (localdomain( أو لا شيئ )none). شغّل دراكّونّكت لضبطه."
+
+#: ../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."
+msgstr ""
+"تحتاج لإعادة ضبط إسم مجالك. لخادم DNS، تحتاج لإسم مجال صحيح، غير مساو للمجال "
+"المحلّي (localdomain( أو لا شيئ )none). شغّل دراكّونّكت لضبطه."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "لا يزال الأمر مشتغلا. هل تريد قتله و الخروج من المعالج ؟"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "إغلق"
 
@@ -275,8 +293,8 @@ msgstr "قام المعالج بتهيئة المعاملات التالية و
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "معطل"
@@ -285,8 +303,8 @@ msgstr "معطل"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "ممكّن"
@@ -299,51 +317,38 @@ msgstr "الواجهة:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "قام المعالج بتهيئة خدمات DHCP بنجاح."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "فشِل"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "أعد تشغيل drakewizard، وحاول تغيير بعض البارمترات."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "يجب ان تعيد ضبط اسم الخادم."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"تحتاج لإعادة ضبط إسم مجالك. لخادم DNS، تحتاج لإسم مجال صحيح، غير مساو للمجال "
-"المحلّي (localdomain( أو لا شيئ )none). شغّل دراكّونّكت لضبطه."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "خادم DNS الرئيسى"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "خادم DNS التّابع"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "أضف المضيف في DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "إحذف المضيف في DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -351,11 +356,11 @@ msgstr ""
 "DNS (خادم اسم النطاق) هي الخدمة التي ترتب عنوان IP لجهاز بإسم مستضيف "
 "للإنترنت."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "معالج إعداد DNS الرّئيسي"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -365,47 +370,47 @@ msgstr ""
 "خدمة DNS محلية لأسماء أجهزة الكمبيوتر المحلية, مع ارسال الطلبات الغير محلية "
 "الى DNS خارجي."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "ماذا تريد أن تفعل:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "خادم DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(لن تحتاج الى كتابة النطاق بعدالإسم)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP للخادم:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "إسم نطاق NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "إختر من القائمة التّالية المضيف الّذي تودّ حذفه."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "احذف مضيف فى من اعدادات DNS "
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "إحذف المضيف:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "إسم الحاسوب:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -414,11 +419,11 @@ msgstr ""
 "سيأخذ خادم أسماء تابع البعض من العبأ من خادم الأسماء الرّئيسي الخاصّ بك، و "
 "سيعمل كذلك كخادم احتياط، في حالة ما إذا خادمك الرّئيسي خارج عن الإتّصال."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "عنوان IP لخادم DNS الرّئيسي:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -426,32 +431,32 @@ msgstr ""
 "يجري التّقديم (forwarding) فقط على تلك الطّلبات الّتي ليس الخادم موضع ثقة "
 "بشأنها و الجواب غير موجود في مخبئه."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "عنوان الـIP لمقدّمك (forwarder)"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 "إن كن تحتاج إلى و تعرف مفدّم IP الخاصّ بك أدخل عنوان الـIP له، وإلّا فدعه فارغا"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS خارجي:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "أضف مجالا للبحث"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr "اسم النطاق لهذا الخادم قد اضيف آلياً، و لا تحتاج لاضافته هنا."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -462,40 +467,40 @@ msgstr ""
 "المحلّي؛ تحتوي ،افتراضا، على إسم المجال المحلّي فقط. يمكن تغيير هذا بتسجيل درب "
 "بحث المجال المختار بعد كلمة البحث الدّلالية"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "إسم المجال الافتراضي للبحث:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "هذا عنوان IP غير صالح لمقدّمك (forwarder)... إضغط على التّالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "هذا عنوان IP للـDNS الرّئيسي غير صالح... إضغط على التّالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "هذا عنوان IP غير صالح... إضغط على التّالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr "يبدو أنّ المضيف موجود في إعدادك للـDNS... إضغط على التّالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "خطأ:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr "يبدو أنّ هذا غير موجود في إعدادك للـDNS... إضغط على التّالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -503,69 +508,69 @@ msgstr ""
 "يبدو أنّه لم يتمّ إعداد أيّ خادم DNS من خلال المعالج. شغّل من فضلك معالج DNS: "
 "خادم DNS الرّئيسي "
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr "يبدو أنّك لست خادما رئيسا لـDNS، لا أستطيع إذن إضافة\\حذف المضيف."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "سيقوم المعالج الآن ببناء إعداد تابع DNS الخاصّ بك"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "بهذا الإعداد:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "عميل بهذه التعريفات سيتم إضافته لخادم الـDNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "إسم الحاسوب:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "عنوان IP للحاسوب:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "عميل بهذه التعريفات سيتم إزالته لخادم الـDNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "سيتم أعداد خادم الـDNS باستخدام هذه الأعدادات"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "إسم المضيف للخادم:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "إسم المجال:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "قام المعالج بإضافة مضيف في الـDNS الخاصّ بك بنجاح."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "قام المعالج بحذف المضيف من الـDNS الخاصّ بك بنجاح."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "قام المعالج بإعداد خدمة DNS خادمك بنجاح."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "من فضلك اعد تشغيل drakwizard، وحاول تغيير بعض البارمترات."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "يجري إعداد نظامك كخادم DNS رئيسي..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "يجري إعداد نظامك كخادم DNS تابع..."
 
@@ -593,7 +598,7 @@ msgstr "خادم البريد"
 msgid "FTP server"
 msgstr "خادم FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "خادم سامبا"
 
@@ -617,7 +622,7 @@ msgstr "خريطة autofs لخادم NIS"
 msgid "Mandrakelinux Install server"
 msgstr "خادم التّثبيت لماندريك لينكس"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "خادم كولاب (Kolab)"
 
@@ -642,7 +647,7 @@ msgstr ""
 "%s غير مثبّت\n"
 "أنقر على \"التّالي\" للتّثبيت أو على \"إلغي\" للخروج"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "التركيب فشل"
 
@@ -874,15 +879,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "معالج تهيئة Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"تحتاج لإعادة ضبط إسم مجالك، غير مساو للمجال المحلّي (localdomain) أو لا شيئ "
-"(none). أطلق من فضلك دراكونكت (drakconnect) لضبطه."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -893,7 +890,7 @@ msgstr ""
 "الكبرى تضمن: واجهة إدارة من الويب، كتاب عناوين مقسّم يحتوي على مستخدمي علبة "
 "البريد و الإتّصالات، و توصّل للبريد عن طريق POP3 و IMAP4 (rev1)"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -903,39 +900,39 @@ msgstr ""
 "Postfix، Imap، Saslauth. سيقوم المعالج بالاحتياط بجميع ملفّاتك للإعداد "
 "السّابقة الخاصّة بهذه الخدمات."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "مرحبا في معالج إعداد خادم البرامج الجماعية (groupware) كولاب."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "أدخل كلمة المرور لحساب مدير خادم كولاب."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "كلمات المرور غير متطابفة، أو كلمة مرور فارغة، صحّح من فضلك."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "كلمة المرور:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "كلمة المرور مجدّدا:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "سيقوم المعالج الآن بإعداد خادم كولاب بهذه الوسائط"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "إسم المضيف:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "مجال البريد:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -943,44 +940,35 @@ msgstr ""
 "خادم كولاب معدّ و يشتغل الآن. أدخل كمدير (manager) بكلمة المرور الّتي أدخلتها "
 "في https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "يتقدّم التّثبيت"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "يجري تثبيت خادم كولاب على نظامك..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "يجري إعداد خادم كولاب على نظامك..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "معالج Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"تحتاج لإعادة ضبط إسم مجالك. لخادم LDAP، تحتاج لإسم مجال صحيح، غير مساو "
-"للمجال المحلّي (localdomain( أو لا شيئ )none). شغّل دراكّونّكت لضبطه."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "عرض تهيئة Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "إضافة مستخدم في خادم Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "حذف تهيئة Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -988,190 +976,188 @@ msgstr ""
 "هو بروتوكول خفيف الحمل للوصول إلى خدمات الأدلّة وبالتحديد خدمات الأدلة "
 "المبنية على X.5000"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP هي اختصار للبروتوكول خفيف الحمل للوصول للأدلة."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "معالج تهيئة Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "عليك إعداد خادم Ldap أولاً."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "خيارك:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "إزالة التهيئة"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "جاري حفظ القاعدة الموجودة إلى /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "إضافة مستخدم LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "تم إنشاء مستخدم في: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "تم إنشاء مستخدم في: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "الإسم:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "الإسم:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "تسجيل دخول المستخد:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "عليك إدخال اسم أول صالح."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "عليك إدخال اسم صالح."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "عليك إدخال اسم مستخدم صالح."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "كلمة مرور مستخدم LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "كلمات المرور يجب أن تتطابق"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "كلمة المرور (مجدّدا):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "يجب عليك إدخال كلمة مرور لـLDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "كلمات المرور غير متطابقة"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "المدير"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "المدير هو مستخدم ذي نفوذ له صلاحية الوصول إلى قاعدة بيانات LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "المدير,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "جاري تهيئة خادم LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "إسم المجال: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "إسم المجال: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "مدير LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "شجرة دليل LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "تستخدم تسمية DNS لتعريف شجرة دليل LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "شجرة دليل LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "مدير LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "كلمة مرور LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "كلمة مرور LDAP (مجدّدا):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "عليك إدخال شجرة دليل LDAP صالحة."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "تأكيد المستخدم الّذي سيتمّ إنشاؤه"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "الإسم:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "إسم المستخدم:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "أنشئ في:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "معلومات التأكيد لإنشاء خادم LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "حاوية المستخدمين:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "قام المعالج بإعداد الـLDAP بنجاح."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "تمّت إضافة المستخدم بنجاح"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "خطأ في إضافة مستخدم في قاعدة بيانات Ldap"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "الخادم مُهيّأ مسبقاً"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "لقد قمت بتهيئة خادم Ldap مسبقاً"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "فشل %s"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "خطأ!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "لم يمكن الاتصال بـ%s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "معالح الأخبار"
@@ -1307,13 +1293,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "الدليل:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "المسار الذي أدخلته غير موجود"
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "التحكم بالدخول"
 
@@ -1366,28 +1352,20 @@ msgstr "قناع الشّبكة (Netmask):"
 msgid "The wizard successfully configured your NFS server."
 msgstr "قام المعالج بإعداد خادم NFS الخاصّ بك بنجاح."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"تحتاج إلى إعادة ضبط إسم مجال NIS الخاصّ بك. لخادم NIS تحتاج إلى إسم مجال NIS "
-"صحيح، غير مساو للمجال المحلّي (localdomain) أو لا شيء (none)."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "خادم NIS مع خريطة autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "عميل NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "أعدّ خادم NIS بخريطة autofs و ملفّات auto.home و auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1395,28 +1373,28 @@ msgstr ""
 "يركّب المستخدمون دليلهم المنزل آليا من الخادم، عند دخولهم في شبكة حواسيب عميل "
 "NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "ماذا تريد أن تفعل ؟"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "أعدّ الحاسوب ليصبح عميلا لـNIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "عليك فقط وضع nisdomain و nisserver."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "خادم NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "مجال NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1426,7 +1404,7 @@ msgstr ""
 "كذلك خريطة autofs، و بهذا توفّر الإمكانيات لمستخدم NIS لتركيب دليله المنزل "
 "آليا على جهاز عميل NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1434,77 +1412,77 @@ msgstr ""
 "منزل NIS: دليل منزل قاعدي للمستخدمين على خادم NIS. سيصدّر هذا الدّليل من خلال "
 "خادم NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "مجال NIS: مجال NIS للاستعمال (عموما نفس المجال كإسم مجال DNS الخاصّ بك)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "خادم NIS: إسم حاسوبك."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS المنزل:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "إسم نطاق NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "سيعدّ المعالج خادم NIS الخاصّ بك بخريطة autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "دليل NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "إسم نطاق NIS: إسم نطاق NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "خادم NIS: إسم المضيف لخادم NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr "بجد عفريت YPBIND الخادم لمجالات NIS و يصون معلومات ربط NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "خطأ: يجب أن يكون دليلا."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "خطأ: لا يمكن أن يكون اسم نطاق NIS هو 'none' أو 'localdomain'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "إضبطه من فضلك."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "أعدّ المعالج حاسوبك بنجاح ليكون عميلا لـNIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "أعدّ المعالج حاسوبك بنجاح ليكون خادم NIS بخريطة autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "يجري إعداد نظامك ليكون خادما لـNIS بخريطة Autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS مع خريطة Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "يجري إعداد نظامك كعميل NIS..."
 
@@ -1852,7 +1830,7 @@ msgstr ""
 "قام المعالج بتجميع المعاملات التالية و التي يُحتاج اليها لتهيئة البروكسي:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1884,6 +1862,14 @@ msgstr "بروكسي لسكويد (Squid)"
 msgid "PXE Wizard"
 msgstr "معالج 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."
+msgstr ""
+"تحتاج لإعادة ضبط إسم مجالك، غير مساو للمجال المحلّي (localdomain) أو لا شيئ "
+"(none). أطلق من فضلك دراكونكت (drakconnect) لضبطه."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "أعدّ خادم PXE"
@@ -2228,24 +2214,24 @@ msgstr "يجري إعداد خادم PXE على نظامك..."
 msgid "PXE server"
 msgstr "خادم PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "معالج Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s غير موجود."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "الجميع - دون قيد على التّوصّل"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "قواعدي - إسألني عن المضيفين المسموح بهم و الممنوعين"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2253,54 +2239,54 @@ msgstr ""
 "Samba يسمح لخادمك بالتصرف كخادم ملفات و طابعات لمحطات العمل التي تعمل على "
 "أنظمة غير لينكس."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "معالج إعداد سامبا"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "هذا المعالج سيساعدك على تهيئة خدمات Samba لجهازك الخادم."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba يحتاج الى معرفة مجموعة عمل Windows التي سيخدمها."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "مجموعة العمل"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "مجموعة العمل:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "مجموعة العمل خطأ"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "راية الخادم."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "الشعار هو الطريقة التي يتم وصف هذا الخادم في محطات عمل Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "الشعار:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "راية الخادم غير صحيحة"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "مستوى التّوصّل:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2308,7 +2294,7 @@ msgstr ""
 "* مثال 1: إسمح لكلّ عناوين IP في 150.203.*.*؛ ما عدا واحد\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2316,7 +2302,7 @@ msgstr ""
 "* مثال 2: إسمح للمضيفات الّتي تطابق الشّبكة أو قناع الشّبكة (netmask) المعطى\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2324,7 +2310,7 @@ msgstr ""
 "* مثال 3: إسمح لمضيفين\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2336,24 +2322,24 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "لاحظ أنّ الدّخول لا يزال يحتاج إلى كلمات مرور مناسبة على مستوى المستخدمين."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "إسمح للمضيفات:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "إمنع المضيفات:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "مكّن خدمات سامبا"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2362,19 +2348,19 @@ msgstr ""
 "يمكن لـ Samba أن يوفر مساحة مشاركة ملفات لمحطة بيانات Windows, يمكنك كذلك "
 "توفير مشاركة الطباعة للطابعات المتصلة بالخادم."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "مكّن مساحة مشاركة الملفات"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "مكّن تقسيم طابعة الخادم"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "اجعل الأدلة الخاصة متوفرة لمالكين آخرين"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2382,28 +2368,28 @@ msgstr ""
 "لقد اخترت أن تسمح للمستخدمين بالدخول الى أدلتهم الخاصة باستخدام Samab لكن "
 "يجب عليك/عليهم أن بستخدموا smbpasswd لتعيين كلمة مرور."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "دليل مشترك:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "اكتب مسار الدليل الذي تريده أن يكون مشتركاً."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "أنشئ دليلا مشتركا إن لم يكن موجودا"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "فشلت في إنشاء الدّليل."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "تصاريح الملفات"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2413,59 +2399,59 @@ msgstr ""
 "كالتّالي:\n"
 "root، fred، @users، @wheel لكلّ نوع من الصلاحيات."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "إقرأ القائمة:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "أكتب القائمة:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "اختر الطابعات التي تريد يسمح باستخدامها للمستخدمين المعروفين"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "مكّن كل الطابعات"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "جاري تهيئة Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "جمّع المعالج الوسائط التّالية لإعداد سامبا."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "راية الخادم:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "تقسيم الملفّات:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "خادم الطّباعة:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "الدليل الخاص:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "الطابعات:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "قام المعالج بتهيئة خادم Samba بنجاح."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "يجري إعداد خادم سامبا الخاصّ بك..."
 
@@ -2699,3 +2685,24 @@ msgstr "خادم Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "يجري إعداد نظامك كخادم Apache..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "يجب ان تعيد ضبط اسم الخادم."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "تحتاج لإعادة ضبط إسم مجالك. لخادم LDAP، تحتاج لإسم مجال صحيح، غير مساو "
+#~ "للمجال المحلّي (localdomain( أو لا شيئ )none). شغّل دراكّونّكت لضبطه."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "لم يمكن الاتصال بـ%s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "تحتاج إلى إعادة ضبط إسم مجال NIS الخاصّ بك. لخادم NIS تحتاج إلى إسم مجال "
+#~ "NIS صحيح، غير مساو للمجال المحلّي (localdomain) أو لا شيء (none)."
diff --git a/po/az.po b/po/az.po
index dc03f45b..36c97dd8 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-02-20 18:30+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -23,31 +23,31 @@ msgstr "quraşdırma sehirbazı"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Xəbərdarlıq."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Xəta"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Təbriklər"
 
@@ -90,11 +90,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(addan sonran qovşağı yazmaq məcburiyyətində deyilsiniz)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Alıcı tanınması:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -102,7 +102,7 @@ msgid ""
 msgstr ""
 "Qeyd edək ki verilən IP nömrəsi və alıcı adı şəbəkə üstündə yeganə olmalıdır."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,22 +112,22 @@ msgstr ""
 "hər kompüterin özünəməxsus sıravi nöqtəli sintaksis ilə yazılmış IP önvanı "
 "olmalıdır."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Maşının adı:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Maşının IP nömrəsi:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -137,12 +137,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Xəta"
@@ -186,12 +186,25 @@ msgstr "Alıcı IP'si:"
 msgid "The wizard successfully added the client."
 msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Bağla"
 
@@ -285,8 +298,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "qeyri-fəal"
@@ -295,8 +308,8 @@ msgstr "qeyri-fəal"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "fəal"
@@ -310,49 +323,38 @@ msgstr "Ara üz:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Sehirbaz vericinizin DHCP xidmətlərini müvəffəqiyyətlə quraşdırdı."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Bacarılmadı"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Əsas DNS vericisi"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "İkinci DNS vericisi"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -360,12 +362,12 @@ msgstr ""
 "DNS (Domain Name Server) kompüterlərin IP ünvanlarını internet qovşaq adları "
 "ilə əlaqələndirən və xəritələyən xidmətdir."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "DNS quraşdırma sehirbazı"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -375,89 +377,89 @@ msgstr ""
 "Bu quraşdırma, xarici DNS'ə ötürülmüş yerli olmayan istəklər alan yerli "
 "kompüter adları üçün yerli DNS xidməti tə'min edəcək."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS vericisi"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(addan sonran qovşağı yazmaq məcburiyyətində deyilsiniz)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Verici Banneri:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Maskarad domen adı:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Qovşağı sil:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Kompüter Adı:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Forwarderinizin IP-si"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Xarici DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Axtarış domeni əlavə et"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -465,116 +467,116 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Bu hökmlü ünvan deyil... davam etmək üçün Sonrakı düyməsinə basın"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Bu hökmlü ünvan deyil... davam etmək üçün Sonrakı düyməsinə basın"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Bu hökmlü ünvan deyil... davam etmək üçün Sonrakı düyməsinə basın"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Xəta:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "İndi LDAP qurğularınız inşa edilir"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "bu quraşdırma ilə:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Kompüter adı:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Kompüterin IP ünvanı:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Verici Qovşaq Adı:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domen adı:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Sehirbaz vericinizin DNS xidmətlərini müvəffəqiyyətlə quraşdırdı."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Sisteminiz Nis+Autofs(nfs) vericisi olaraq quraşdırılır ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Sisteminiz Nis+Autofs(nfs) vericisi olaraq quraşdırılır ..."
@@ -603,7 +605,7 @@ msgstr "Poçt vericisi"
 msgid "FTP server"
 msgstr "FTP vericisi"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba vericisi"
 
@@ -629,7 +631,7 @@ msgstr "Nis vericisi + Autofs"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrake Qurulum Vericisi"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Samba vericisi"
@@ -656,7 +658,7 @@ msgstr ""
 "%s qurulu deyil\n"
 "Qurmaq üçün \"Sonrakı\" ya da çıxmaq üçün \"Ləğv Et\" düyməsinə basın."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Qurulum bacarılmadı"
 
@@ -898,13 +900,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Samba Quraşdırma Sehirbazı"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -912,312 +908,301 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Veb Vericisi Quraşdırma Sehirbazı"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Şifrə:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Şifrə:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, 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:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Verici Qovşaq Adı:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Nis Domeni:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "İstifadəçi cərgəsi: "
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap sehirbazı"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "DNS quraşdırma sehirbazı"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "LDAP vericisinə giriş əlavə et"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "DNS quraşdırma sehirbazı"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "DNS quraşdırma sehirbazı"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "PXE vericisini seç."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Zaman verici quraşdırılması qeyd edildi"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Xəbərlər Vericisi Adı:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Ad:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Xəbərlər Vericisi Adı:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Konteyner:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Şifrə"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Şifrə:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Şifrələr uyğun gəlmir"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Samba Quraşdırılır"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Domen adı:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Domen adı:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "TFTP cərgəsi: "
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "TFTP cərgəsi: "
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Şifrə:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Şifrə:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "TFTP cərgəsi: "
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Ad:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Xəbərlər Vericisi Adı:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP Vericisi Quraşdırılır"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Konteyner:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Sehirbaz NFS Vericinizi müvəffəqiyyətlə quraşdırdı"
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Məlumat müvəffəqiyyətlə əlavə edildi"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "LDAP vericisinə giriş əlavə et"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Sehirbaz Samba vericinizi müvəffəqiyyətlə quraşdırdı."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Bacarılmadı"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Xəta"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Xəbərlər Sehirbazı"
@@ -1358,13 +1343,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Qovluq:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Daxil etdiyiniz cığır mövcud deyil."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "İcazə idarəsi"
 
@@ -1418,150 +1403,144 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Sehirbaz NFS Vericinizi müvəffəqiyyətlə quraşdırdı"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Nis vericisi + Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "ANis Alıcısı"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Nə etmək istəyirsiniz?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 #, fuzzy
 msgid "Configure computer to be a NIS client"
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 #, fuzzy
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Sadəcə olaraq nisdomain və nisdomain bildirməlisiniz"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS vericisi"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 #, fuzzy
 msgid "NIS domain:"
 msgstr "Nis Domeni:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Ev:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Maskarad domen adı:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Sehirbaz Samba vericinizi müvəffəqiyyətlə quraşdırdı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "İstifadəçi cərgəsi: "
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Maskarad domen adı:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Bölüşülmüş qovluq:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Sehirbaz Samba vericinizi müvəffəqiyyətlə quraşdırdı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Sehirbaz Samba vericinizi müvəffəqiyyətlə quraşdırdı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
@@ -1932,7 +1911,7 @@ msgid ""
 msgstr "Sehirbaz vəkilinizi quraşdırmaq üçün aşağıdakı parametrləri topladı:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1967,6 +1946,12 @@ msgstr "Sehirbazı keç"
 msgid "PXE Wizard"
 msgstr "PXE Sehirbazı"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 msgid "Set PXE server"
 msgstr "PXE vericisini seç"
@@ -2296,26 +2281,26 @@ msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 msgid "PXE server"
 msgstr "PXE vericisi"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba sehirbazı"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s mövcud deyil."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Hamısı - İcazə məhdudlaşdırılması olmayacaq"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 "Mənim qaydalarım - İcazə verilən və rədd edilən qovşaqları məndən soruş"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2323,56 +2308,56 @@ msgstr ""
 "Samba, vericinizin Linux işlətməyən iş stansiyaları üçün fayl və çap "
 "vericisi olaraq istifadə edilməsinə imkan yaradır."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba Quraşdırma Sehirbazı"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Bu sehirbaz vericinizin Samba xidmətlərini quraşdırmaqda sizə yardım edəcək."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba xidmət edəcəyi Windows İş Qrupunun adını bilməlidir."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "İş qrupu"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "İş qrupu:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "İş qrupu səhvdir"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Verici Banneri."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "Banner, bu vericinin Windows iş stansiyaları altında tanınacağı yoldur."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Verici Banneri hökmsüzdür"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "İcazə səviyyəsi:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2381,7 +2366,7 @@ msgstr ""
 "* Nümunə 1: 150.203.*.* dakı bütün IP'lərə biri xaricində icazə ver\\nhosts "
 "allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2390,14 +2375,14 @@ msgstr ""
 "* Nümunə 2: verilən şəbəkə/şəbəkə maskası ilə uyğun gələn qovşaqlara icazə "
 "ver \\nhosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr "* Nümunə 3: bir cüt qovşağa icazə ver\\nhosts allow = qovşaq1, qovşaq2"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2409,23 +2394,23 @@ msgstr ""
 "xüsusi qovşağa (quldur) icazə vermə:\\nhosts allow = @neptun\\nhosts deny = "
 "quldur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Qeyd edin ki, icazə yenə də istifadəçi-səviyyəli şifrələrə bağlıdır."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "İcazə verilən qovşaqlar:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Rədd edilən qovşaqlar:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Samba Xidmətlərini Fəallaşdır"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2435,19 +2420,19 @@ msgstr ""
 "zamanda vericinizə bağlı olan çapçılar üçün çapçı bölüşmə xidmətini tə'min "
 "edə bilər."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Fayl bölüşmə sahəsini fəallaşdır"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Verici Çapçı Bölüşməsini Fəallaşdır"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Ev cərgələrini yiyələri üçün açıq et"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2456,28 +2441,28 @@ msgstr ""
 "verməyi seçdiniz, yalnız siz/onlar şifrə alımı üçün smbpasswd'dən istifadə "
 "etməlidirlər."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Bölüşülmüş qovluq:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Bölüşülməsini istədiyiniz cərgənin çığırını daxil edin."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Fayl səlahiyyətləri"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2488,60 +2473,60 @@ msgstr ""
 "\\' işarəsi qoyulmalıdır) Nümunə :Hər növ icazə üçün \\nroot, memmed, "
 "@users, @wheel."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "oxuma siyahısı:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "yazma siyahısı:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Mövcud istifadəçilərin yetişə biləcəyi çapçıları seçin"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Bütün çapçıları fəallaşdır"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Samba Quraşdırılır"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Sehirbaz Samba'nı quraşdırmaq üçün aşağıdakı parametrləri topladı."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Verici Banneri:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Fayl Bölüşməsi:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Çap Vericisi:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Ev:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Çapçılar:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Sehirbaz Samba vericinizi müvəffəqiyyətlə quraşdırdı."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "FTP Vericisi Quraşdırılır"
@@ -2789,6 +2774,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Nis+Autofs(nfs) vericisi olaraq quraşdırılır ..."
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Xəbərlər Vericisi Adı:"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "DHCP Vericisi Quraşdırılır"
 
diff --git a/po/bg.po b/po/bg.po
index c5bea804..e777193e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2003-08-29 00:54+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -22,32 +22,32 @@ msgstr "Конфигурационен магьосник"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "Предупреждение"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr ""
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Поздравления"
 
@@ -87,11 +87,11 @@ msgstr "Този помощник ще ви помогне да добавите
 msgid "(you don't need to type the domain after the name)"
 msgstr "(не се налага да пишете името на домейна)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Идентификация на клиента:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -100,7 +100,7 @@ msgstr ""
 "Обърнете внимание,че дадените IP адрес и клиентско име трябва да са уникални "
 "в мрежата"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -110,22 +110,22 @@ msgstr ""
 "компютър в мрежата трябва да има (уникален) IP адрес, изписан по обичайния "
 "начин"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Име на машината:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP адрес на компютъра:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Предупреждение"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -134,12 +134,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Грешка"
@@ -184,12 +184,25 @@ msgstr "IP адрес на клиента:"
 msgid "The wizard successfully added the client."
 msgstr "Помощникът успешно добави клиента"
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Затвори"
 
@@ -282,8 +295,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "изключен"
@@ -292,8 +305,8 @@ msgstr "изключен"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "включен"
@@ -307,52 +320,41 @@ msgstr "Интерфейс:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Помощникът успешно настрои DHCP услугите на сървъра ви."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "включен"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS сървър"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS сървър"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -360,12 +362,12 @@ msgstr ""
 "DNS (Domain Name Server) е услугата,която свързва IP адреса на дадена машина "
 "с нейното име в буквен вид."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Помощник за настройка на DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -375,90 +377,90 @@ msgstr ""
 "Тези настройки ще предоставят локална DNS услуга за локалните компютърни "
 "имена,а нелокалните ще бъдат пренасочвани през външния DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "NFS сървър"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(не се налага да пишете името на домейна)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Новинарски сървър:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Потребителско име:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Настройване на DNS сървъра"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -466,118 +468,118 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Това не е правилен адрес... натиснете \"нататък\",за да продължите"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Това не е правилен адрес... натиснете \"нататък\",за да продължите"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Това не е правилен адрес... натиснете \"нататък\",за да продължите"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS помощник (настройка)"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Потребителско име:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Име на новинарския сървър:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Помощникът успешно добави клиента"
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Помощникът успешно добави клиента"
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Помощникът успешно настрои DNS услугите на сървъра ви."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Настройване на DNS сървъра"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Настройване на DNS сървъра"
@@ -611,7 +613,7 @@ msgstr "FTP сървър"
 msgid "FTP server"
 msgstr "FTP сървър"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Сървър за база данни"
@@ -640,7 +642,7 @@ msgstr "Новинарски сървър"
 msgid "Mandrakelinux Install server"
 msgstr "FTP сървър"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Сървър за база данни"
@@ -667,7 +669,7 @@ msgstr ""
 "%s не е инсталирано\n"
 "Натиснете \"Нататък\",за да инсталирате или \"Отказ\" за изход"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "инсталацията провалена"
@@ -903,13 +905,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Конфигурационен магьосник"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -917,307 +913,297 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Помощник за настройка на FTP сървър"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Парола:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Помощникът успешно настрои вашата услуга \"интернет поща\" на сървъра ви."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Име на новинарския сървър:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Потребителска директория:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Настройване на FTP сървър"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Настройване на FTP сървър"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 #, fuzzy
 msgid "Ldap wizard"
 msgstr "MySQL помощник"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Конфигурационен магьосник"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Конфигурационен магьосник"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Конфигурационен магьосник"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Сървър за база данни"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "DNS помощник (настройка)"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Добавяне на потребител"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Потребителско име:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Добавяне на потребител"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Парола:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Парола:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Настройване на DHCP сървъра"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Потребителска директория:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Потребителска директория:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Парола:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Парола:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Потребителска директория:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Име на новинарския сървър:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Потребителско име:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Настройване на DHCP сървъра"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Добавяне на потребител"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "включен"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Грешка!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Помощник за новини"
@@ -1355,13 +1341,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Директория:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr ""
 
@@ -1416,144 +1402,138 @@ msgstr "Маска:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Новинарски сървър"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "IP адрес на клиента:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS сървър"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Помощникът успешно настрои защитната стена на сървъра ви."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "Потребителска директория:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Помощникът успешно настрои защитната стена на сървъра ви."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Настройване на DNS сървъра"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Новинарски сървър"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Настройване на DNS сървъра"
@@ -1897,7 +1877,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1933,6 +1913,12 @@ msgstr "Магьосник за клиента"
 msgid "PXE Wizard"
 msgstr "FTP помощник"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2259,98 +2245,98 @@ msgstr ""
 msgid "PXE server"
 msgstr "NFS сървър"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 #, fuzzy
 msgid "Samba wizard"
 msgstr "MySQL помощник"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Всички - няма ограничение на достъпа"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Този помощник ще ви помогне да настроите услугата \"Samba\" на сървъра ви."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Работна група"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Работна група:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Банер:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2358,131 +2344,131 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 #, fuzzy
 msgid "Enable all printers"
 msgstr "FTP сървър"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Помощникът научи следните параметри:"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 #, fuzzy
 msgid "Print server:"
 msgstr "FTP сървър"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Настройване на FTP сървър"
@@ -2705,6 +2691,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Настройване на DNS сървъра"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Добавяне на потребител"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Настройване на DHCP сървъра"
 
diff --git a/po/bn.po b/po/bn.po
index fcd8a91a..9c48d068 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-08-26 16:46+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -24,31 +24,31 @@ msgstr "কনফিগারেশনের উইজার্ড"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "সতর্কবাণী।"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "ত্রুটি।"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "অভিনন্দন"
 
@@ -91,20 +91,20 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(নামের শেষে ডোমেইনের নাম লেখার প্রয়োজন নেই)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "ক্লায়েন্টের পরিচিতি:"
 
 # "নেটওয়ার্কে প্রদত্ত আইপি (IP) অ্যাড্রেস এবং ক্লায়েন্টের নাম একক হওয়া "
 # "উচিত।"
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "লক্ষ্য করুন যে একটি নেটওর্য়াকে ক্লায়েন্টের নাম এবং আইপি এড্রেস একই রকম হতে পারবে না।"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -114,33 +114,33 @@ msgstr ""
 "company.net। নেটওয়ার্কের প্রত্যেকটি মেশিনের একটি (পৃথক) dotted সিন্টেক্সের আইপি "
 "(IP) অ্যাড্রেস থাকা প্রয়োজন।"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "মেশিনের নাম:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "মেশিনের আইপি (IP) অ্যাড্রেস:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "সতর্কবাণী"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "আপনি dhcp-তে আছেন, আপনার করা কনফিগারেশনে সার্ভার সম্ভবত চলবে না।"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "ত্রুটি"
@@ -186,13 +186,35 @@ msgstr "ক্লায়েন্টের আইপি (IP):"
 msgid "The wizard successfully added the client."
 msgstr "উইজার্ড সাফল্যের সাথে ক্লায়েন্ট-কে যোগ করেছে।"
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"আপনার ডোমেইননেম পুনরায় ঠিক করতে হবে। ডিএনএস সার্ভারের জন্য আপনার একটি নির্ভূল "
+"ডোমেইননেম প্রয়োজন, যেটি লোকালডোমেইন (localdomain) বা কিছুইনা (none) হতে "
+"পারবেনা। হোস্টের নাম অবশ্যই FQDN: Fully Qualified Domain Name হতে হবে। "
+"ড্রেককানেক্ট (drakconnect) ব্যবহার করে এটি ঠিক করুন।"
+
+#: ../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."
+msgstr ""
+"আপনার ডোমেইননেম পুনরায় ঠিক করতে হবে। ডিএনএস সার্ভারের জন্য আপনার একটি নির্ভূল "
+"ডোমেইননেম প্রয়োজন, যেটি লোকালডোমেইন (localdomain) বা কিছুইনা (none) হতে "
+"পারবেনা। হোস্টের নাম অবশ্যই FQDN: Fully Qualified Domain Name হতে হবে। "
+"ড্রেককানেক্ট (drakconnect) ব্যবহার করে এটি ঠিক করুন।"
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "কমান্ডটি এখনো চলছে। আপনি কি এটিকে kill করে উইজার্ড থেকে বের হয়ে যেতে চান?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "বন্ধ"
 
@@ -285,8 +307,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "নিষ্ক্রিয়"
@@ -295,8 +317,8 @@ msgstr "নিষ্ক্রিয়"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "সক্রিয়"
@@ -309,55 +331,39 @@ msgstr "ইন্টারফেস:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "উইজার্ড সাফল্যের সাথে DHCP পরিসেবা কনফিগার করেছে।"
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "বিফল"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizard পুনরায় আরম্ভ করুন, এবং কিছু প্যারামিটার পরিবর্তন করুন।"
 
-# sgstr "আপনার হোস্টের নাম পুনরায় মীমাংসা করা প্রয়োজন।"
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "আপনার হোস্টের নাম পুনরায় ঠিক করতে হবে।"
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"আপনার ডোমেইননেম পুনরায় ঠিক করতে হবে। ডিএনএস সার্ভারের জন্য আপনার একটি নির্ভূল "
-"ডোমেইননেম প্রয়োজন, যেটি লোকালডোমেইন (localdomain) বা কিছুইনা (none) হতে "
-"পারবেনা। হোস্টের নাম অবশ্যই FQDN: Fully Qualified Domain Name হতে হবে। "
-"ড্রেককানেক্ট (drakconnect) ব্যবহার করে এটি ঠিক করুন।"
-
 # CONFUSED with the second line
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "মাস্টার DNS সার্ভার"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "স্লেভ DNS সার্ভার"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "DNS -এ হোস্ট যোগ করো"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "DNS-এর থেকে হোস্ট মুছে ফেলো"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -365,11 +371,11 @@ msgstr ""
 "DNS (ডোমেইন নেম সার্ভার) পরিসেবার দ্বারা একটি মেশিনের আইপি (IP) অ্যাড্রেস একটি "
 "ইন্টারনেট হোস্টের নামের সাথে ম্যাপ করা হয়।"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "DNS মাস্টার কনফিগারেশন উইজার্ড"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -379,48 +385,48 @@ msgstr ""
 "কনফিগারেশন লোকাল কম্পিউটার নামের জন্য লোকাল ডিএনএস সার্ভিস ঠিক করে দেয়, এক্ষেত্রে "
 "নন‌‌-লোকাল অনুরোধ বাইরের ডিএনএস এর কাছে পাঠিয়ে দেয়া হয়।"
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "আপনি কি করতে ইচ্ছুক:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS সার্ভার"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(নামের শেষে আপনার ডোমেইন যোগ করবার প্রয়োজন নেই)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "সার্ভার-এর আইপি (IP):"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS domainname:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "নিম্নোক্ত তালিকা থেকে যে হোস্টকে আপনি মুছে ফেলতে ইচ্ছুক তা নির্বাচন করুন।"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "বর্তমান DNS কনফিগারেশন থেকে একটি হোস্ট মুছে ফেলুন।"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "হোস্ট মুছে ফেলুন"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "কম্পিউটারের নাম:"
 
 # আপনার মাস্টার সার্ভার উপস্থিত না থাকলে
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -429,11 +435,11 @@ msgstr ""
 "স্লেভ নেম সার্ভার আপনার প্রাথমিক নেম সার্ভারের ওপর থেকে কিছু চাপ হাল্কা করবে, এবং "
 "আপনার মাস্টার সার্ভার উপস্থিত না থাকলে এটি ব্যাক-আপ সার্ভার হিসাবেও কার্যকরী হবে।"
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "মাস্টার DNS সার্ভার-এর আইপি (IP) অ্যাড্রেস:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -441,11 +447,11 @@ msgstr ""
 "সেই সমস্ত প্রশ্নে ফরওয়ার্ডিং হয় যেখানে সার্ভার অনুমোদনযোগ্য নয় এবং উত্তরটিও তার "
 "ক্যাশে নেই।"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "আপনার ফরওয়ার্ডার এর আইপি"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -453,15 +459,15 @@ msgstr ""
 "যদি প্রয়োজন মনে করেন এবং আপনার ফরওয়ার্ডারের আইপি জেনে থাকেন তাহলে সেটি প্রবেশ "
 "করান, না জানা থাকলে খালি রেখে দিন"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "বহিস্থিত DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "অনুসন্ধানের ডোমেইন যোগ করুন"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -470,7 +476,7 @@ msgstr ""
 "করবার প্রয়োজন নেই।"
 
 # কাঙ্খিত
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -482,29 +488,29 @@ msgstr ""
 "বদলাতে হলে সার্চ কিওর্য়াডের পরপর কাঙ্খিত ডোমেইন সার্চ প্যাথ বসিয়ে তালিকা তৈরী "
 "করতে হবে।"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "ডিফল্ট অবস্থায় যে ডোমেইন নাম-এ অনুসন্ধান করা হবে:"
 
 # পরবর্তি-ধাপে চাপুন
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "এটি আপনার ফরওর্য়াডারের সঠিক আইপি নয়... অনুগ্রহ করে পরবর্তি-ধাপে ক্লিক করুন"
 
 # চাপুন
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "এটি কোনো বৈধ মাস্টার DNS আইপি (IP) অ্যাড্রেস নয়...অগ্রসর হতে হলে পরবর্তী-ধাপ ক্লিক "
 "করুন"
 
 # চাপুন
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "এটি কোনো আইপি (IP) অ্যাড্রেস নয়...অগ্রসর হতে হলে পরবর্তী-ধাপ ক্লিক করুন"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -513,11 +519,11 @@ msgstr ""
 "ধাপ ক্লিক করুন"
 
 # ত্রুটি:
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "সমস্যা:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -525,7 +531,7 @@ msgstr ""
 "সম্ভবত এটি আপনার DNS কনফিগারেশনে উপস্থিত নেই... অগ্রসর হতে হলে পরবর্তী-ধাপ ক্লিক "
 "করুন"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -533,73 +539,73 @@ msgstr ""
 "সম্ভবত উইজার্ডের সাহায্যে কোনো DNS সার্ভার নির্ধারিত হয় নি। অনুগ্রহ করে DNS "
 "উইজার্ডটি চালান: মাস্টার DNS সার্ভার।"
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "সম্ভবত আপনি মাস্টার DNS সার্ভার নন, এবং এই কারনে হোস্ট যোগ করা/মুছে ফেলা সম্ভব নয়।"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "উইজার্ড এখন আপনার DNS স্লেভ কনফিগারেশন তৈরি করবে"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "এই কনফিগারেশনের সাথে:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "এই পরিচিতির ক্লায়েন্ট আপনার DNS-এ যোগ করা হবে"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "কম্পিউটারের নাম:"
 
 # এড্রেস
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "কম্পিউটারের আইপি (IP) অ্যাড্রেস:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "এই পরিচিতির ক্লায়েন্ট আপনার DNS থেকে মুছে ফেলা হবে"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "নিম্নলিখিত কনফিগারেশন ব্যবহার করে DNS সার্ভার কনফিগার করা হবে"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "সার্ভার হোস্টের নাম:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "ডোমেইনের নাম:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "উইজার্ড সাফল্যের সাথে DNS-এ একটি হোস্ট যোগ করেছে।"
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "উইজার্ড সাফল্যের সাথে DNS থেকে একটি হোস্ট মুছে ফেলেছে।"
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "উইজার্ড সাফল্যের সাথে আপনার সার্ভারের DNS পরিসেবা কনফিগার করেছে।"
 
 # লঞ্চ
 # আরম্ভ
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "অনুগ্রহ করে drakwizard পুনরায় আরম্ভ করুন, এবং কিছু প্যারামিটার পরিবর্তন করুন।"
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "আপনার সিস্টেমকে মাস্টার DNS সার্ভার হিসাবে কনফিগার করবার প্রক্রিয়া ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "আপনার সিস্টেমকে স্লেভ DNS সার্ভার হিসাবে কনফিগার করবার প্রক্রিয়া ..."
 
@@ -627,7 +633,7 @@ msgstr "মেইল সার্ভার"
 msgid "FTP server"
 msgstr "FTP সার্ভার"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "সাম্বা সার্ভার"
 
@@ -651,7 +657,7 @@ msgstr "NIS সার্ভার autofs ম্যাপ"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux ইনস্টল সার্ভার"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab সার্ভার"
 
@@ -676,7 +682,7 @@ msgstr ""
 "%s ইনস্টল করা নেই\n"
 "\"পরবর্তী-ধাপ\" ক্লিক করে ইনস্টল করুন অথবা \"বাতিল\" ক্লিক করে প্রস্থান করুন"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "ইনস্টলেশন প্রক্রিয়া বিফল হয়েছে"
 
@@ -925,16 +931,8 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab কনফিগারেশন উইজার্ড"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"আপনার ডোমেইননেম পুনরায় ঠিক করতে হবে, যেটি লোকালডোমেইন (localdomain) বা কিছুইনা "
-"(none) হতে পারবেনা। ড্রেককানেক্ট (drakconnect) ব্যবহার করে এটি ঠিক করুন।"
-
 # confused as before
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -946,7 +944,7 @@ msgstr ""
 "সুবিধা ও কন্টাক্ট সহ একটি শেয়ারকৃত এড্রেসবুক এবং একটি POP3 ও IMAP4(rev1) মেইল "
 "অ্যাক্সেস।"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -956,39 +954,39 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth। উইজার্ড এই পরিসেবাগুলোর জন্য আপনার পূর্ববর্তী "
 "কনফিগারেশন ফাইলের ব্যাক-আপ তৈরি করবে।"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Kolab গ্রুপওয়ের সার্ভার কনফিগারেশন উইজার্ড-এ আপনাকে স্বাগতম।"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Kolab সার্ভারের ম্যানেজার অ্যাকাউন্টের পাসওয়ার্ড লিখুন।"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "পাসওয়ার্ডে গরমিল অথবা শূন্য পাসওয়ার্ড, অনুগ্রহ করে সংশোধন করুন। "
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "পাসওয়ার্ড:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "পুনরায় পাসওয়ার্ড লিখুন:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "নির্দিষ্ট প্যারামিটার ব্যবহার করে উইজার্ড এখন Kolab সার্ভার কনফিগার করবে"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "হোস্টের নাম:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "মেইল ডোমেইন:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -996,247 +994,231 @@ msgstr ""
 "Kolab সার্ভার কনফিগার করা হয়েছে এবং বর্তমানে চলছে। https://127.0.0.1/kolab/"
 "admin/ -এলেখা পাসওয়ার্ড ব্যবহার করে ম্যানজার' হিসাবে লগ-ইন করুন"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "ইনস্টল প্রক্রিয়া চলছে"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "আপনার সিস্টেমে Kolab সার্ভার ইনস্টল করবার প্রক্রিয়া..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "আপনার সিস্টেমে Kolab সার্ভার কনফিগার করবার প্রক্রিয়া..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "সাম্বা উইজার্ড"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"আপনার ডোমেইননেম পুনরায় ঠিক করতে হবে। ডিএনএস সার্ভারের জন্য আপনার একটি নির্ভূল "
-"ডোমেইননেম প্রয়োজন, যেটি লোকালডোমেইন (localdomain) বা কিছুইনা (none) হতে "
-"পারবেনা। হোস্টের নাম অবশ্যই FQDN: Fully Qualified Domain Name হতে হবে। "
-"ড্রেককানেক্ট (drakconnect) ব্যবহার করে এটি ঠিক করুন।"
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Ldap কনফিগারেশন উইজার্ড"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Ldap সার্ভারে একজন ব্যবহারকারী যোগ করো"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Ldap কনফিগারেশন উইজার্ড"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Ldap কনফিগারেশন উইজার্ড"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "আপনাকে অবশ্যই প্রথমে একটি Ldap সার্ভার সেটআপ করতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "আপনার পছন্দ:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "ইনস্টল সার্ভার-এর কনফিগারেশন"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP ব্যবহারকারী যোগ করা হচ্ছে"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "এর ভিতর ব্যবহারকারী তৈরি করা হয়েছে:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "এর ভিতর ব্যবহারকারী তৈরি করা হয়েছে:%s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "নাম:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "নাম:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "ব্যবহারকারী সমুহের ধারক:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "আপনাকে অবশ্যই একটি বৈধ প্রথম নাম দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "আপনাকে অবশ্যই একটি বৈধ নাম দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "আপনাকে অবশ্যই একজন বৈধ ব্যবহারকারীর নাম দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP ব্যবহারকারীর পাসওয়ার্ড"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "পাসওয়ার্ডসমুহ অবশ্যই মিলতে হবে"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "পুনরায় পাসওয়ার্ড লিখুন:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "আপনাকে অবশ্যই LDAP এর জন্য একটি পাসওয়ার্ড দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "পাসওয়ার্ডসমুহ মিলছে না"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-#, fuzzy
-msgid "Administrator"
-msgstr "অ্যাডমিনস্ট্রেটর LDAP"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, fuzzy, perl-format
+msgid "Administrator,%s"
+msgstr "অ্যাডমিনস্ট্রেটর LDAP,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "LDAP সার্ভার কনফিগার করা হচ্ছে"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "ডোমেইনের নাম:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "ডোমেইনের নাম:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "অ্যাডমিনস্ট্রেটর LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "TFTP ডিরেক্টরি:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "TFTP ডিরেক্টরি:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "অ্যাডমিনস্ট্রেটর LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP পাসওয়ার্ড:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "পুনরায় LDAP পাসওয়ার্ড লিখুন:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "আপনাকে অবশ্যই একটি বৈধ প্রথম নাম দিতে হবে।"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "ব্যবহারকারী তৈরির নিশ্চিতকরণ"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "প্রথম নাম:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "ব্যবহারকারীর নাম:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "এর ভিতর তৈরি করো:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "LDAP সার্ভার তৈরির জন্য নিশ্চিতকরণ তথ্য"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "ব্যবহারকারী সমুহের ধারক:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "উইজার্ড সাফল্যের সাথে LDAP কনফিগার করেছে।"
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "সাফল্যের সাথে ব্যবহারকারী যোগ করা হয়েছে"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Ldap সার্ভারে একজন ব্যবহারকারী যোগ করো"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "ইতিমধ্যেই সার্ভার কনফিগার করা হয়েছে"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "আপনি ইতিমধ্যেই drakwizard এর মাধ্যমে আপনার Ldap সার্ভার কনফিগার করেছেন\n"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s বিফল"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "ত্রুটি!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "%s এর সাথে সংযোগ করা যাচ্ছে নাহ্"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "নিউজ-এর উইজার্ড"
@@ -1380,13 +1362,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "ডিরেক্টরি।"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "আপনি লেখা পাথটি বর্তমানে উপস্থিত নেই।"
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "ব্যবহার-এর নিয়ন্ত্রন"
 
@@ -1441,31 +1423,22 @@ msgstr "নেটমাস্ক :"
 msgid "The wizard successfully configured your NFS server."
 msgstr "উইজার্ড সাফল্যের সাথে আপনার NFS সার্ভার কনফিগার করেছে।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"আপনার এনআইএস (NIS) ডোমেইননেম পুনরায় ঠিক করতে হবে। এনআইএস (NIS) সার্ভারের জন্য "
-"আপনার একটি নির্ভূল এনআইএস (NIS) ডোমেইননেম প্রয়োজন, যেটি লোকালডোমেইন "
-"(localdomain) বা কিছুইনা (none) হতে পারবেনা।"
-
 # confused
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "autofs ম্যাপসহ NIS সার্ভার"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS ক্লায়েন্ট"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "autofs ম্যাপ, auto.home এবং auto.master filesসহ একটি NIS সার্ভার সেট-আপ করুন।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1473,28 +1446,28 @@ msgstr ""
 "ব্যবহারকারীরা NIS ক্লায়েন্ট কম্পিউটার নেটওয়ার্কে লগ-ইন করলে, স্বয়ংক্রিয়ভাবে সার্ভার "
 "থেকে নিজেদের হোম ডিরেক্টরি মাউন্ট করতে সক্ষম হবেন।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "আপনি কী করতে ইচ্ছুক ?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "কম্পিউটারকে NIS ক্লায়েন্ট হিসাবে কনফিগার করুন"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "আপনাকে শুধু nisdomain এবং nisserver লিখতে হবে।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS সার্ভার:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS ডোমেইন:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1504,7 +1477,7 @@ msgstr ""
 "উইজার্ড autofs ম্যাপ তৈরি করে যার দ্বারা NIS ব্যবহারকারীরা একটি NIS ক্লায়েন্ট "
 "কম্পিউটারে নিজেদের হোম ডিরেক্টরি স্বয়ংক্রিয়ভাবে মাউন্ট করতে সক্ষম হবেন।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1512,41 +1485,41 @@ msgstr ""
 "হোম NIS: ব্যবহারকারীদের NIS সার্ভারে হোম বেস ডিরেক্টরি। এই ডিরেক্টরিটি NFS "
 "সার্ভারের মাধ্যমে এক্সপোর্ট করা হবে।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS ডোমেইন: যে NIS ডোমেইন ব্যবহার করা হবে (সাধারণত আপনার DNS ডোমেইনের নাম)।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS সার্ভার: আপনার কম্পিউটারের নাম।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "হোম NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS domainname:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "উইজার্ড autofs ম্যাপসহ আপনার NIS সার্ভার সেট করবে"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS ডিরেক্টরি:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domainname: NIS ডোমেইনের নাম।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS সার্ভার: NIS সার্ভারের হোস্টের নাম।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1554,26 +1527,26 @@ msgstr ""
 "YPBIND ডেমনটি NIS ডোমেইনের জন্য সার্ভার অনুসন্ধান করে এবং NIS -এর বাইনডিং "
 "সংক্রান্ত তথ্য রক্ষণাবেক্ষণ করে।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "ত্রুটি: ডিরেক্টরি হওয়া আবশ্যক।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 "ভুল: এনআইএসডোমেইননেম (nisdomainname) 'কিছুইনা' ('none') বা "
 "'লোকালডোমেইন' ('localdomain') হতে পারবেনা।"
 
 # msgstr "অনুগ্রহ করে এটি সুবিন্যস্ত করুন।"
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "অনুগ্রহ করে এটি ঠিক করুন।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "উইজার্ড সাফল্যের সাথে আপনার মেশিনকে NIS ক্লায়েন্ট হিসাবে কনফিগার করেছে।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1581,16 +1554,16 @@ msgstr ""
 "উইজার্ড সাফ্যলের সাথে আপনার মেশিনকে autofs ম্যাপ সহ একটি NIS সার্ভার হিসাবে "
 "কনফিগার করেছে।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 "আপনর সিস্টেমকে Autofs ম্যাপ-সহ একটি NIS সার্ভার হিসাবে কনফিগার করা হচ্ছে..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "Autofs ম্যাপসহ NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "আপনার সিস্টেমকে NIS ক্লায়েন্ট হিসাবে কনফিগার করা হচ্ছে..."
 
@@ -1961,7 +1934,7 @@ msgid ""
 msgstr "আপনার প্রক্সি কনফিগার করবার জন্য নিম্নলিখিত প্যারামিটার উইজার্ড সংগ্রহ করেছে:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1993,6 +1966,14 @@ msgstr "স্কুইড প্রক্সি"
 msgid "PXE Wizard"
 msgstr "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."
+msgstr ""
+"আপনার ডোমেইননেম পুনরায় ঠিক করতে হবে, যেটি লোকালডোমেইন (localdomain) বা কিছুইনা "
+"(none) হতে পারবেনা। ড্রেককানেক্ট (drakconnect) ব্যবহার করে এটি ঠিক করুন।"
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXE-র সার্ভার নির্ধারণ করুন"
@@ -2350,24 +2331,24 @@ msgstr "আপনার সিস্টেমে PXE সার্ভার ক�
 msgid "PXE server"
 msgstr "PXE সার্ভার"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "সাম্বা উইজার্ড"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s উপস্থিত নেই।"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "সমস্ত - ব্যবহারে কোনো প্রতিরোধ নেই"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "আমার নিয়াম - অনুমোদিত এবং অবাঞ্ছিত হোস্ট সম্বন্ধে আমাকে জিজ্ঞাসা করবে"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2375,55 +2356,55 @@ msgstr ""
 "লিনাক্স-বিহীন ওয়ার্কস্টেশনের জন্য সাম্বা আপনার সার্ভারকে ফাইল এবং প্রিন্ট সার্ভার "
 "হিসাবে ব্যবহার করতে সাহায্য করবে।"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "সাম্বা কনফিগারেশন উইজার্ড"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "উইজার্ড আপনার সার্ভারের জন্য সাম্বা পরিসেবা কনফিগার করতে সাহায্য করবে।"
 
 # msgstr "সাম্বা-র এটা জানা আবশ্যক কোন উইন্ডোস ওয়ার্কগ্রুপ-এর জন্য পরিসেবা প্রদান করবে।"
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "সাম্বার জানা প্রয়োজন কোন উইন্ডোজ ওর্য়াকগ্রুপ সে সার্ভ করবে।"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "ওয়ার্কগ্রুপ"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "ওয়ার্কগ্রুপ:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "ওয়ার্কগ্রুপ সঠিক নয়"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "সার্ভার ব্যনার।"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "উইন্ডোস ওয়ার্কস্টেশন-এ ব্যনারের সাহয্যে এই সার্ভারটি পরিচিত হবে।"
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "ব্যনার:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "সার্ভার ব্যনারটি সঠিক নয়"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "ব্যবহারের লেভেল :"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2431,7 +2412,7 @@ msgstr ""
 "* উদাহরণ ১: 150.203.*.* -এ সকল আইপি (IP)কে অনুমতি প্রদান করো; একটি ব্যতীত\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2439,7 +2420,7 @@ msgstr ""
 "* উদাহরণ ২: উল্লেখিত নেটওয়ার্ক/নেটমাস্ক-এর হোস্টদের অনুমতি প্রদান করো\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2447,7 +2428,7 @@ msgstr ""
 "* উদাহরণ ৩: শুধুমাত্র দুইজন হোস্টকে অনুমতি প্রদান করবে\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2460,23 +2441,23 @@ msgstr ""
 "hosts deny = pirate"
 
 # msgstr "বিশেষ দ্রষ্টব্য, ব্যবহারের জন্য উপযুক্ত ব্যবহারের লেভেলের পাসওয়ার্ড প্রয়োজন।"
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "লক্ষ্য করুন যে প্রবেশ করতে এখনও উপযুক্ত ব্যবহারকারী‌-মাত্রার পাসওর্য়াড প্রয়োজন।"
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "হোস্টদেরকে অনুমতি প্রদান করুন:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "হোস্টদেরকে বহিষ্কার করুন:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "সাম্বা পরিসেবা সক্রিয় করা হয়েছে"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2485,19 +2466,19 @@ msgstr ""
 "আপনার ওয়ার্কস্টেশনের জন্য সাম্বা একটি সাধারণ ফাইল শেয়ার করবার স্থান এবং আপনার "
 "সার্ভারের সাথে যুক্ত প্রিন্টারের জন্য প্রিন্ট-শেয়ার করবার ব্যবস্থা প্রদান করতে সক্ষম।"
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "ফাইল শেয়ার করবার স্থান সক্রিয় করো"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "সার্ভারের প্রিন্ট শেয়ারের ব্যবস্থা সক্রিয় করো"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "মালিকদের জন্য তাদের হোম ডিরেক্টরি উপস্থিত করো"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2506,28 +2487,28 @@ msgstr ""
 "চেয়েছেন, কিন্তু এর জন্য আপনাকে/ওদের smbpassword ব্যবহার করে পাসওয়ার্ড নির্ধারণ "
 "করতে হবে।"
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "শেয়ার করা ডিরেক্টরি:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "যে ডিরেক্টরিটি শেয়ার করা হবে তার পাথ লিখুন।"
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "শেয়ারড ডিরেক্টরি তৈরি করো যদি অনুপস্হিত থাকে"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "ডিরেক্টরি তৈরি করতে ব্যর্থ।"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "ফাইলের অনুমতি"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2537,60 +2518,60 @@ msgstr ""
 "এইভাবে লিখুন:\n"
 "root, fred, @users, @wheel প্রত্যেক ধরনের অনুমতির জন্য।"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "পড়ার তালিকা:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "লেখার তালিকা:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "পরিচিত ব্যবহারকারীদের জন্য যে প্রিন্টারগুলো উপস্থিত হবে তা নির্বাচন করুন"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "সমস্ত প্রিন্টার সক্রিয় করো"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "সাম্বা কনফিগার করা হচ্ছে"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "আপনার সাম্বা সার্ভার কনফিগার করবার জন্য নিম্নলিখিত প্যারামিটার উইজার্ড সংগ্রহ করেছে।"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "সার্ভার ব্যনার:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "ফাইল শেয়ার করা:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "প্রিন্ট সার্ভার:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "হোম:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "প্রিন্টার:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "উইজার্ড সাফল্যের সাথে আপনার সাম্বা সার্ভার কনফিগার করেছে।"
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "আপনার সাম্বা সার্ভার কনফিগার করবার প্রক্রিয়া..."
 
@@ -2832,6 +2813,32 @@ msgstr "অ্যাপাচে সার্ভার"
 msgid "Configuring your system as Apache server ..."
 msgstr "আপনার সিস্টেমকে অ্যাপাচে সার্ভার হিসাবে কনফিগার করবার প্রক্রিয়া..."
 
+# sgstr "আপনার হোস্টের নাম পুনরায় মীমাংসা করা প্রয়োজন।"
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "আপনার হোস্টের নাম পুনরায় ঠিক করতে হবে।"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "আপনার ডোমেইননেম পুনরায় ঠিক করতে হবে। ডিএনএস সার্ভারের জন্য আপনার একটি নির্ভূল "
+#~ "ডোমেইননেম প্রয়োজন, যেটি লোকালডোমেইন (localdomain) বা কিছুইনা (none) হতে "
+#~ "পারবেনা। হোস্টের নাম অবশ্যই FQDN: Fully Qualified Domain Name হতে হবে। "
+#~ "ড্রেককানেক্ট (drakconnect) ব্যবহার করে এটি ঠিক করুন।"
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "%s এর সাথে সংযোগ করা যাচ্ছে নাহ্"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "আপনার এনআইএস (NIS) ডোমেইননেম পুনরায় ঠিক করতে হবে। এনআইএস (NIS) সার্ভারের "
+#~ "জন্য আপনার একটি নির্ভূল এনআইএস (NIS) ডোমেইননেম প্রয়োজন, যেটি লোকালডোমেইন "
+#~ "(localdomain) বা কিছুইনা (none) হতে পারবেনা।"
+
 #~ msgid "Configure Ldap server"
 #~ msgstr "Ldap সার্ভার কনফিগার করো"
 
diff --git a/po/br.po b/po/br.po
index e5e2902e..6f516004 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-03-30 10:11+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: breton <LL@li.org>\n"
@@ -20,31 +20,31 @@ msgstr ""
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Ho evezh."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Fazi."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gourc'hemennoù"
 
@@ -80,50 +80,50 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Ho evezh"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fazi"
@@ -164,12 +164,25 @@ msgstr "IP an arval :"
 msgid "The wizard successfully added the client."
 msgstr ""
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Serriñ"
 
@@ -251,8 +264,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "diweredekaet"
@@ -261,8 +274,8 @@ msgstr "diweredekaet"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr ""
@@ -275,146 +288,135 @@ msgstr "C'hetal :"
 msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Sac'het"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Servijer DNS mestr"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Servijer DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP ar servijer :"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -422,108 +424,108 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr ""
 
@@ -551,7 +553,7 @@ msgstr "Serijer ar mailh"
 msgid "FTP server"
 msgstr "Servijer FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Servijer Samba"
 
@@ -575,7 +577,7 @@ msgstr ""
 msgid "Mandrakelinux Install server"
 msgstr ""
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Servijer Kolab"
 
@@ -599,7 +601,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Staliañ a zo sac'het"
 
@@ -819,13 +821,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -833,282 +829,273 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Tremenger :"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Anv ar ostiz :"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Skoazeller Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Ker :"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "An tremegerioù ne glot ket"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Servijer Postfix"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Anv ar ostiz :"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Servijer Postfix"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Servijer Postfix"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Sac'het"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Fazi"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Skoazeller keleier"
@@ -1229,13 +1216,13 @@ msgstr ""
 msgid "Directory:"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr ""
 
@@ -1284,135 +1271,129 @@ msgstr "Maskl rouedad:"
 msgid "The wizard successfully configured your NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Arval NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Petra e fell deoc'h da ober ?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Servijer NIS :"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr ""
 
@@ -1727,7 +1708,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1757,6 +1738,12 @@ msgstr "Proksi Squid"
 msgid "PXE Wizard"
 msgstr "Skoazeller 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."
+msgstr ""
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr ""
@@ -2067,95 +2054,95 @@ msgstr ""
 msgid "PXE server"
 msgstr "Servijer PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Skoazeller Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Strollad labour"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2163,128 +2150,128 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Skoazeller ar voullerez :"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Ker :"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Moullerezioù :"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr ""
 
diff --git a/po/bs.po b/po/bs.po
index f0640356..3bcf66bc 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-10-10 21:46+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosanski <lokal@lugbih.org>\n"
@@ -26,31 +26,31 @@ msgstr "čarobnjak za podešavanje"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Upozorenje."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Greška."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Čestitam"
 
@@ -91,11 +91,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(ne morate unositi domen nakon imena)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identifikacija klijenta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -103,7 +103,7 @@ msgstr ""
 "Obratite pažnju da dati IP broj i ime klijenta moraju biti jedinstveni u "
 "mreži."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -113,33 +113,33 @@ msgstr ""
 "preduzeće.ba. Svaki računar u mreži mora imati (jedinstvenu) IP adresu, u "
 "uobičajenom obliku sa tačkama."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Ime računara:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP broj računara:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Upozorenje"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Nalazite se u dhcp-u, server možda neće raditi sa ovom konfiguracijom."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Greška"
@@ -184,12 +184,34 @@ msgstr "IP klijenta:"
 msgid "The wizard successfully added the client."
 msgstr "Čarobnjak je uspješno dodao klijenta."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Morate prilagoditi ime domene (domainname). Za DNS server morate imati "
+"ispravno ime domene (domainname), koje nije isto kao localdomain i ne smije "
+"biti prazno. Naziv računara je FQDN: Fully Qualified Domain Name. Pokrenite "
+"drakconnet kako bi prilagodili ime."
+
+#: ../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."
+msgstr ""
+"Morate prilagoditi ime domene (domainname). Za DNS server morate imati "
+"ispravno ime domene (domainname), koje nije isto kao localdomain i ne smije "
+"biti prazno. Naziv računara je FQDN: Fully Qualified Domain Name. Pokrenite "
+"drakconnet kako bi prilagodili ime."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Naredba se izvršava. Da li je želite prekinuti i izaći iz Čarobnjaka?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Zatvori"
 
@@ -281,8 +303,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "isključen"
@@ -291,8 +313,8 @@ msgstr "isključen"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "uključen"
@@ -305,53 +327,38 @@ msgstr "Interfejs:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Čarobnjak je uspješno podesio DHCP servise."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Neuspjeh"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Ponovo pokrenite drakwizard i pokušajte promijeniti neke parametre."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Morate prilagoditi naziv računara."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Morate prilagoditi ime domene (domainname). Za DNS server morate imati "
-"ispravno ime domene (domainname), koje nije isto kao localdomain i ne smije "
-"biti prazno. Naziv računara je FQDN: Fully Qualified Domain Name. Pokrenite "
-"drakconnet kako bi prilagodili ime."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Glavni DNS server"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Pomoćni DNS server"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Dodaj računar u DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Ukloni računar iz DNSa"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -359,11 +366,11 @@ msgstr ""
 "DNS (Domain Name Server) je servis koji ostvaruje relaciju između internet "
 "imena i stvarnog računara."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Čarobnjak za podešavanje glavnog DNS servera"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -373,47 +380,47 @@ msgstr ""
 "Podešavajući ga pružićete lokalni DNS servis za imena lokalnih računara, pri "
 "čemu su svi ne-lokalni zahtjevi preusmjereni na neki vanjski DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Šta želite uraditi:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS server"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(ne morate unositi domen nakon imena)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Ime servera:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS ime domene:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Izaberite računar koji želite ukloniti sa sljedeće liste."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Ukloni računar iz postojeće DNS konfiguracije."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Ukloni računar:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Naziv računara:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -423,11 +430,11 @@ msgstr ""
 "funkcionisati kao rezervni DNS server u slučaju da primarni server postane "
 "nedostupan."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP broj glavnog DNS servera:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -435,11 +442,11 @@ msgstr ""
 "Prosljeđivanje se dešava samo za one upite za koje server nije autoritativan "
 "i ne mora sadržavati odgovor u svom cache-u."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP vašeg forwardera"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -447,15 +454,15 @@ msgstr ""
 "Ako vam je potrebna i znate IP adresu vašeg fowardera unesite je ovdje, u "
 "suprotnom ostavite prazno"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Vanjski DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Dodaj domen za pretragu:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -463,7 +470,7 @@ msgstr ""
 "Naziv domene (domainname) ovog servera je automatski dodano, tako da ga ne "
 "morate dodavati ovdje."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -475,26 +482,26 @@ msgstr ""
 "vaše lokalno ime domene. Ovo se može promijeniti navođenjem željenog puta "
 "pretrage za domenu nakon određene ključne riječi."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Uobičajeni naziv domene za pretragu:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Ovo nije ispravna IP adresa za forwarder... pritisnite Dalje za nastavak"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Ovo nije ispravna IP adresa glavnog DNSa... pritisnite Dalje za nastavak"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Ovo nije ispravna IP adresa... pritisnite Dalje za nastavak"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -502,11 +509,11 @@ msgstr ""
 "Izgleda da je ovaj računar već u vašoj DNS konfiguraciji... pritisnite Dalje "
 "za nastavak"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Greška:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -514,7 +521,7 @@ msgstr ""
 "Izgleda da je ovo nije prisutno u vašoj DNS konfiguraciji... pritisnite "
 "Dalje za nastavak"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -522,71 +529,71 @@ msgstr ""
 "Izgleda da DNS server nije podešen koristeći čarobnjak. Molim pokrenite DNS "
 "čarobnjak: glavni DNS server."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Izgleda da niste glavni DNS server, tako da ne mogu dodati/ukloniti računar."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Čarobnjak će sada izgraditi konfiguraciju pomoćnog DNS servera"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "uz ovu konfiguraciju:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Klijent sa ovom identifikacijom će biti dodan u vaš DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Ime računara:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP adresa računara:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Klijent sa ovom identifikacijom će biti uklonjen iz vašeg DNSa"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS server će sada biti podešen sljedećom konfiguracijom"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Ime servera:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domensko ime:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Čarobnjak je uspješno računar u vaš DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Čarobnjak je uspješno uklonio računar iz vašeg DNSa."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Čarobnjak je uspješno podesio DNS servis na ovom serveru."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Molim ponovo pokrenite drakwizard i probajte promijeniti neke parametre."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Podešavam vaš sistem kao Glavni DNS server ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Podešavam vaš sistem kao Pomoćni DNS server ..."
 
@@ -614,7 +621,7 @@ msgstr "Mail server"
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba server"
 
@@ -638,7 +645,7 @@ msgstr "NIS server autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux instalacioni server"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -663,7 +670,7 @@ msgstr ""
 "%s nije instaliran\n"
 "Kliknite na \"Sljedeći\" da ga instalirate ili \"Odustani\" za izlaz"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "instalacija nije uspjela"
 
@@ -906,15 +913,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Čarobnjak za podešavanje Kolab servera"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Morate prilagoditi vaše domensko ime koje ne smije biti 'localdomain' ili "
-"ništa. Molim pokrenite drakconnect da to ispravite."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -926,7 +925,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:59
+#: ../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 "
@@ -936,39 +935,39 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Čarobnjak će napraviti rezervnu kopiju vaših "
 "prijašnjih konfiguracionih datoteka za ove servise."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Dobrodošli u čarobnjak za podešavanje Kolab groupware servera"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Unesite šifru za manager account za Kolab server:"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Šifre se ne poklapaju ili su prazne, molim ispravite."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Ponovo šifra:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Ime računara:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Domena za mail:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -976,46 +975,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instalacija u toku"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Instaliram Kolab server na vašem sistemu..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavam Kolab server na vašem sistemu..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "LDAP čarobnjak"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Morate prilagoditi ime domene (domainname). Za LDAP server morate imati "
-"ispravno ime domene (domainname), koje nije isto kao localdomain i ne smije "
-"biti prazno. Naziv računara je FQDN: Fully Qualified Domain Name. Pokrenite "
-"drakconnet kako bi prilagodili ime."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Prikaži LDAP konfiguraciju"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Dodaj korisnika na LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Obriši LDAP konfiguraciju"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1023,194 +1011,192 @@ msgstr ""
 "LDAP je lagani protokol za pristup usluzi imenika, konkretno X.500-baziranom "
 "imeničom servisu."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP je skraćenica za Lightweight Directory Access Protokol (lagani protokol "
 "za pristup imeniku)."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Čarobnjak za podešavanje LDAP servera"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Morate najprije podesiti LDAP server."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Vaš izbor:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Obriši konfiguraciju"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Snimam postojeću bazu u /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP dodajem korisnika"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Korisnik napravljen u: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Korisnik napravljen u: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Ime:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Prezime:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Korisničko ime:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Morate unijeti ispravno Ime."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Morate unijeti ispravno Prezime."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Morate unijeti ispravno Korisničko ime."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP šifra korisnika"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "šifre se moraju poklapati"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Šifra (ponovo):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Morate unijeti šifru za LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Šifre se ne poklapaju"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Administrator je korisnik koji može davati dozvole drugima na LDAP bazi "
 "podataka"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrator,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Podešavanje LDAP servera"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Ime domene: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Ime domene: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP administrator"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP stablo imenika"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS imenovanje se koristi za definiciju LDAP stabla imenika"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP stablo imenika:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP administrator:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP šifra:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP šifra (ponovo):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Morate unijeti ispravno LDAP stablo imenika."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Potvrda pravljenja korisnika"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Ime:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Korisničko ime:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Napravi u:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Potvrda pravljenja LDAP servera"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Kontejner za korisnika:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Čarobnjak je uspješno podesio LDAP server."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Uspješno dodao korisnika"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Greška pri dodavanju korisnika u LDAP bazu"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Server je već podešen"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Već ste uspješno podesili vaš LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s nije uspjelo"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Greška!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Ne mogu se spojiti na %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News čarobnjak"
@@ -1349,13 +1335,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorij:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Put koji ste unijeli ne postoji."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontrola pristupa"
 
@@ -1408,28 +1394,20 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Čarobnjak je uspješno podesio NFS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Morate prilagoditi vaše NIS domensko ime. Za NIS morate imati ispravno NIS "
-"domensko ime, a ne 'localdomain' ili bez domene."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS server sa autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS klijent"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Podesite NIS server sa autofs map, auto.home i auto.master datotekama."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1437,28 +1415,28 @@ msgstr ""
 "Korisnici automatski montiraju svoj home direktorij sa servera prilikom "
 "prijave na NIS klijent računar u mreži."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Šta želite uraditi?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Podesi računar kao NIS klijent"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Morate samo unijeti NIS domenu i server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS domena:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1468,7 +1446,7 @@ msgstr ""
 "autofs map, tako da će ponuditi mogućnosti za NIS korisnike da automatski "
 "montiraju svoj home direktorij na računaru NIS klijentu."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1476,42 +1454,42 @@ msgstr ""
 "Home NIS: polazni home direktorij za korisnike na NIS serveru. Ovaj "
 "direktorij će biti izvezen koristeći NFS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS domena: NIS domena koju želite koristiti (u principu isto što i vaše DNS "
 "domensko ime)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS server: ime vašeg računara."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS ime domene:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Čarobnjak će podesiti vaš NIS server sa autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS direktorij:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS ime domene: ime za NIS domenu."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS server: ime računara za NIS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1519,38 +1497,38 @@ msgstr ""
 "YPBIND demon pronalazi servere za NIS domene i održava informacije o NIS "
 "vezivanju."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Greška: mora biti direktorij."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Greška: NIS ime domene ne smije biti prazno ili 'localdomain'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Molim popravite."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Čarobnjak je uspješno podesio vaš računar da bude NIS klijent."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 "Čarobnjak je uspješno podesio vaš računar da bude NIS server sa autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Podešavam vaš sistem kao NIS server sa Autofs map..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS sa Autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Podešavam vaš sistem kao NIS klijent ..."
 
@@ -1922,7 +1900,7 @@ msgstr ""
 "proxy-ja:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1958,6 +1936,14 @@ msgstr "Squid čarobnjak"
 msgid "PXE Wizard"
 msgstr "FTP čarobnjak"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Morate prilagoditi vaše domensko ime koje ne smije biti 'localdomain' ili "
+"ništa. Molim pokrenite drakconnect da to ispravite."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 #, fuzzy
 msgid "Set PXE server"
@@ -2339,25 +2325,25 @@ msgstr "Podešavanje PXE servera na vašem sistemu..."
 msgid "PXE server"
 msgstr "NFS server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba čarobnjak"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s ne postoji."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Sve - Bez ograničenja pristupa"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moja pravila - Pitaj me za dozvoljene i zabranjene računare"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2365,36 +2351,36 @@ msgstr ""
 "Samba omogućuje vašem serveru da se ponaša kao file i print server za radne "
 "stanice na kojima se koriste ne-Linux sistemi."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Čarobnjak za podešavanje Sambe"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite Samba servis na ovom serveru."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba mora znati koju Windows radnu grupu će opsluživati."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Radna grupa"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Radna grupa:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Radna grupa je pogrešna"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Server Banner."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2402,19 +2388,19 @@ msgstr ""
 "Banner je način na koji će ovaj računar biti opisan na Windows radnim "
 "stanicama."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Server Banner je neispravan"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nivo pristupa:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2423,7 +2409,7 @@ msgstr ""
 "* Primjer 1: dozvoli sve IPove u 150.203.*.*; osim jednog\\nhosts allow = "
 "150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2432,14 +2418,14 @@ msgstr ""
 "* Primjer 2: dozvoli računare čiji IP zadovoljava određenu mrežu/masku"
 "\\nhosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr "* Primjer 3: dozvoli neke računare\\nhosts allow = zenica, neretva"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2451,24 +2437,24 @@ msgstr ""
 "pristup jednom konkretnom računaru\\nhosts allow = @foonet\\nhosts deny = "
 "pirat"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Primijetite da su za pristup i dalje potrebne odgovarajuće korisničke šifre."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Dozvoli računare:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Odbij računare:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Uključeni Samba servisi"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2478,19 +2464,19 @@ msgstr ""
 "radnim stanicama, a također može omogućiti dijeljenje štampača za štampače "
 "koji su spojeni na vaš server."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Uključi oblast za dijeljenje"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Uključi dijeljenje štampača"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Učini home direktorije dostupnim njihovim vlasnicima"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2498,29 +2484,29 @@ msgstr ""
 "Izabrali ste da dozvolite pristup korisnika svojim home direktorijima preko "
 "Sambe, ali oni moraju koristiti smbpasswd da bi postavili šifru."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Dijeljeni direktorij:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Unesite put direktorija koji želite dijeliti."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 #, fuzzy
 msgid "Failed to create directory."
 msgstr "Treba biti direktorij."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Dozvole datoteka"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2530,62 +2516,62 @@ msgstr ""
 "Unesite korisnike ili grupe razdvojene zarezom (grupama mora prethoditi znak "
 "\\'@\\') ovako: \\nroot, korisnik, @users, @wheel za svaku vrstu dozvole."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "read list:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "write list:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Izaberite koji štampači trebaju biti dostupni poznatim korisnicima"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Omogući sve štampače"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Podešavanje Sambe"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Sambe."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Server banner:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Dijeljenje datoteka:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Print server:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Home:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Štampači:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Čarobnjak je uspješno podesio Samba server."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Podešavanje FTP servera"
@@ -2830,3 +2816,26 @@ msgstr "Apache server"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje sistema kao Apache servera..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Morate prilagoditi naziv računara."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Morate prilagoditi ime domene (domainname). Za LDAP server morate imati "
+#~ "ispravno ime domene (domainname), koje nije isto kao localdomain i ne "
+#~ "smije biti prazno. Naziv računara je FQDN: Fully Qualified Domain Name. "
+#~ "Pokrenite drakconnet kako bi prilagodili ime."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Ne mogu se spojiti na %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Morate prilagoditi vaše NIS domensko ime. Za NIS morate imati ispravno "
+#~ "NIS domensko ime, a ne 'localdomain' ili bez domene."
diff --git a/po/ca.po b/po/ca.po
index f48b9cea..e631d1ed 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-08-09 11:22+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -25,31 +25,31 @@ msgstr "Auxiliar de configuració"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Avís."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Error."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Felicitats"
 
@@ -89,11 +89,11 @@ msgstr "Aquest auxiliar us ajudarà a afegir un client nou al DNS local."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(no cal que escrigueu el domini després del nom)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identificació del client:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -101,7 +101,7 @@ msgstr ""
 "Noteu que l'adreça IP i el nom del client introduïts han de ser únics a la "
 "xarxa."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -111,21 +111,21 @@ msgstr ""
 "net. Cadascuna de les màquines de la xarxa ha de tenir una adreça IP "
 "(única), amb la sintaxi habitual de punts."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nom de la màquina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Adreça IP de la màquina:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Avís"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Esteu sobre dhcp; és possible que el servidor no funcioni amb aquesta "
@@ -134,12 +134,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
@@ -184,13 +184,34 @@ msgstr "IP del client:"
 msgid "The wizard successfully added the client."
 msgstr "L'auxiliar ha afegit el client amb èxit."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Heu de reajustar el vostre nom domini. Un servidor de DNS necessita un nom "
+"de domini correcte diferent de localdomain o cap. Executeu drakconnect per "
+"ajustar-lo."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+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 ""
+"Heu de reajustar el vostre nom domini. Un servidor de DNS necessita un nom "
+"de domini correcte diferent de localdomain o cap. Executeu drakconnect per "
+"ajustar-lo."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "La comanda encara s'està executant. Voleu matar-la i sortir de l'assistent?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Tanca"
 
@@ -281,8 +302,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "inhabilitat"
@@ -291,8 +312,8 @@ msgstr "inhabilitat"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "habilitat"
@@ -305,53 +326,38 @@ msgstr "Interfície:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "L'auxiliar ha configurat els serveis DHCP del servidor amb èxit."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Ha fallat"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Tornar a llançar drakwizard i intenta canviar alguns paràmetres."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Heu de reajustar el nom de la vostre màquina."
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"Heu de reajustar el vostre nom domini. Un servidor de DNS necessita un nom "
-"de domini correcte diferent de localdomain o cap. Executeu drakconnect per "
-"ajustar-lo."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Servidor DNS mestre"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Servidor DNS esclau"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Afegeix nom de màquina al DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Elimina nom de màquina del DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -359,11 +365,11 @@ msgstr ""
 "El DNS (Servidor de Noms de Domini) és el servei que relaciona una màquina "
 "amb un nom d'ordinador d'internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Auxiliar de configuració del mestre DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -373,58 +379,58 @@ msgstr ""
 "Aquesta configuració proporcionarà un servei DNS per als noms dels "
 "ordinadors locals, i les peticions no locals es reenviaran a un DNS exterior."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Què voleu fer:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Servidor DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(no cal que afegiu el domini després del nom)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP del servidor:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Nom de domini NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Escull el nom de màquina que vols eliminar de la llista següent."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Elimina una màquina de la configuració DNS existent."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Elimina màquina:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Nom de l'ordinador:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Adreça IP del servidor DNS mestre:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -432,25 +438,25 @@ msgstr ""
 "Hi ha reenviament en aquelles peticions per a les quals no el servidor no és "
 "autoritatiu i no té la resposta a la seva memòria cau."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS extern:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Afegeix domini de cerca"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -458,7 +464,7 @@ msgstr ""
 "El nom de domini d'aquest servidor s'afegeix automàticament i no cal que "
 "l'afegeixis aquí."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -466,26 +472,26 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Aquesta adreça IP no és vàlida pel servidor DNS mestre... Premeu Següent per "
 "continuar"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Aquesta adreça IP no és vàlida... Premeu Següent per continuar"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -493,17 +499,17 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Error:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -511,74 +517,74 @@ msgstr ""
 "Sembla que no s'ha establert cap servidor DNS a través de l'auxiliar. Si us "
 "plau executeu l'auxiliar de DNS: Servidor DNS Mestre"
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Sembla que no sou un servidor DNS mestre, per tant no es poden afegir/"
 "eliminar noms de màquina."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "amb aquesta configuració:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Nom de l'ordinador:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Adreça IP de l'ordinador:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 "El servidor DNS està a punt de ser configurat amb la configuració següent"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Nom del servidor:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Nom de domini:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "L'auxiliar ha afegit el client amb èxit."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "L'auxiliar ha configurat els serveis DNS del servidor amb èxit."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 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."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "S'està configurant el vostre sistema com servidor DNS mestre ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "S'està configurant el vostre sistema com servidor DNS esclau ..."
 
@@ -606,7 +612,7 @@ msgstr "Servidor de correu"
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Servidor Samba"
 
@@ -630,7 +636,7 @@ msgstr ""
 msgid "Mandrakelinux Install server"
 msgstr "Servidor d'instal·lació Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -655,7 +661,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:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
@@ -898,15 +904,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Auxiliar de configuració de Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Heu de reajustar el vostre nom domini per tal que sigui diferent de "
-"localdomain o cap. Executeu drakconnect per ajustar-lo."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -914,46 +912,46 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Benvingut a l'auxiliar de configuració del servidor Kolab Groupware"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Introduïu la contrasenya pel compte de gestor del servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Contrasenya un altre cop:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Nom de host:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Domini de correu:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -961,255 +959,241 @@ msgstr ""
 "El servidor kolab està configurat i en execució. Entreu com a 'manager' amb "
 "la contrasenta que heu introduït a https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instal·lació en progrés"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "S'està configurant el servidor Kolab al vostre sistema..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Auxiliar del Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Heu de reajustar el vostre nom domini. Un servidor de LDAP necessita un nom "
-"de domini correcte diferent de localdomain o cap. Executeu drakconnect per "
-"ajustar-lo."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Auxiliar de configuració LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "Afegeix - Afegeix usuari al servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Auxiliar de configuració LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Auxiliar de configuració LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Configura un servidor LDAP."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Configuració del servidor d'instal·lació"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Crea a:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Nom:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Nom d'usuari:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 #, fuzzy
 msgid "You must enter a valid First Name."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 #, fuzzy
 msgid "You must enter a valid Name."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 #, fuzzy
 msgid "You must enter a valid User Name."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Contrasenya de l'usuari LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "passwords must match"
 msgstr "Les contrasenyes no concorden"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Contrasenya (un altre cop):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Les contrasenyes no concorden"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrador,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "S'està configurant LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Nom de domini: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Nom de domini: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Administrador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Directori TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Directori TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Administrador LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Contrasenya LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Contrasenya LDAP (un altre cop):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Heu d'introduir una contrasenta per LDAP."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Confirmació de l'usuari a crear"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Nom:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Nom d'usuari:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Crea a:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "S'està configurant el servidor DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Nom d'usuari:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "L'auxiliar ha configurat LDAP amb èxit."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "L'usuari s'ha afegit amb èxit"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Afegeix - Afegeix usuari al servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "L'auxiliar ha configurat el servidor Samba amb èxit."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Ha fallat"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Error!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Auxiliar de les notícies"
@@ -1351,13 +1335,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directori:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "La ruta que heu entrat no existeix."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Control d'accés"
 
@@ -1411,140 +1395,132 @@ msgstr "Màscara de xarxa:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "L'auxiliar ha configurat el servidor NFS amb èxit."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Heu de reajustar el vostre nom domini NIS. Un servidor NIS necessita un nom "
-"de domini correcte diferent de localdomain o cap."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Què voleu fer?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Configura el teu ordinador per a ser un client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Servidor NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Domini NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Domini NIS: domini NIS a usar (generalment el mateix que el vostre nom de "
 "domini DNS)"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Servidor NIS: el nom del vostre ordinador."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Inici NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Nom de domini NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Directori NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nom de domini NIS: nom del domini NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Servidor NIS: nom de màquina del servidor NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Error ha de ser un directori."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Error el nom de domini NIS no pot ser cap ni localdomain"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Si us plau ajusteu-ho."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "L'auxiliar ha configurat el teu sistema per a ser un client NIS amb èxit."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "S'està configurant el vostre sistema com a client NIS..."
 
@@ -1910,7 +1886,7 @@ msgstr ""
 "servidor intermediari:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1942,6 +1918,14 @@ msgstr "Servidor intermediari Squid"
 msgid "PXE Wizard"
 msgstr "Auxiliar de 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."
+msgstr ""
+"Heu de reajustar el vostre nom domini per tal que sigui diferent de "
+"localdomain o cap. Executeu drakconnect per ajustar-lo."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Configura servidor PXE"
@@ -2266,24 +2250,24 @@ msgstr "S'està configurant el servidor PXE al vostre sistema..."
 msgid "PXE server"
 msgstr "Servidor PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Auxiliar del Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s no existeix."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Tot: sense restriccions d'accés"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Les meves regles - Pregunta'm els ordinadors permesos i denegats"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2291,37 +2275,37 @@ msgstr ""
 "Samba permet que el servidor es comporti com un servidor de fitxers i "
 "d'impressió per a estacions de treball que no funcionen sobre sistemes Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Auxiliar de configuració de Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Aquest auxiliar us ajudarà a configurar els serveis Samba del servidor."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba necessita conèixer el grup de treball Windows al qual servirà."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grup de treball"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grup de treball:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "El grup de treball és erroni"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Descriptor del servidor."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2329,19 +2313,19 @@ msgstr ""
 "El descriptor determina la manera en què aquest servidor es descriurà a les "
 "estacions de treball Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Descriptor:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "El descriptor del servidor no és correcte"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nivell d'accés:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2349,7 +2333,7 @@ msgstr ""
 "* Exemple 1: permet totes les IP a 150.203.*.*; excepte un\n"
 "host allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2357,7 +2341,7 @@ msgstr ""
 "* Exemple 2: permet ordinadors que concordin amb la xarxa/màscara donada\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2365,7 +2349,7 @@ msgstr ""
 "* Exemple 3: permet uns quants ordinadors\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2377,23 +2361,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Ordinadors permesos:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Ordinadors denegats:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Serveis Samba habilitats"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2403,19 +2387,19 @@ msgstr ""
 "l'estació de treball Windows, així com compartir les impressores connectades "
 "a aquest servidor."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Habilita la zona de compartició de fitxers"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Habilita el servidor d'impressió compartida"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Permet l'accés dels usuaris als seus directoris d'usuari"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2423,28 +2407,28 @@ msgstr ""
 "Heu seleccionat permetre l'accés dels usuaris al seu directori d'usuari "
 "mitjançant Samba, però s'haurà d'usar smbpasswd per definir les contrasenyes."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Directori compartit:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Escriviu la ruta del directori que voleu que sigui compartit."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Error al crear un directori."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permissos dels fitxers"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2454,60 +2438,60 @@ msgstr ""
 "d'una '@'), per exemple:\n"
 "root, fred, @users, @wheel per cada tipus de permís."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "llista de lectura:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "llista d'escriptura:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Esculli les impressores que vols que siguin accessibles pels usuaris coneguts"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Habilita totes les impressores"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "S'està configurant Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "L'auxiliar ha recollit els següents paràmetres per configurar Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Descriptor del servidor:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Compartició de fitxers:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Servidor d'impressió:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Inici:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Impressores:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "L'auxiliar ha configurat el servidor Samba amb èxit."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "S'està configurant el vostre servidor Samba..."
 
@@ -2753,6 +2737,30 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "S'està configurant el vostre sistema con servidor Apache ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Heu de reajustar el nom de la vostre màquina."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Heu de reajustar el vostre nom domini. Un servidor de LDAP necessita un "
+#~ "nom de domini correcte diferent de localdomain o cap. Executeu "
+#~ "drakconnect per ajustar-lo."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Crea a:"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Heu de reajustar el vostre nom domini NIS. Un servidor NIS necessita un "
+#~ "nom de domini correcte diferent de localdomain o cap."
+
 #~ msgid "The wizard successfully added a user in LDAP"
 #~ msgstr "L'auxiliar ha afegit un usuri LDAP amb èxit"
 
diff --git a/po/cs.po b/po/cs.po
index 260ee3c2..f8311118 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-07 22:14+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -39,31 +39,31 @@ msgstr "průvodce nastavením"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Varování."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Chyba."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gratulujeme"
 
@@ -106,11 +106,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(za názvem nemusíte zadávat doménu)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identifikace klienta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -118,7 +118,7 @@ msgstr ""
 "Vezměte prosím na vědomí, že daná IP adresa a název klienta by měly být v "
 "rámci sítě unikátní."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -128,21 +128,21 @@ msgstr ""
 "Každý počítač na síti musí mít přiřazenou (unikátní) IP adresu v obvyklém "
 "tvaru odděleném tečkami."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Název počítače:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP adresa počítače:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Varování"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Máte síť nastavenou v režimu DHCP, server nemusí s vaším nastavením fungovat."
@@ -150,12 +150,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Chyba"
@@ -200,12 +200,32 @@ msgstr "IP klienta:"
 msgid "The wizard successfully added the client."
 msgstr "Průvodce úspěšně přidal klienta."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Musíte znovu upravit váš název domény. Pro DNS server potřebujete správný "
+"název domény, neprázdný a jiný než localdomain. Název počítače musí být plně "
+"kvalifikovaný (FQDN). Spusťte aplikaci drakconnect a upravte jej."
+
+#: ../common/Wizcommon.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."
+msgstr ""
+"Musíte znovu upravit váš název domény. Pro DNS server potřebujete správný "
+"název domény, neprázdný a jiný než localdomain. Název počítače musí být plně "
+"kvalifikovaný (FQDN). Spusťte aplikaci drakconnect a upravte jej."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Příkaz stále běží. Chcete jej ukončit a opustit tohoto průvodce?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Zavřít"
 
@@ -297,8 +317,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "vypnuto"
@@ -307,8 +327,8 @@ msgstr "vypnuto"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "zapnuto"
@@ -321,52 +341,38 @@ msgstr "Rozhraní:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Průvodce úspěšně nastavil služby DHCP na vašem serveru."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Selhání"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Spusťte aplikaci drakwizard znovu a zkuste změnit některé parametry."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Musíte znovu upravit váš název počítače."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Musíte znovu upravit váš název domény. Pro DNS server potřebujete správný "
-"název domény, neprázdný a jiný než localdomain. Název počítače musí být plně "
-"kvalifikovaný (FQDN). Spusťte aplikaci drakconnect a upravte jej."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Nadřízený DNS server"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Podřízený DNS server"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Přidat počítač do DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Odstranit počítač z DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -374,11 +380,11 @@ msgstr ""
 "DNS (Domain Name Server) je služba, která spojuje počítač s jeho jménem pro "
 "síť Internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Průvodce nastavením nadřízeného DNS serveru"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -388,47 +394,47 @@ msgstr ""
 "nastavení poskytne lokální službu DNS pro lokální názvy počítačů, požadavky "
 "mimo lokální síť budou přeposílány na externí DNS servery."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Co chcete udělat:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS server"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Za názvem nemusíte zadávat doménu)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP adresa serveru:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Název domény NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Vyberte počítač, který chcete odstranit, z následujícího seznamu."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Odstranit počítač v existujícím nastavení DNS."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Odstranit počítač:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Název počítače:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -438,11 +444,11 @@ msgstr ""
 "serveru a může také sloužit jako záložní server, v případě, že je váš hlavní "
 "server nedostupný."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP adresa nadřízeného DNS serveru:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -450,11 +456,11 @@ msgstr ""
 "Přeposílání je prováděno pouze u těch dotazů, pro které server není "
 "autoritativní a pro které nemá odpověď ve své vyrovnávací paměti."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP adresa pro přeposílání"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -462,15 +468,15 @@ msgstr ""
 "Pokud potřebujete přeposílání a znáte IP adresu serveru, na který chcete "
 "dotazy přeposílat, zadejte ji; pokud ji neznáte, ponechte adresu prázdnou"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Externí DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Přidat prohledávanou doménu"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -478,7 +484,7 @@ msgstr ""
 "Název domény tohoto serveru je automaticky doplněn a nemusíte jej přidávat "
 "zde."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -490,28 +496,28 @@ msgstr ""
 "lze změnit uvedením požadované cesty pro vyhledávání domény za klíčovým "
 "slovem search"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Výchozí název domény pro vyhledávání:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Toto není platná IP adresa pro přeposílání... pokračujte stisknutím tlačítka "
 "Další"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Toto není platná IP adresa nadřízeného DNS serveru... pokračujte stisknutím "
 "tlačítka Další"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Toto není platná IP adresa... pokračujte stisknutím tlačítka Další"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -519,11 +525,11 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -531,7 +537,7 @@ msgstr ""
 "Zdá se, že se toto nenachází ve vašem nastavení DNS... Pokračujte stisknutím "
 "tlačítka Další"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -539,71 +545,71 @@ msgstr ""
 "Zdá se, že žádný DNS server nebyl nastaven pomocí průvodce. Spusťte prosím "
 "Průvodce nastavením nadřízeného DNS serveru."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Zdá se, že nejste nadřízený DNS server, nelze tudíž přidat či odebrat "
 "počítač."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Průvodce nyní sestaví nastavení vašeho podřízeného DNS serveru"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "s tímto nastavením:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Klient s touto identifikací bude přidán do vašeho DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Název počítače:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP adresa počítače:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Klient s touto identifikací bude odstraněn z vašeho DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS server bude nastaven s následujícími parametry"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Název serveru:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Název domény:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Průvodce úspěšně přidal počítač do vaší DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Průvodce úspěšně odstranil počítač z vaší DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Průvodce úspěšně nastavil služby DNS pro váš server."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Spusťte aplikaci drakwizard znovu a zkuste změnit některé parametry."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Nastavuji váš systém jako nadřízený DNS server..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Nastavuji váš systém jako podřízený DNS server..."
 
@@ -631,7 +637,7 @@ msgstr "Poštovní server"
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba server"
 
@@ -655,7 +661,7 @@ msgstr "NIS server s mapou autofs"
 msgid "Mandrakelinux Install server"
 msgstr "Instalační server Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -680,7 +686,7 @@ msgstr ""
 "%s není nainstalován.\n"
 "Nainstalujte stiskem tlačítka \"Další\" nebo skončete tlačítkem \"Zrušit\""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalace selhala"
 
@@ -923,15 +929,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Průvodce nastavením serveru Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Musíte znovu upravit váš název domény, neprázdný a jiný než localdomain. "
-"Spusťte aplikaci drakconnect a upravte jej."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -943,7 +941,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:59
+#: ../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 "
@@ -953,39 +951,39 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Vítejte v průvodci nastavením groupware serveru Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Zadejte heslo pro účet správce serveru Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Heslo není shodné nebo je prázdné, opravte jej prosím."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Heslo znovu:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Název počítače:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Poštovní doména:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -993,45 +991,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Probíhá instalace"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavuje se server Kolab na vašem systému..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Průvodce pro server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Musíte znovu upravit váš název domény. Pro LDAP server potřebujete správný "
-"název domény, neprázdný a jiný než localdomain. Název počítače musí být plně "
-"kvalifikovaný (FQDN). Spusťte aplikaci drakconnect a upravte jej."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Zobrazit nastavení LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Přidat uživatele do serveru LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Odstranit nastavení LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1039,192 +1027,190 @@ msgstr ""
 "Jedná se o jednoduchý protokol pro přístup k adresářovým službám, konkrétně "
 "k adresářovým službám založeným na protokolu X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP znamená zkratku pro Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Průvodce nastavením LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Musíte nejprve nastavit server LDAP."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Vaše volba:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Odstranit nastavení"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Ukládám existující bázi do /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Přidání uživatele LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Uživatel vytvořen v:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Uživatel vytvořen v: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Jméno:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Příjmení:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Přihlášení uživatele:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Musíte zadat platné jméno."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Musíte zadat platné celé jméno."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Musíte zadat platné uživatelské jméno."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Heslo uživatele LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "Hesla se musí shodovat"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Heslo (znovu):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Musíte zadat heslo pro LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Hesla se neshodují"
 
-# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Správce"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "Správce je nejmocnější uživatel, který má přístup k LDAP databázi"
 
-#: ../ldap_wizard/Ldap.pm:197
+# ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Správce,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Nastavuji server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Název domény: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Název domény: %s"
 
 # ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Správce LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Strom adresářů LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "Pro definici stromu adresářů LDAP se používá názvosloví DNS"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Strom adresářů LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Správce LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Heslo LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Heslo LDAP (znovu):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Musíte zadat platný strom adresářů LDAP."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Potvrzení vytvoření uživatele"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Jméno:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Uživatelské jméno:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Vytvořit v:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Potvrzení informací pro vytvoření LDAP serveru"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Kontejner uživatelů:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Tento průvodce úspěšně nastavil váš LDAP server."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Uživatel byl úspěšně přidán"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Chyba při přidávání uživatele do serveru LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Server je již nastaven"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Váš server LDAP byl již nastaven"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "Selhalo %s"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Chyba!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Nelze se připojit k %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Průvodce pro diskusní skupiny"
@@ -1365,13 +1351,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Adresář:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Vámi zadaná cesta neexistuje."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontrola přístupu"
 
@@ -1425,28 +1411,20 @@ msgstr "Síťová maska:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Průvodce úspěšně nastavil váš server NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Musíte znovu upravit váš název domény NIS. Pro NIS server potřebujete "
-"správný název domény NIS, neprázdný a jiný než localdomain."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS server s mapou autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Nastavení NIS serveru s mapou autofs, soubory auto.home a auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1454,28 +1432,28 @@ msgstr ""
 "Klienti mohou po přihlášení do klientské NIS sítě automaticky připojit své "
 "domovské adresáře ze serveru."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Co chcete udělat?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Nastavit počítač jako NIS klienta"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Musíte pouze zadat NIS doménu a NIS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS doména:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1485,7 +1463,7 @@ msgstr ""
 "rovněž sestaví mapu autofs, a tím umožní uživatelům NIS automaticky připojit "
 "svůj domovský adresář na klientském počítači s NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1493,40 +1471,40 @@ msgstr ""
 "Domov NIS: domovský adresář pro uživatele na NIS serveru. Tento adresář bude "
 "exportován pomocí NFS serveru."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "NIS doména: použitá NIS doména (obvykle stejná jako doména DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS server: název vašeho počítače."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Domov NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Název domény NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Průvodce nastaví váš NIS server s mapou autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Adresář NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Název domény NIS: název vaší domény pro NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS server: název počítače NIS serveru."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1534,37 +1512,37 @@ msgstr ""
 "Démon YPBIND hledá pro NIS domény servery a udržuje informace potřebné ke "
 "spojení pomocí NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Chyba: mělo by se jednat o adresář."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Chyba: název domény NIS by neměl být 'none' nebo 'localdomain'"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Upravte jej prosím."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Průvodce úspěšně nastavil váš počítač jako NIS klienta."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Průvodce úspěšně nastavil váš počítač jako NIS server s mapu autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Nastavuji váš systém jako NIS server s mapou Autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS s mapou autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Nastavuji váš systém jako klienta NIS..."
 
@@ -1933,7 +1911,7 @@ msgstr ""
 "proxy serveru:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1965,6 +1943,14 @@ msgstr "Squid proxy"
 msgid "PXE Wizard"
 msgstr "Průvodce pro 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."
+msgstr ""
+"Musíte znovu upravit váš název domény, neprázdný a jiný než localdomain. "
+"Spusťte aplikaci drakconnect a upravte jej."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Nastavení serveru PXE"
@@ -2319,24 +2305,24 @@ msgstr "Nastavuje se PXE server na vašem systému..."
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Průvodce pro server Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s neexistuje."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Všichni - bez omezení přístupu"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moje pravidla - Ptát se na povolené a zakázané počítače"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2345,38 +2331,38 @@ msgstr ""
 "tiskového serveru pracovním stanicím provozujícím operační systém jiný než "
 "Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Průvodce nastavením serveru Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Tento průvodce vám pomůže nastavit služby serveru Samba na vašem počítači."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 "Server Samba potřebuje znát pracovní skupinu Windows, kterou bude obsluhovat."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Pracovní skupina"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Pracovní skupina:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Název pracovní skupiny je špatně"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Titulek serveru."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2384,19 +2370,19 @@ msgstr ""
 "Titulek je název, s jakým bude váš server prezentován pracovním stanicím s "
 "Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Titulek:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Titulek serveru je špatně"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Úroveň přístupu:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2404,7 +2390,7 @@ msgstr ""
 "* Příklad 1: povolení všech IP adres na 150.203.*.*; kromě jedné\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2412,7 +2398,7 @@ msgstr ""
 "* Příklad 2: povolení počítačů odpovídajících zadané síti/masce\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2420,7 +2406,7 @@ msgstr ""
 "* Příklad 3: povolení několika počítačů\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2432,25 +2418,25 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Uvědomte si prosím, že přístup stále vyžaduje vhodná hesla na uživatelské "
 "úrovni."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Povolit počítače:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Zakázat počítače:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Povolit služby serveru Samba"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2460,19 +2446,19 @@ msgstr ""
 "pracovní stanice s Windows, a také může poskytovat sdílení tiskáren "
 "připojených k vašemu serveru."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Povolit prostor pro sdílení souborů"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Povolit sdílení tiskárny na serveru"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Zpřístupnit domovské adresáře jejich vlastníkům"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2480,28 +2466,28 @@ msgstr ""
 "Povolili jste přístup uživatelů k jejich domovským adresářům přes protokol "
 "Samba, ale uživatelé musejí pro nastavení hesla použít program smbpasswd."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Sdílený adresář:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Zadejte cestu k adresáři, který chcete sdílet."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Vytvořit sdílený adresář, pokud neexistuje"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Vytvoření adresáře selhalo."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Souborová práva"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2511,61 +2497,61 @@ msgstr ""
 "'@'), například:\n"
 "root, fred, @users, @wheel pro každý druh oprávnění."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "seznam čtoucích:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "seznam zapisujících:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Vyberte, které tiskárny chcete zpřístupnit známým uživatelům"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Povolit všechny tiskárny"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Nastavuji server Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení serveru "
 "Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Titulek serveru:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Sdílení souborů:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Tiskový server:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Domovský adresář:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Tiskárny:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Průvodce úspěšně nastavil váš server Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Nastavuji váš server Samba..."
 
@@ -2807,6 +2793,29 @@ msgstr "Server Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavuji váš systém jako server Apache..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Musíte znovu upravit váš název počítače."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Musíte znovu upravit váš název domény. Pro LDAP server potřebujete "
+#~ "správný název domény, neprázdný a jiný než localdomain. Název počítače "
+#~ "musí být plně kvalifikovaný (FQDN). Spusťte aplikaci drakconnect a "
+#~ "upravte jej."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Nelze se připojit k %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Musíte znovu upravit váš název domény NIS. Pro NIS server potřebujete "
+#~ "správný název domény NIS, neprázdný a jiný než localdomain."
+
 # ../ldap_wizard/Ldap.pm195 ../ldap_wizard/Ldap.pm223
 #~ msgid "Adrministrator"
 #~ msgstr "Správce"
diff --git a/po/cy.po b/po/cy.po
index 3199fc63..870b2a0c 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-03-28 22:26-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -20,31 +20,31 @@ msgstr "dewin ffurfweddu"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Rhybudd."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Gwall."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
 
@@ -85,11 +85,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(does dim angen teipio'r parth ar ôl yr enw)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Enw cleient:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -97,7 +97,7 @@ msgstr ""
 "Sylwer bod yn rhaid i'r rhif IP a'r enw cleient fod yn unigryw o fewn y "
 "rhwydwaith."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -107,21 +107,21 @@ msgstr ""
 "cleient.cwmni.net. Rhaid i bob peiriant ar eich rhwydwaith gael cyfeiriad IP "
 "unigryw, yn ôl y gystrawen collnod arferol"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Enw'r peiriant"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Cyfeiriad porth IP"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Rhybudd"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Rydych yn dhcp, efallai na fydd y gweinydd yn gweithio gyda'ch ffurfweddiad."
@@ -129,12 +129,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Gwall"
@@ -179,12 +179,33 @@ msgstr "IP Cleient:"
 msgid "The wizard successfully added the client."
 msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
+"gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect i'w "
+"newid."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+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 ""
+"Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
+"gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect i'w "
+"newid."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Cau"
 
@@ -276,8 +297,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "anablwyd"
@@ -286,8 +307,8 @@ msgstr "anablwyd"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "galluogwyd"
@@ -300,53 +321,38 @@ msgstr "Rhyngwyneb:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gweinydd."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Methwyd"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwyn drakwizard, a cheisio newid rhai paramedrau."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Mae angen i chi newid eich enw gwesteiwr"
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
-"gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect i'w "
-"newid."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Prif weinydd DNS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Is weinydd DNS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Ychwanegu gwesteiwr yn DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Tynnu gwesteiwr yn DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -354,11 +360,11 @@ msgstr ""
 "DNS (Domain Name Server) yw'r gwasanaeth sy'n rhoi cyfathrebiad i beiriant "
 "sydd ag enw gwestai rhyngrwyd"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Dewin ffurfweddu Prif DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -368,47 +374,47 @@ msgstr ""
 "Bydd yn darparu gwasanaeth DNS lleol ar gyfer enwau cyfrifiaduron lleol, "
 "gyda cheisiadau allanol yn cael eu hanfon ymlaen i DNS allanol."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Beth hoffech ei wneud:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Gweinydd DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Does dim angen teipio'r parth ar ôl yr enw)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP gweinydd:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Enw parth NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Dewis y gwesteiwr i'w dynnu o'r rhestr ganlynol."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Tynwch westeiwr o'r ffurfweddiad DNS presennol."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Tynnu gwesteiwr"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Enw'r Cyfrifiadur:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -418,11 +424,11 @@ msgstr ""
 "enw cynradd, a bydd hefyd yn gweithio fel gweinydd wrth gefn, rhag ofn nad "
 "oes modd cyrraedd eich prif weinydd."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Ffurfweddu'r prif weinydd DNS"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -430,11 +436,11 @@ msgstr ""
 "Mae blaenyrru'n digwydd dim ond i'r ymholiadau nad yw'r gweinydd yn "
 "awdurdodol ac nad yw'r ateb yn ei storfa."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP eich blaenyrrwr"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -442,15 +448,15 @@ msgstr ""
 "Os mae ei angen arnoch ac rydych yn gwybod eich blaenyrrwr rhowch ei "
 "gyfeiriad IP, os nad ydych yn ei wybod, gadwech yn wag."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS Allanol:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Ychwanegu parth chwilio"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -458,7 +464,7 @@ msgstr ""
 "Bydd enw parth y gweinydd yn cael ei ychwanegu'n awtomatig, does dim angen "
 "ei ychwanegu."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -470,24 +476,24 @@ msgstr ""
 "yn unig. Gall hyn gael ei newid drwy restru llwybr y chwiliad parth sy'n "
 "dilyn chwilio'r allweddair."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Chwilio am  enw parth rhagosodedig:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad dilys...cliciwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad IP DNS Prif dilys...gwasgwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad IP dilys...cliciwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -495,18 +501,18 @@ msgstr ""
 "Mae'n ymddangos fod y gwestai eisoes yn eich ffurfweddiad DNS...cliciwch "
 "Nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Gwall:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 "Mae'n ymddangos nad yw hwn yn eich ffurfweddiad DNS...cliciwch Nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -514,72 +520,72 @@ msgstr ""
 "Mae'n ymddangos nad oes gweinydd DNS wedi ei osod drwy'r Dewin. Defnyddiwch "
 "Ddewin DNS: Prif weinydd DNS."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Mae'n ymddangos nad ydych yn brif weinydd DNS, felly nid oes modd i mi  "
 "ychwanegu/tynnu gwestai."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Bydd y Dewin yn adeiladu eich ffurfweddiad gwas DNS"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "gyda'r ffurfweddiad yma:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Bydd cleient gyda'r enw hwn yn cael ei ychwanegu at eich DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Enw'r Cyfrifiadur"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Cyfeiriad IP y Cyfrifiadur"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Bydd cleient gyda'r enw hwn yn cael ei dynnu o'ch DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 "Mae'r gweinydd DNS ar fin cael ei ffurfweddu gyda'r ffurfweddiad canlynol"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Enw gwestai'r Gweinydd"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Enw Parth:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Mae'r dewin wedi ychwanegu'r gwestai'n llwyddiannus i'ch DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Mae'r dewin wedi tynnu'r gwestai'n llwyddiannus o'ch DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Mae'r dewin wedi ffurfweddu'r gwasanaethau DNS ar gyfer eich gweinydd."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwynwch drakwizard, a cheisio newid rhai paramedrau."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Ffurfweddu eich system fel Prif weinydd DNS..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Ffurfweddu eich system fel gweinydd DNS Gwas..."
 
@@ -607,7 +613,7 @@ msgstr "Gweinydd e-bost"
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Gweinydd Samba"
 
@@ -632,7 +638,7 @@ msgstr "Map autofs gweinydd NIS"
 msgid "Mandrakelinux Install server"
 msgstr "Gweinydd Gosod Mandrake"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Gweinydd Kolab"
 
@@ -658,7 +664,7 @@ msgstr ""
 "Nid yw %s wedi ei osod\n"
 "Cliciwch \"Nesaf\"i'w osod neu \"Diddymu\" i adael."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
@@ -913,15 +919,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Dewin Ffurfweddu Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Mae angen i chi newid eich enw parth, nid cydradd i parthlleol na dim. "
-"Cychwynnwch drakconnect i'w newid."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -933,7 +931,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:59
+#: ../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 "
@@ -943,39 +941,39 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Croeso i Dewin ffurfweddu gweinydd Kolab Groupware"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Rhowch gyfrinair ar gyfer cyfrif rheolwr gweinydd Kolab"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Cyfrinair gwallus, cywirwch."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Cyfrinair eto:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Enw Gwestai:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Parth E-bost:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -983,260 +981,245 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Wrthi'n gosod"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Gosod gweinydd Kolab ar eich system..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Ffurfweddu gweinydd Kolab ar eich system..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Dewin Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
-"gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect i'w "
-"newid."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "Ychwanegu - ychwanegu cofnod mewn gweinydd LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Gosod gweinydd PXE"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Gosod ffurfweddiad gweinydd"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Enw Cyntaf:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Cynhwysydd:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Cyfrinair:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Cyfrinair eto:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Ffurfweddu Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Enw Parth:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Enw Parth:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Cyfeiriadur TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Cyfeiriadur TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Cyfrinair:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Cyfrinair eto:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Cyfeiriadur TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Enw Cyntaf:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Ffurfweddu'r Gweinydd DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Cynhwysydd:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Mae'r dewin wedi ffurfweddu'r LDAPt yn llwyddiannus."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Ychwanegu data'n llwyddiannus"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Ychwanegu - ychwanegu cofnod mewn gweinydd LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gweinydd Samba."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Methwyd"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Gwall"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Dewin Newyddion"
@@ -1380,13 +1363,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Cyfeiriadur:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Nid yw'r llwybr hwn yn bod."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Rheoli mynediad"
 
@@ -1441,28 +1424,20 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Mae'r dewin wedi ffurfweddu eich Gweinydd NFS yn llwyddiannus"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Mae angen i chi newid eich enw parth NIS. Mae angen enw parth cywir ar gyfer "
-"gweinydd NIS, nid cydradd i barth lleol na dim."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Gweinydd NIS gyda autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Cleient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Gosod gweinydd Nis gyda autofs map, auto.home a ffeiliau auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1470,28 +1445,28 @@ msgstr ""
 "Mae'r defnyddiwr yn gosod eu cyfeiriadur cartref o'r gweinydd, wrth "
 "fewngofnodi i rwydwaith cyfrifiadurol cleient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Beth hoffech ei wneud:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Ffurfweddu eich cyfrifiadur i fod yn gleient N\t..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Rhaid gosod nisdomain a nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Gweinydd NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Parth NIS::"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1502,7 +1477,7 @@ msgstr ""
 "galluoedd ar gyfer defnyddwyr NIS i awto osod eu cyfeiriaduron cartref ar "
 "gyfrifiadur cleient NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1510,42 +1485,42 @@ msgstr ""
 "Cartref NIS: cyfeiriadur cartref defnyddwyr gweinydd NIS. Bydd y cyfeiriadur "
 "yn allforio drwy weinydd NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Parth NIS: parth NIS i'w ddefnyddio (yn gyffredinol yrun un â'ch enwparth "
 "DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Gweinydd NIS: enw'r cyfrifiadur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS Cartref:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Enw parth NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Bydd y dewin yn gosod eich gweinydd NIS gyda  autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Cyfeiriadur NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Enw parth NIS: enw parth NIS "
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Gweinydd NIS: enw parth gweinydd NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1553,24 +1528,24 @@ msgstr ""
 "Mae'r daemon YPBIND yn canfod gweinydd ar gyfer parthau NIS ac yn cynnal "
 "gwybodaeth rwymo NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Gwall i fod yn gyfeiriadur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Gwall dylai nisdomainname fod yn 'dim' neu 'parthlleol'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Newidiwch hwn."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "Llwyddiant wrth i'r dewin ffurfweddu eich peiriant i fod yn gleient NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1578,15 +1553,15 @@ msgstr ""
 "Mae'r dewin wedi ffurfweddu eich peiriant yn llwyddiannus i fod yn weinydd "
 "NIS gyda autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Ffurfweddu eich system fel gweinydd NIS gyda +Autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS gydag autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Ffurfweddu eich system fel Cleient NIS..."
 
@@ -1951,7 +1926,7 @@ msgstr ""
 "ffurfweddu eich dirprwy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1983,6 +1958,14 @@ msgstr "Dirprwy squid"
 msgid "PXE Wizard"
 msgstr "Dewin 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."
+msgstr ""
+"Mae angen i chi newid eich enw parth, nid cydradd i parthlleol na dim. "
+"Cychwynnwch drakconnect i'w newid."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Gosod gweinydd PXE"
@@ -2338,24 +2321,24 @@ msgstr "Ffurfweddu gweinydd PXE ar eich system..."
 msgid "PXE server"
 msgstr "Gweinydd PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Dewin Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "Nid yw %s yn bod."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Pob - dim cyfyngiad mynediad"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Fy rheol - parthau iawn a drwg"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2363,36 +2346,36 @@ msgstr ""
 "Mae Samba'n caniatáu i'ch gweinydd ymddwyn fel gweinydd ffeil ac argraffu ar "
 "gyfer gorsafoedd gwaith sy'n rhedeg systemau heblaw Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Dewin Ffurfweddu Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau Samba eich gweinydd."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Mae Samba angen gwybod y Grwp Gwaith Windows bydd yn ei wasanaethu."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grwp Gwaith"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grwp Gwaith"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Mae'r Grwp Gwaith yn anghywir"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Baner Gweinydd"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2400,19 +2383,19 @@ msgstr ""
 "Y faner yw'r ffordd bydd y gweinydd hwn yn cael ei ddisgrifio mewn "
 "gorsafoedd gwaith Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Baner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Mae Baner y Gweinydd yn anghywir"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Lefel mynediad:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2420,7 +2403,7 @@ msgstr ""
 "* Esiampl 1: caniatáu pob  IPs yn 150.203.*.*; heblaw un\\ngwesteiwr iawn = "
 "150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2428,7 +2411,7 @@ msgstr ""
 "* Esiampl 2: caniatáu gwesteiwyr sy'n cydweddu â'r rhwydwaith/netmask"
 "\\ncaniatáu gwesteiwyr = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2436,7 +2419,7 @@ msgstr ""
 "*Esiampl 3: caniatáu rhai gwesteiwyr\\ncaniatáu gwesteiwyr = lapland, "
 "arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2447,23 +2430,23 @@ msgstr ""
 "gwrthod mynediad o un gwesteiwr penodol \\ncaniatáu gwestiwyr = @foonet"
 "\\ngwrthod gwestiwyr = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Mae mynediad yn gofyn cyfrineiriau lefel defnyddiwr addas."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Caniatáu gwesteiwr:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Gwrthod gwesteiwr"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Gwasanaethau Samba "
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2473,19 +2456,19 @@ msgstr ""
 "gorsaf waith Windows, a rhannu argraffydd ar gyfer argraffyddion sydd wedi "
 "eu cysylltu i'ch gweinydd."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Galluogi gofod rhannu ffeil"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Galluogi gofod rhannu ffeil"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Gwneud cyfeiriaduron cartref ar gael ar gyfer eu perchnogion"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2493,28 +2476,28 @@ msgstr ""
 "Rydych wedi dewis i caniatáu mynediad i ddefnyddwyr i'w cyfeiriaduron "
 "cartref drwy samba ond rhaid defnyddio smbpasswd i osod cyfrinair."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Cyfeiriadur rhanedig:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Teipiwch lwybr y cyfeiriadur i'w rannu"
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Caniatâd ffeil"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2524,61 +2507,61 @@ msgstr ""
 "gyda \\'@) fel hyn: \n"
 "root, fred, @defnyddiwr, @olwyn ar gyfer pob math o ganiatâd."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "rhestr ddarllen:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "gwraidd, fred, @defnyddwyr, @olwyn"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "rhestr ysgrifennu"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Dewis pa argraffydd i fod ar gael ar gyfer defnyddwyr hysbys"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Ateb i Bawb"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Ffurfweddu Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol\n"
 "ffurfweddu Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Baner Gweinydd"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Rhannu Ffeiliau:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Gwasanaethwr LDAP"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Cartref:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Argraffyddion:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gweinydd Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Ffurfweddu eich gweinydd Samba..."
 
@@ -2819,6 +2802,30 @@ msgstr "Gweinydd gwe Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ffurfweddu eich system fel gweinydd Apache..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Mae angen i chi newid eich enw gwesteiwr"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
+#~ "gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect "
+#~ "i'w newid."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Enw Defnyddiwr:"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Mae angen i chi newid eich enw parth NIS. Mae angen enw parth cywir ar "
+#~ "gyfer gweinydd NIS, nid cydradd i barth lleol na dim."
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Ffurfweddu'r Gweinydd DHCP"
diff --git a/po/da.po b/po/da.po
index 2dfac8bf..f0bf9603 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-22 00:56+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -28,31 +28,31 @@ msgstr "Konfigurationshjælper"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Advarsel."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Fejl."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Tillykke"
 
@@ -86,23 +86,25 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Denne hjælper vil hjælpe dig med at tilføje en ny klient i din lokale DNS."
+msgstr ""
+"Denne hjælper vil hjælpe dig med at tilføje en ny klient i din lokale DNS."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
 msgstr "(du behøver ikke angive domænenavnet efter navnet)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Klientidentifikation:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "Bemærk at angivet IP-nummer og klientnavn skal være unikke i netværket."
+msgstr ""
+"Bemærk at angivet IP-nummer og klientnavn skal være unikke i netværket."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,33 +114,33 @@ msgstr ""
 "firma.dk. Hver maskine på netværket skal have en (unik) IP-adresse, i den "
 "normale syntaks med punktummer."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Maskinens navn:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Maskinens IP-nummer:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Advarsel"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Du er i dhcp, serveren vil muligvis ikke virke med din konfiguration."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fejl"
@@ -183,11 +185,33 @@ msgstr "Klient-IP:"
 msgid "The wizard successfully added the client."
 msgstr "Hjælperen tilføjede klienten uden problemer."
 
-#: ../common/Wizcommon.pm:86
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Denne kommando kører stadigvæk. Vil du dræbe den og afslutte hjælperen?"
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Du skal omjustere dit domænenavn. For en DNS-server behøver du et korrekt "
+"domænenavn, ikke det samme som localdomain eller ingenting. Værtsnavnet skal "
+"være et fuldstændigt domænenavn. Kør drakconnect for at justere det."
+
+#: ../common/Wizcommon.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."
+msgstr ""
+"Du skal omjustere dit domænenavn. For en DNS-server behøver du et korrekt "
+"domænenavn, ikke det samme som localdomain eller ingenting. Værtsnavnet skal "
+"være et fuldstændigt domænenavn. Kør drakconnect for at justere det."
+
+#: ../common/Wizcommon.pm:98
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
+msgstr ""
+"Denne kommando kører stadigvæk. Vil du dræbe den og afslutte hjælperen?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Luk"
 
@@ -205,7 +229,8 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Denne hjælper vil hjælpe dig med at konfigurere DHCP-tjenester på din server."
+msgstr ""
+"Denne hjælper vil hjælpe dig med at konfigurere DHCP-tjenester på din server."
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "Interface the dhcp server must listen to"
@@ -279,8 +304,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "deaktiveret"
@@ -289,8 +314,8 @@ msgstr "deaktiveret"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "aktiveret"
@@ -303,52 +328,38 @@ msgstr "Grænsesnit:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Hjælperen konfigurerede DHCP-tjenesterne uden problemer."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Mislykkedes"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Genstart drakwizard, og prøv at ændre nogen parametre."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Du behøver at ændre på dit værtsnavn."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Du skal omjustere dit domænenavn. For en DNS-server behøver du et korrekt "
-"domænenavn, ikke det samme som localdomain eller ingenting. Værtsnavnet skal "
-"være et fuldstændigt domænenavn. Kør drakconnect for at justere det."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Master DNS-server"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Slave DNS-server"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Tilføj vært i DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Fjern vært i DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -356,11 +367,11 @@ msgstr ""
 "DNS (Domain Name Server) er tjenesten som giver en ip-adresse på en maskine "
 "et værtsnavn på internettet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Konfigurationshjælper for master DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -370,44 +381,44 @@ msgstr ""
 "server. Denne konfiguration vil give en lokal DNS-tjeneste for lokale "
 "maskinnavne, med ikke-lokale forespørgsler sendt videre til en DNS udenfor."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Hvad ønsker du at gøre:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "Grænseflade for DNS-server"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(du behøver ikke tilføje domænet efter navnet)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Server:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "DNS-domænenavn:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Vælg værten du vil fjerne fra den følgende liste."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Fjern en vært i eksisterende DNS-konfiguration."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Fjern vært:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Maskinens navn:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -417,11 +428,11 @@ msgstr ""
 "navneserver,og vil også fungere som en backupserver, i tilfælde af at din "
 "master-server ikke kan nås."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP-adresse på master DNS-serveren:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -429,11 +440,11 @@ msgstr ""
 "Videresending sker kun på de forespørgsler, hvor serveren ikke er autoritet  "
 "og ikke har svaret i sit mellemlager."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP pål din videresender"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -441,15 +452,15 @@ msgstr ""
 "Hvis du behøver det og kender din ip-videresender så angiv IP-adressen på "
 "den, hvis ikke så lad den være tom"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Ekstern DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Tilføj søgedomæne"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -457,7 +468,7 @@ msgstr ""
 "Domænenavn på denne server er automatisk tilføjet og du behøver ikke at "
 "tilføje det her."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -469,27 +480,28 @@ msgstr ""
 "Dette kan ændres ved at angive den ønskede domænesøgenavnesti etfer 'search'-"
 "nøgleordet."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Standard domænavn som skal søges:"
 
-#: ../dns_wizard/Bind.pm:182
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+#: ../dns_wizard/Bind.pm:176
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Dette er ikke en gyldig ip-adresse for din videresender, klik på Næste for "
 "at fortsætte"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../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... klik på Næste for at "
 "fortsætte"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Dette er ikke en gyldig ip-adresse, klik på Næste for at fortsætte"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -497,11 +509,11 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Fejl:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -509,7 +521,7 @@ msgstr ""
 "Det ser ud til at dette ikke er til stede i din DNS-konfiguration... tryk "
 "næste for at fortsætte"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -517,71 +529,73 @@ msgstr ""
 "Det ser ud som om ingen DNS-server er blevet sat via hjælperen.Venligst kør "
 "DNS-hjælperen: Master DNS-server."
 
-#: ../dns_wizard/Bind.pm:217
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+#: ../dns_wizard/Bind.pm:211
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Det ser ud som om du ikke er en master DNS-server, så jeg kan ikke tilføje "
 "eller fjerne vært."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Hjælperen vil nu bygge din DNS-slavekonfiguration"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "med denne konfiguration:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Klient med denne identifikation vil blive tilføjet i din DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Maskinnavn:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP-adresse for maskinen:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Klient med denne identifikation vil blive fjernet fra din DNS"
 
-#: ../dns_wizard/Bind.pm:249
-msgid "The DNS server is about to be configured with the following configuration"
+#: ../dns_wizard/Bind.pm:243
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr ""
 "DNS-serveren er i færd med at blive konfigureret med den følgende "
 "konfiguration"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Værtsnavn på server:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domænenavn:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Hjælperen tilføjede vært i din DNS uden problemer."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Hjælperen fjernede værten fra din DNS uden problemer."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Hjælperen konfigurerede DNS-tjenesten på din server uden problemer."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Genstart drakwizard, og prøv at ændre nogen parametre."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurerer dit system som en hoved DNS-server ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurerer dit system som en slave DNS-server ..."
 
@@ -609,7 +623,7 @@ msgstr "E-postserver"
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba-server"
 
@@ -633,7 +647,7 @@ msgstr "NIS-server autofs-kort"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux Installationsserver"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab-server"
 
@@ -658,7 +672,7 @@ msgstr ""
 "%s er ikke installeret\n"
 "Klik \"Næste\" for at installere eller \"Annullér\" for at afslutte"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Installation mislykkedes"
 
@@ -816,7 +830,8 @@ msgstr "Tillad FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
 msgid "The wizard successfully configured your intranet/Internet FTP server"
-msgstr "Hjælperen konfigurerede din Intranet/Internet FTP-server uden problemer"
+msgstr ""
+"Hjælperen konfigurerede din Intranet/Internet FTP-server uden problemer"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
@@ -901,15 +916,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Konfigurationshjælper for Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Du behøver at omjustere dit domænenavn, ikke det samme som localdomain eller "
-"'none'. Kør drakconnect for at justere det."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -921,7 +928,7 @@ msgstr ""
 "adressebog med muligheder for postkassebrugere så vel som kontakter, og en "
 "POP3 og IMAP4 (rev1) adgang til post."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -931,39 +938,40 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
-msgstr "Velkommen til konfigurationshjælperen for Kolab gruppeprogrammel-serveren."
+msgstr ""
+"Velkommen til konfigurationshjælperen for Kolab gruppeprogrammel-serveren."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Indtast adgangskode for administrationskontoen for Kolab-serveren."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Uoverensstemmende adgangskoder, eller blank adgangskode; ret venligst."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Adgangskode igen:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Værtsnavn:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Epost-domæne:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -971,45 +979,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Installering i gang"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Installerer Kolab-server på dit system..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer Kolab-server på dit system..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap-hjælper"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Du skal omjustere dit domænenavn. For en LDAP-server behøver du et korrekt "
-"domænenavn, ikke det samme som localdomain eller ingenting. Værtsnavnet skal "
-"være et fuldstændigt domænenavn. Kør drakconnect for at justere det."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Vís konfiguration for Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Tilføj bruger i Ldap-server"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Slet konfiguration for Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1017,192 +1015,190 @@ msgstr ""
 "Det er en letvægtsprotokol for at få adgang til katalogtjenester, specifikt "
 "X.500-baserede katalogtjenester."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP står for Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Konfigurationshjælper for Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Du skal først opsætte en Ldap-server."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Dit valg:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Slet konfiguration"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Gemmer eksisterende base i /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP tilføjer bruger"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Bruger oprettet i: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Bruger oprettet i: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Fornavn:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Login for bruger:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Du skal indtaste et gyldig fornavn."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Du skal indtaste et gyldig efternavn."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Du skal indtaste et gyldig brugernavn."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP-adgangskode for bruger"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "adgangskoder skal stemme overens"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Adgangskode (igen):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Du skal indtaste en adgangskode for LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Adgangskoderne stemmer ikke overens"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Administrator er en administrerende bruger som kan give adgang til LDAP-"
 "databasen"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrator,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Konfigurerer LDAPserver"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Domænenavn: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Domænenavn: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Administrator for LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP katalogtræ"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS-navnet bruges til LDAP-katalogtræ-definition"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP katalogtræ:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP-administrator:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP-adgangskode:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP-adgangskode (igen):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Du skal indtaste et gyldigt LDAP katalogtræ."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Bekræftelse af brugeren til oprettelse"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Fornavn:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Brugernavn:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Opret i:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Bekræftelsesinformation for oprettelse af en LDAP-server"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Brugers beholder:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Hjælperen har konfigureret LDAP uden problemer."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Tilføjede bruger uden problemer"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Fejl ved tilføjelse af bruger i Ldap-database"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Server er allerede konfigureret"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Du har allerede konfigureret din Ldap-server"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s mislykkedes"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Fejl!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Kunne ikke koble op til %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Hjælper for nyheder"
@@ -1304,7 +1300,8 @@ msgid "Polling interval:"
 msgstr "Tjekkeinterval:"
 
 #: ../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 ""
 "Hjælperen konfigurerede Internet nyheds-tjenesten på din server uden "
 "problemer."
@@ -1327,7 +1324,8 @@ msgstr "Konfigurationshjælper for NFS-server"
 
 #: ../nfs_wizard/NFS.pm:51
 msgid "This wizard will help you configuring the NFS server for your network."
-msgstr "Denne hjælper vil hjælpe dig med at konfigurere NFS-serveren til dit netværk."
+msgstr ""
+"Denne hjælper vil hjælpe dig med at konfigurere NFS-serveren til dit netværk."
 
 #: ../nfs_wizard/NFS.pm:56
 msgid ""
@@ -1343,13 +1341,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Stien du indtastede eksisterer ikke."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Adgangskontrol"
 
@@ -1403,28 +1401,21 @@ msgstr "Netmaske:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Hjælperen konfigurerede din NFS-server uden problemer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Du behøver at omjustere dit NIS-domænenavn. For en NIS-server behøver du et "
-"korrekt NIS-domænenavn, ikke det samme som localdomain eller ingenting."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS-server med autofs-kort"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS-klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
-msgstr "Opsætning af en NIS-server med autofs-kort, auto.home og auto.master filer."
+msgstr ""
+"Opsætning af en NIS-server med autofs-kort, auto.home og auto.master filer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1432,28 +1423,28 @@ msgstr ""
 "Brugere kan automatisk montere deres hjemmekatalog fra serveren, når de "
 "logger på et NIS klientmaskine-netværk."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Hvad ønsker du at lave?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Konfigurerer dit system som en Nis-klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Du skal blot putte nisdomain og nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS-server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS-Domæne:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1463,7 +1454,7 @@ msgstr ""
 "bygger også et autofs-kort, så den giver mulighed for en NIS-bruger at "
 "automontere deres hjemmekatalog på en NIS-klientmaskine."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1471,42 +1462,42 @@ msgstr ""
 "Hjemme-NIS: hjemmekatalog for brugere på NIS-server. Dette katalog vil blive "
 "eksporteret via NFS-serveren."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS-domæne: NIS-domæne der skal bruges (normalt det samme som dit DNS-"
 "domænenavn)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS-server: navn på din maskine."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Hjemme-NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS-domænenavn:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Hjælperen vil sætte din NIS-server med autofs-kort"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS-katalog:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS-domænenavn: navn på NIS-domæne."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS-server: værtsnavn på NIS-serveren."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1514,23 +1505,24 @@ msgstr ""
 "YPBIND-dæmonen finder serveren for NIS-domæner og vedligeholder NIS binding "
 "informationdæmon."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Fejl, bør være et katalog."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Fejl; nisdomainname bør ikke være 'none' eller 'localdomain')"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Ret det venlist til."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
-msgstr "Hjælperen konfigurerede din makine til at være en NIS-klient uden problemer."
+msgstr ""
+"Hjælperen konfigurerede din makine til at være en NIS-klient uden problemer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1538,15 +1530,15 @@ msgstr ""
 "Hjælperen konfigurerede din maskine til at være en NIS-server med autofs-"
 "kort uden problemer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurerer dit system som en NIS-server med autofs-kort ..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS med Autofs-kort"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurerer dit system som en NIS-klient ..."
 
@@ -1673,7 +1665,8 @@ msgstr "Navn på e-postserver:"
 
 #: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
-msgstr "Standard er at tilføje myhostname hvilket er fint for små installationer."
+msgstr ""
+"Standard er at tilføje myhostname hvilket er fint for små installationer."
 
 #: ../postfix_wizard/Postfix.pm:119
 msgid ""
@@ -1779,7 +1772,8 @@ msgid "Proxy port:"
 msgstr "Proxy-port:"
 
 #: ../proxy_wizard/Squid.pm:83
-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 ""
 "Klik på Næste for at beholde denne værdi eller Tilbage for at korrigere dit "
 "valg"
@@ -1797,7 +1791,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Du skal vælge en port større end 1024 og lavere end 65535"
 
 #: ../proxy_wizard/Squid.pm:94
-msgid "Disk Cache is the amount of disk space that can be used for caching on disk."
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr "Disk-cache er mængden af diskplads som kan bruges til cache på disken."
 
 #: ../proxy_wizard/Squid.pm:94
@@ -1842,7 +1837,8 @@ msgstr ""
 
 #: ../proxy_wizard/Squid.pm:106
 msgid "The proxy can be configured to use different access control levels"
-msgstr "Proxyen kan konfigureres til at bruge forskellige adgangskontrolniveauer"
+msgstr ""
+"Proxyen kan konfigureres til at bruge forskellige adgangskontrolniveauer"
 
 #: ../proxy_wizard/Squid.pm:119
 msgid ""
@@ -1901,13 +1897,14 @@ msgid "Configuring the Proxy"
 msgstr "Konfigurerer proxy"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-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 ""
 "Hjælperen samlede følgende parametre som behøves for at konfigurere din "
 "proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1939,6 +1936,14 @@ msgstr "Squid proxy"
 msgid "PXE Wizard"
 msgstr "PXE-hjælper"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Du behøver at omjustere dit domænenavn, ikke det samme som localdomain eller "
+"'none'. Kør drakconnect for at justere det."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Indstil PXE-server"
@@ -2048,7 +2053,8 @@ msgstr ""
 "ønsker at starte op via 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 "Vælg PXE-opstartsaftryk som du vil fjerne fra PXE-serveren."
 
 #: ../pxe_wizard/Pxe.pm:153
@@ -2079,8 +2085,10 @@ msgstr ""
 "almindelige parametre."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Venligst vælg PXE-opstartsaftryk som skal ændres fra nedenstående liste"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Venligst vælg PXE-opstartsaftryk som skal ændres fra nedenstående liste"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
 msgid "Boot image to modify:"
@@ -2091,7 +2099,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Tilføj valgmulighed til PXE-opstartsaftryk:"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandrakelinux install server directory"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr ""
 "Installationskatalog: den fulde sti til Mandrakelinux "
 "installationsserverkatalog"
@@ -2193,7 +2202,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "Vi skal bruge et all.rdz eller et network.img-aftryk. Tilføj venligst én."
+msgstr ""
+"Vi skal bruge et all.rdz eller et network.img-aftryk. Tilføj venligst én."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
@@ -2213,10 +2223,12 @@ msgstr "Vælg venligst et aftryk fra et andet katalog end %s."
 msgid ""
 "Please provide a correct PXE name: one ASCII word or one number with no "
 "spaces."
-msgstr "Angiv venligst et korrekt PXE-navn: ét ord ord eller ét tal, uden mellemrum."
+msgstr ""
+"Angiv venligst et korrekt PXE-navn: ét ord ord eller ét tal, uden mellemrum."
 
 #: ../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 at tilføje/fjerne/ændre PXE opstartsaftrykket skal du køre 'Set PXE "
 "server' først."
@@ -2231,7 +2243,8 @@ msgstr "Angiv venligst et andet navn."
 
 #: ../pxe_wizard/Pxe.pm:237
 msgid "The wizard will now prepare all default files to set your PXE server"
-msgstr "Hjælperen vil nu forberede alle standardfiler for at opsætte PXE-serveren"
+msgstr ""
+"Hjælperen vil nu forberede alle standardfiler for at opsætte PXE-serveren"
 
 #: ../pxe_wizard/Pxe.pm:239
 msgid "TFTP directory:"
@@ -2289,24 +2302,24 @@ msgstr "Konfigurerer PXE-server på dit system..."
 msgid "PXE server"
 msgstr "PXE-server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba-hjælper"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s eksisterer ikke."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Alle - Ingen adgangsbegrænsning"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mine regler - Spørg mig om tilladte og afviste værter"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2314,55 +2327,57 @@ msgstr ""
 "Samba lader din server opføre sig som en fil- og printerserver for "
 "arbejdstationer som køre ikke-Linux-systemer."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Konfigurationshjælper for Samba"
 
-#: ../samba_wizard/Samba.pm:72
-msgid "This wizard will help you configuring the Samba services of your server."
+#: ../samba_wizard/Samba.pm:76
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Denne hjælper vil hjælpe dig med at konfigurere Samba-tjenesterne på din "
 "server."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba skal kende de Windows-arbejdsgrupper den skal betjene."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Arbejdsgruppe"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Arbejdsgruppe:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Arbejdsgruppen er forkert"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Server-beskrivelse."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Banner er måden denne server vil blive omtalt i Windows arbejdstationerne."
+msgstr ""
+"Banner er måden denne server vil blive omtalt i Windows arbejdstationerne."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Beskrivelse:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Serverens beskrivelse er ukorrekt"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Adgangsniveau:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2370,7 +2385,7 @@ msgstr ""
 "* Eksempel 1: tillad alle IP'er i 150.203.*.*; undtagen én\n"
 "nhosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2378,7 +2393,7 @@ msgstr ""
 "* Eksempel 2: tillad værter der passer med angivet netværk/netmaske\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2386,7 +2401,7 @@ msgstr ""
 "* Eksempel 3: tillad et par værter\n"
 "hosts allow = lapland, odin"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2398,23 +2413,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Bemærk at adgang stadig kræver passende bruger-niveau adgangskoder."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Tillad værter:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Afvis værter:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Aktiverede Samba tjenester"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2423,19 +2438,19 @@ msgstr ""
 "Samba kan tilbyde et fælles fildelingsområde for din Windows-arbejdstation, "
 "og kan også tilbyde printerdeling for printere tilkoblet din server."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Aktivér fildelingsområde"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Aktivér server-printerdeling"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Gør hjemmekataloger tilgængelige for deres ejere"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2443,28 +2458,28 @@ msgstr ""
 "Du har valgt at tillade brugere adgang til deres hjemmekataloger via Samba, "
 "men du eller de skal bruge smbpasswd til at sætte en adgangskode."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Delt katalog:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Indtast stien på kataloget du ønsker skal deles."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Opret delt katalog, hvis det ikke eksisterer"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Kunne ikke oprette katalog."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Filtilladelser"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2475,59 +2490,60 @@ msgstr ""
 "root, fred, @users, @wheel\n"
 "for hver slags tilladelse."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "læs liste:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "skriv liste:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
-msgstr "Vælg hvilke printere du ønsker skal være tilgængelige for kendte brugere"
+msgstr ""
+"Vælg hvilke printere du ønsker skal være tilgængelige for kendte brugere"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Aktivér alle printere"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Konfigurerer Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Hjælperen samlede følgende parametre for at konfigurere Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Server-beskrivelse:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Fildeling:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Printserver:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Hjem:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Printere:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Hjælperen konfigurerede din Samba-server uden problemer."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Konfigurerer din Samba-server..."
 
@@ -2557,7 +2573,8 @@ msgstr "Således vil din server være den lokale tidsserver for dit netværk."
 
 #: ../time_wizard/Ntp.pm:82
 msgid "press next to begin, or cancel to leave this wizard"
-msgstr "Klik på Næste for at begynde eller Afbryd for at afslutte denne hjælper."
+msgstr ""
+"Klik på Næste for at begynde eller Afbryd for at afslutte denne hjælper."
 
 #: ../time_wizard/Ntp.pm:87
 msgid ""
@@ -2653,7 +2670,8 @@ msgstr "Webhjælper"
 
 #: ../web_wizard/Apache.pm:71
 msgid "This wizard will help you configuring the Web server for your network."
-msgstr "Denne hjælper vil hjælpe dig med at konfigurere web-serveren for dit netværk."
+msgstr ""
+"Denne hjælper vil hjælpe dig med at konfigurere web-serveren for dit netværk."
 
 #: ../web_wizard/Apache.pm:71
 msgid "Web server configuration wizard"
@@ -2755,7 +2773,8 @@ msgstr "Brugerkatalog:"
 
 #: ../web_wizard/Apache.pm:147
 msgid "The wizard successfully configured your intranet/Internet Web server"
-msgstr "Hjælperen konfigurerede din Intranet/Internet web-server uden problemer"
+msgstr ""
+"Hjælperen konfigurerede din Intranet/Internet web-server uden problemer"
 
 #: ../web_wizard/Apache.pm:236
 msgid "Apache server"
@@ -2765,3 +2784,25 @@ msgstr "Apache-server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer dit system som en Apache-server ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Du behøver at ændre på dit værtsnavn."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Du skal omjustere dit domænenavn. For en LDAP-server behøver du et "
+#~ "korrekt domænenavn, ikke det samme som localdomain eller ingenting. "
+#~ "Værtsnavnet skal være et fuldstændigt domænenavn. Kør drakconnect for at "
+#~ "justere det."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Kunne ikke koble op til %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Du behøver at omjustere dit NIS-domænenavn. For en NIS-server behøver du "
+#~ "et korrekt NIS-domænenavn, ikke det samme som localdomain eller ingenting."
diff --git a/po/de.po b/po/de.po
index 1e8042ec..44a21c1f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 6280.0.drakwizard-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-10-28 16:04+0200\n"
 "Last-Translator: Frank Köster <frank@dueppel13.de>\n"
 "Language-Team: deutsch <I18n-mdk-de@codershome.org>\n"
@@ -34,31 +34,31 @@ msgstr "Konfigurations-Assistent"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Warnung."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Fehler."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch"
 
@@ -102,11 +102,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(Sie müssen die Domäne nach dem Rechnernamen nicht angeben)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Client-Identifikation:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -114,7 +114,7 @@ msgstr ""
 "Denken Sie daran, dass die IP-Adresse und der Rechnername nur einmal in "
 "Ihrem Netzwerk vorhanden sein dürfen."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -124,21 +124,21 @@ msgstr ""
 "identifiziert. Außerdem muss jeder Rechner des Netzwerkes eine (eindeutige) "
 "IP-Adresse in der üblichen Punktschreibweise haben."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Rechnername:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP-Adresse des Rechners:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Warnung"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Sie befinden sich im DHCP-Modus, der Server wird eventuell nicht erreichbar "
@@ -147,12 +147,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fehler"
@@ -200,14 +200,36 @@ msgstr "Client-IP-Adresse:"
 msgid "The wizard successfully added the client."
 msgstr "Der Client wurde vom Assistenten erfolgreich in das Netz integriert."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Sie müssen Ihren Domänen-Namen korrigieren. Der DNS-Server braucht einen "
+"korrekten Domänen-Namen, der weder leer noch 'localdomain' ist. Der Hostname "
+"muss ein FQDN sein: Voll geeigneter Domänen-Name. Starten Sie drakconnect "
+"zur Anpassung."
+
+#: ../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."
+msgstr ""
+"Sie müssen Ihren Domänen-Namen korrigieren. Der DNS-Server braucht einen "
+"korrekten Domänen-Namen, der weder leer noch 'localdomain' ist. Der Hostname "
+"muss ein FQDN sein: Voll geeigneter Domänen-Name. Starten Sie drakconnect "
+"zur Anpassung."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "Der Befehl wird noch ausgeführt. Wollen Sie Ihn abbrechen und den "
 "Assistenten beenden?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Schließen"
 
@@ -301,8 +323,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "aus"
@@ -311,8 +333,8 @@ msgstr "aus"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "ein"
@@ -325,54 +347,39 @@ msgstr "Schnittstelle:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Der Assistent hat die DHCP-Dienste erfolgreich eingerichtet."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Fehler"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Starten Sie Drakwizard erneut, und versuchen Sie, einige Parameter zu ändern."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Sie müssen Ihren Rechnernamen korrigieren."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Sie müssen Ihren Domänen-Namen korrigieren. Der DNS-Server braucht einen "
-"korrekten Domänen-Namen, der weder leer noch 'localdomain' ist. Der Hostname "
-"muss ein FQDN sein: Voll geeigneter Domänen-Name. Starten Sie drakconnect "
-"zur Anpassung."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Master-DNS-Server"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Slave-DNS-Server"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Rechner zum DNS hinzufügen"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Rechner aus DNS entfernen"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -380,11 +387,11 @@ msgstr ""
 "DNS (Domain Name Server) ist der Dienst, der Rechnernamen in IP-Adressen "
 "auflösen kann und umgekehrt."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "DNS-Master Konfigurations-Assistent"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -394,46 +401,46 @@ msgstr ""
 "einzurichten, der lokale Adressanfragen selbst beantwortet und Anfragen "
 "aderer Subnetze/des Internets entsprechend weiterleitet."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Was wollen Sie machen:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "FICS Schach Server Interface"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Sie müssen die Domäne nach dem Rechnernamen nicht angeben)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Server:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS-Domänen-Name:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Wählen Sie aus der Liste den zu entfernenden Rechner aus."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Entfernen eines Hosts aus der existierenden DNS-Konfiguration."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Rechner entfernen:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Computer-Name:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -443,11 +450,11 @@ msgstr ""
 "Außerdem fungiert er als Ersatzserver für den Fall, dass Ihr primärer Name-"
 "Server nicht erreichbar ist."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP-Adresse des Master-DNS-Servers:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -455,11 +462,11 @@ msgstr ""
 "Das Weiterleiten geschieht nur für die Anfragen, für die der Server nicht "
 "authorisiert ist oder er die Antwort nicht im Zwischenspeicher hat."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP-Adresse für die Weiterleitung"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -467,15 +474,15 @@ msgstr ""
 "Tragen Sie bei Bedarf die IP-Adresse Ihrer Weiterleitung ein, sofern sie "
 "bekannt ist, andernfalls tragen Sie nichts ein"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Externer DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Such-Domäne hinzufügen"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -483,7 +490,7 @@ msgstr ""
 "Der Domänen-Name dieses Servers wird automatisch hinzugefügt. Sie brauchen "
 "ihn hier nicht hinzufügen."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -495,29 +502,29 @@ msgstr ""
 "lokalen Domain-Namen. Die kann verändert werden indem der gewünschte Domain-"
 "Suchpfad, gefolgt vom Suchbegriff, in die Liste eingetragen wird"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Voreingestellter Domain-Name für die Suche:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Die IP-Adresse für die Weiterleitung ist ungültig... Drücken Sie Weiter um "
 "fortzufahren"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Das ist keine gültige IP-Adresse des Master-DNS... Drücken Sie „Weiter“ um "
 "fortzufahren"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 "Das ist keine gültige IP-Adresse... Drücken Sie „Weiter“um fortzufahren"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -525,11 +532,11 @@ msgstr ""
 "Dieser Rechner ist wahrscheinlich schon in der DNS-Konfiguration vorhanden. "
 "Drücken Sie „Weiter“ um fortzufahren"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Fehler:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -537,7 +544,7 @@ msgstr ""
 "Es scheint, dass dies nicht in Ihren DNS-Einstellungen eingerichtet ist... "
 "Drücken Sie Weiter, um fortzufahren"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -545,76 +552,76 @@ msgstr ""
 "Es wurde wahrscheinlich kein DNS-Server durch den Assistenten eingerichtet. "
 "Starten Sie den Assistenten: Master-DNS-Server."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Es handelt sich anscheinend nicht um einen Master-DNS-Server, deswegen kann "
 "ich den Host nicht hinzufügen/entfernen."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Assistent wird nun die DNS-Slave-Konfiguration erstellen"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "mit dieser Konfiguration:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Der Klient mit dieser Identifikation wird Ihrem DNS-Server hinzugefügt"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Computer-Name:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Computer-IP-Adresse:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 "Der Klient mit dieser Identifikation wird aus Ihrem DNS-Server entfernt"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Der DNS-Server wird nun mit folgender Konfiguration eingerichtet"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Server-Name:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domänen-Name:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr ""
 "Der Rechner wurde vom Assistenten erfolgreich zu Ihrem DNS hinzugefügt."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Der Host wurde vom Assistenten erfolgreich aus Ihrem DNS entfernt."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 "Der Assistent hat den DNS-Dienst Ihres Servers erfolgreich eingerichtet."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Bitte starten Sie Drakwizard erneut, und versuchen Sie, einige Parameter zu "
 "ändern."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfiguriere Ihr System als Master-DNS-Server..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfiguriere Ihr System als Slave-DNS-Server..."
 
@@ -642,7 +649,7 @@ msgstr "Mail-Server"
 msgid "FTP server"
 msgstr "FTP-Server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba-Server"
 
@@ -666,7 +673,7 @@ msgstr "NIS-Server AutoFS map"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux Installations-Server"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab-Server"
 
@@ -691,7 +698,7 @@ msgstr ""
 "%s ist nicht installiert\n"
 "Wählen Sie „Weiter“ für die Installation, oder „Abbrechen“ zum Beenden"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Installation fehlgeschlagen"
 
@@ -943,15 +950,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab Konfigurations-Assistent"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Sie müssen Ihren Domänen-Namen anpassen, indem er weder leer noch "
-"'localdomain' ist. Starten Sie drakconnect zur Anpassung."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -963,7 +962,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:59
+#: ../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 "
@@ -973,43 +972,43 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Drakwizard wird eine Sicherungskopie aller "
 "vorhandenen Konfigurationsdateien dieser Dienste anfertigen."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Willkommen zum Kolab Groupware-Server Konfigurations-Assistenten."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword 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:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Passwort nochmal:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Mail-Domäne:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -1018,46 +1017,35 @@ msgstr ""
 "'manager'·ein mit dem eingegebenen Passwort unter:·https://127.0.0.1/kolab/"
 "admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Installation im Gange"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Installiere den Kolab-Server auf Ihren System..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfiguriere den Kolab-Server auf Ihrem System..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap-Assistent"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Sie müssen Ihren Domänen-Namen korrigieren. Der LDAP-Server braucht einen "
-"korrekten Domänen-Namen, der weder leer noch 'localdomain' ist. Der Hostname "
-"muss ein FQDN sein: Voll geeigneter Domänen-Name. Starten Sie drakconnect "
-"zur Anpassung."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "LDAP Konfiguration anzeigen"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Benutzer zum LDAP-Server hinzufügen"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "LDAP-Konfiguration entfernen"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1065,192 +1053,190 @@ msgstr ""
 "Es ist ein leichtgewichtiges Protokoll, um auf Verzeichnisdienste "
 "zuzugreifen, speziell für X.500-basierte Verzeichnisdienste."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP steht für Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "LDAP-Konfigurations-Assistent"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Sie müssen zuerst einen LDAP-Server aufsetzen."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ihre Auswahl:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Konfiguration entfernen"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Sichern der existierenden Basis in /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP Benutzer hinzufügen"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Benutzer angelegt in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Benutzer angelegt in: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Erster Name:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Name:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Benutzeranmeldung:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Sie müssen einen gültigen Vornamen angeben."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Sie müssen einen gültigen Namen angeben."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Sie müssen einen gültigen Benutzernamen angeben."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP Benutzer-Passwort"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "Passwörter müssen übereinstimmen"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Passwort (nochmal):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Sie müssen ein Passwort für LDAP angeben."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Der Administrator ist ein allmächtiger Benutzer mit gewährtem Zugang zur "
 "LDAP Datenbank"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrator,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Konfiguriere LDAP-Server"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Domänen-Name: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Domänen-Name: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP Administrator"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP-Verzeichnisbaum"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "Die DNS Benennung wird für die LDAP Verzeichnisbaum-Definition benutzt"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP-Verzeichnisbaum:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP Administrator:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP-Passwort:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP-Passwort (nochmal):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Sie müssen einen gültigen LDAP-Verzeichnisbaum angeben."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Bestätigung für das Erstellen eines Benutzers"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Vorname:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Benutzername:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Erstellen in:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Bestätigungs-Information für das Erstellen des LDAP-Servers"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Benutzer Container:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Der Assistent hat den LDAP-Server erfolgreich eingerichtet."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Benutzer erfolgreich hinzugefügt"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Fehler beim Hinzufügen eines Benutzers in die LDAP-Datenbank"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Server ist schon konfiguriert"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Sie haben Ihren LDAP-Server schon konfiguriert"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s fehlgeschlagen"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Fehler!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Kann keine Verbindung zu %s herstellen"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News-Assistent"
@@ -1394,13 +1380,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Verzeichnis:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Das angegebene Verzeichnis existiert nicht."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Zugangskontrolle"
 
@@ -1455,30 +1441,22 @@ msgstr "Netzmaske:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Der Assistent hat Ihren NFS-Server erfolgreich eingerichtet."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Sie müssen Ihren NIS-Domänennamen korrigieren. Der NIS-Server braucht einen "
-"korrekten Domänen-Namen, der weder leer noch 'localdomain' ist."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS-Server mit AutoFs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS-Client"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Richten Sie einen NIS-Server mit AutoFS map, auto.home und auto.master-"
 "Dateien ein."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1486,28 +1464,28 @@ msgstr ""
 "Benutzer hängen ihre Heimatverzeichnisse auf dem Server automatisch ein, "
 "wenn sie sich am NIS-Klient-Computer-Netzwerk einloggen."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Was wollen Sie machen?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Computer als NIS-Client konfigurieren"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Sie müssen nur die NIS-Domäne und den NIS-Server angeben."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS-Server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS-Domäne:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1519,7 +1497,7 @@ msgstr ""
 "Heimatverzeichnisse automatisch einhängen können auf ihrem NIS-Klient-"
 "Computer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1527,42 +1505,42 @@ msgstr ""
 "NIS-Home: Heimat-Basisverzeichnis für die Benutzer auf dem NIS-Server. "
 "Dieses Verzeichnis wird über den NFS-Server exportiert."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS-Domäne: zu benutzende NIS-Domäne (generell die gleiche, wie Ihr DNS "
 "Domänenname)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS-Server: Name Ihre Computers."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS-Heimat:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS-Domänen-Name:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Der Assistent wird Ihren NIS-Server mit autofs einrichten"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS-Verzeichnis:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS-Domänen-Name: Name der NIS-Domäne."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS-Server: Hostname des NIS-Servers."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1570,24 +1548,24 @@ msgstr ""
 "Der YPBIND-Daemon findet den NIS-Server und wartet die NIS-"
 "Bindungsinformationen."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Fehler: sollte ein Verzeichnis sein."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Fehler: NIS-Domainname sollte nicht „none“ oder „localdomain“ sein."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Bitte stellen Sie dies ein."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "Der Assistent hat Ihren Computer erfolgreich als NIS-Client eingerichtet."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1595,16 +1573,16 @@ msgstr ""
 "Der Assistent hat Ihren Computer erfolgreich als NIS-Server mit autofs "
 "eingerichtet."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 "Richtet Ihr System ein um als NIS-Server mit AutoFS map zu fungieren..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS mit AutoFS map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Konfiguriere Ihr System als NIS-Client ..."
 
@@ -1981,7 +1959,7 @@ msgstr ""
 "des Proxys braucht:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2014,6 +1992,14 @@ msgstr "Squid-Proxy"
 msgid "PXE Wizard"
 msgstr "PXE-Assistent"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Sie müssen Ihren Domänen-Namen anpassen, indem er weder leer noch "
+"'localdomain' ist. Starten Sie drakconnect zur Anpassung."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXE-Server konfigurieren"
@@ -2385,24 +2371,24 @@ msgstr "Konfiguriere Ihren PXE-Server..."
 msgid "PXE server"
 msgstr "PXE-Server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba-Assistent"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s existiert nicht."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Alle - Keine Zugangsbeschränkung"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Meine Regeln - Frag mich nach erlaubten und verbotenen Rechnern"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2410,38 +2396,38 @@ msgstr ""
 "Samba erlaubt es Ihrem Server, sich an Arbeitsstationen, auf denen kein "
 "Linux läuft, sich als File- und Printserver auszugeben."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba Konfigurations-Assistent"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Der Assistent wird Ihnen helfen die Samba-Dienste Ihres Servers zu "
 "konfigurieren."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba muss die Windows Arbeitsgruppe kennen in der es arbeitet."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Arbeitsgruppe"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Arbeitsgruppe:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Die Arbeitsgruppe ist falsch"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Server-Banner."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2449,19 +2435,19 @@ msgstr ""
 "Das Banner ist das Mittel, mit dem dieser Server auf Windows-Rechnern "
 "beschrieben wird."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Das Server-Banner ist falsch"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Zugangslevel:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2469,7 +2455,7 @@ msgstr ""
 "* Beispiel 1: Alle IPs im Bereich „150.203.*.*“ erlauben, außer einer\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2478,7 +2464,7 @@ msgstr ""
 "haben\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2486,7 +2472,7 @@ msgstr ""
 "* Beispiel 3: nur ein Rechner-Paar erlauben\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2498,24 +2484,24 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Beachte, dass der Zugang immer passende User-Level-Passwörter benötigt."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Erlaubte Rechner:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Verweigerte Rechner:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Aktivierte Samba-Dienste"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2525,19 +2511,19 @@ msgstr ""
 "Arbeitsstation bieten, sowie die Druckerfreigabe der an ihren Server "
 "angeschlossenen Drucker."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Dateitauschplattform aktivieren"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Server-Drucker-Freigabe aktivieren"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Die Persönlichen Verzeichnisse für ihre Besitzer verfügbar machen"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2546,28 +2532,28 @@ msgstr ""
 "Persönlichen Verzeichnisse mittels Samba zuzugreifen, aber Sie müssen "
 "'smbpasswd' benutzen, um ein Passwort zu setzen."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Freigegebenes Verzeichnis:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Geben Sie den Pfad zu dem Verzeichnis an, das Sie freigeben möchten."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Erstelle das freigegebene Verzeichnis, wenn es noch nicht existiert"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Fehler beim Erstellen des Verzeichnisses."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Datei-Berechtigungen"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2577,62 +2563,62 @@ msgstr ""
 "'@' vorgestellt bekommen) ein wie z.B: \n"
 "root, fred, @users, @wheel für jede Art der Berechtigung."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Leseliste:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Schreibliste:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Wählen Sie aus, welche Drucker duch bekannte Benutzer benutzbar sind"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Alle Drucker aktivieren"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Konfiguriere Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Der Assistent hat die folgenden Parameter zur Konfiguration des Samba-"
 "Servers gesammelt."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Server-Banner:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Dateifreigabe:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Druck-Server:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Heimatverzeichnis:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Drucker:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 "Der Assistent hat den Samba-Dienst Ihres Servers erfolgreich eingerichtet."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Konfiguriere Ihren Samba-Server..."
 
@@ -2880,3 +2866,26 @@ msgstr "Apache Server"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfiguriere Ihr System als Apache-Server..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Sie müssen Ihren Rechnernamen korrigieren."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Sie müssen Ihren Domänen-Namen korrigieren. Der LDAP-Server braucht einen "
+#~ "korrekten Domänen-Namen, der weder leer noch 'localdomain' ist. Der "
+#~ "Hostname muss ein FQDN sein: Voll geeigneter Domänen-Name. Starten Sie "
+#~ "drakconnect zur Anpassung."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Kann keine Verbindung zu %s herstellen"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Sie müssen Ihren NIS-Domänennamen korrigieren. Der NIS-Server braucht "
+#~ "einen korrekten Domänen-Namen, der weder leer noch 'localdomain' ist."
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index 829cda26..42bd5513 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:34+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,31 +22,31 @@ msgstr ""
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr ""
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr ""
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr ""
 
@@ -82,50 +82,50 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr ""
@@ -166,12 +166,25 @@ msgstr ""
 msgid "The wizard successfully added the client."
 msgstr ""
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr ""
 
@@ -253,8 +266,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr ""
@@ -263,8 +276,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr ""
@@ -277,144 +290,133 @@ msgstr ""
 msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -422,108 +424,108 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr ""
 
@@ -551,7 +553,7 @@ msgstr ""
 msgid "FTP server"
 msgstr ""
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr ""
 
@@ -575,7 +577,7 @@ msgstr ""
 msgid "Mandrakelinux Install server"
 msgstr ""
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr ""
 
@@ -598,7 +600,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr ""
 
@@ -818,13 +820,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -832,276 +828,267 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
+#: ../ldap_wizard/Ldap.pm:181
+msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Administrator is a power user with grant access on LDAP database"
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr ""
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr ""
@@ -1222,13 +1209,13 @@ msgstr ""
 msgid "Directory:"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr ""
 
@@ -1277,135 +1264,129 @@ msgstr ""
 msgid "The wizard successfully configured your NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr ""
 
@@ -1720,7 +1701,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1750,6 +1731,12 @@ msgstr ""
 msgid "PXE Wizard"
 msgstr ""
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 msgid "Set PXE server"
 msgstr ""
@@ -2060,95 +2047,95 @@ msgstr ""
 msgid "PXE server"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2156,128 +2143,128 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index 8b315eb4..51eb8ed7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-03-01 14:48+0200\n"
 "Last-Translator: Dimitris Korbetis <korb@uth.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -21,31 +21,31 @@ msgstr "Οδηγός Ρυθμίσεων"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Προειδοποίηση"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Σφάλμα."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Συγχαρητήρια"
 
@@ -87,11 +87,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(δεν χρειάζεται να πληκτρολογήσετε τον τομέα μετά το όνομα)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Αναγνωριστικό πελάτη:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -99,7 +99,7 @@ msgstr ""
 "Σημειώστε ότι ο αριθμός IP και το όνομα πελάτη πρέπει να είναι μοναδικά στο "
 "δίκτυο."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -109,21 +109,21 @@ msgstr ""
 "εταιρία.net. Κάθε μηχάνημα πρέπει να έχει στο δίκτυο μια (μοναδική) "
 "διεύθυνση IP,συνήθως χωρισμένη με τελείες."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Όνομα του μηχανήματος:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Διεύθυνση IP:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Είστε σε dhcp, ο διακομιστής μπορεί να μη λειτουργήσει με τις ρυθμίσεις σας."
@@ -131,12 +131,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Σφάλμα"
@@ -181,12 +181,25 @@ msgstr "IP Πελάτη:"
 msgid "The wizard successfully added the client."
 msgstr "Ο οδηγός πρόσθεσε με επιτυχία τον πελάτη."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -277,8 +290,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "απενεργοποιημένο"
@@ -287,8 +300,8 @@ msgstr "απενεργοποιημένο"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "ενεργοποιημένο"
@@ -301,50 +314,39 @@ msgstr "Διασύνδεση"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τις υπηρεσίες DHCP στον διακομιστή σας."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Ανεπιτυχές"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Επανεκκίνηστε το drakwizard και προσπαθήστε να αλλάξετε κάποιες παραμέτρους"
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Χρειάζεται να ξαναρυθμίσετε το όνομα υπολογιστή "
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Κύριος διακομιστής DNS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Δευτερεύων διακομιστής DNS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Προσθήκη υπολογιστή στο DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Διαγραφή υπολογιστή στο DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -352,11 +354,11 @@ msgstr ""
 "Η υπηρεσία DNS (Domain Name Server) αντιστοιχεί την IP ενός μηχανήματος με "
 "το όνομα κεντρικού υπολογιστή στο διαδίκτυο."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων κύριου DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -366,88 +368,88 @@ msgstr ""
 "σας. Αυτή η ρύθμιση θα παρέχει μια τοπική υπηρεσία DNS για τοπικά ονόματα "
 "υπολογιστών, ενώ οι μη τοπικές αιτήσεις θα προωθούνται σε εξωτερικό DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Εξυπηρετητής DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(δεν χρειάζεται να πληκτρολογήσετε τον τομέα μετά το όνομα)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Διεύθυνση  IP εξυπηρετητή"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Πελάτης NIS"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Διαγραφή υπολογιστή:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Όνομα Υπολογιστή"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Διεύθυνση IP του κύριου εξυπηρετητή DNS:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP του forwarder"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Εξωτερικό DNS"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Προσθήκη search domain"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -455,113 +457,113 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Αυτή δεν είναι έγκυρη διεύθυνση IP... επιλέξτε επόμενο για να συνεχίσετε"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Αυτή δεν είναι έγκυρη διεύθυνση IP του κύριου DNS... επιλέξτε επόμενο για να "
 "συνεχίσετε"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 "Αυτή δεν είναι έγκυρη διεύθυνση  IP... επιλέξτε επόμενο για να συνεχίσετε"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Σφάλμα:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "με αυτή τη ρύθμιση:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Όνομα Υπολογιστή"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Διεύθυνση IP υπολογιστή:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Όνομα εξυπηρετητή"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Ο οδηγός πρόσθεσε με επιτυχία τον υπολογιστή στο DNS σας"
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Ο οδηγός αφαίρεσε με επιτυχία τον υπολογιστή στο DNS σας"
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία την υπηρεσία DNS του διακομιστή σας."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Επανεκκίνηστε το drakwizard και προσπαθήστε να αλλάξετε κάποιες παραμέτρους"
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Ρυθμίζεται το σύτημά σας σαν κύριος εξυπηρετητής DNS..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Ρυθμίζεται το σύτημά σας σαν βοηθητικός εξυπηρετητής DNS..."
 
@@ -589,7 +591,7 @@ msgstr "Διακομιστής αλληλογραφίας"
 msgid "FTP server"
 msgstr "Διακομιστής FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Εξυπηρετητής Samba"
 
@@ -614,7 +616,7 @@ msgstr "Εξυπηρετητής NIS με autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Εξυπηρετητής εγκατάστασης Mandrake "
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Εξυπηρετητής Samba"
@@ -641,7 +643,7 @@ msgstr ""
 "Το %s δεν είναι εγκατεστημένο επιλέξτε \"Επόμενο\" για εγκατάσταση η \"Άκυρο"
 "\" για έξοδο"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
@@ -879,13 +881,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων Samba"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -893,307 +889,296 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Οδηγός Ρυθμίσεων Διακομιστή Ιστού"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Κωδικός:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εσωτερικό εξυπηρετητή αλληλογραφίας"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Όνομα εξυπηρετητή"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 #, fuzzy
 msgid "Mail domain:"
 msgstr "Τομέας NIS:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Κατάλογος εγκατάστασης"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά σας"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά σας"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Οδηγός Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Οδηγός Ρυθμίσεων LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Οδηγός Ρυθμίσεων LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Set PXE server"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Εγατάσταση εργαλείων ρύθμισης εξυπηρετητή"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Όνομα Χρήστη:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Όνομα:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Όνομα Χρήστη:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Κωδικός πρόσβασης"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Κωδικός:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Οι κωδικοί πρόσβασης είναι ανόμοιοι"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Ρυθμίζεται το Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Πελάτης NIS"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Πελάτης NIS%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Κατάλογος TFTP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Κατάλογος TFTP"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Κωδικός:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Κωδικός:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Κατάλογος TFTP"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Όνομα:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Όνομα Χρήστη:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εξυπηρετητή LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Επιτυχής προσθήκη δεδομένων"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή Samba."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Ανεπιτυχές"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Σφάλμα"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Οδηγός Ειδήσεων"
@@ -1335,13 +1320,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Κατάλογος:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Η θέση που ορίσατε δεν υπάρχει."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Έλεγχος Πρόσβασης"
 
@@ -1397,123 +1382,117 @@ msgstr "Μάσκα Δικτύου:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον Διακομιστή NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Εξυπηρετητής NIS με autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Πελάτης NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Εξυπηρετητής NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Τομέας NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Πελάτης NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Πελάτης NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή NIS με autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Κατάλογος NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Υπολογισμένο Όνομα Τομέα"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS server: hostname of the NIS server."
 msgstr "Εξυπηρετητής NIS με autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Σφάλμα πρέπει να είναι κατάλογος"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Παρακαλώ ρυθμίστε το. "
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον υπολογιστή σας σαν πελάτη NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1521,17 +1500,17 @@ msgstr ""
 "Ο οδηγός ρύθμισε με επιτυχία τον υπολογιστή σας σαν εξυπηρετητή NIS με "
 "autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 "Ο οδηγός ρύθμισε με επιτυχία τον υπολογιστή σας σαν εξυπηρετητή NIS με "
 "autofs map..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "Εξυπηρετητής NIS με autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Ρυθμίζεται το σύστημά σαν πελάτης NIS..."
 
@@ -1895,7 +1874,7 @@ msgstr ""
 "το proxy σας:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1927,6 +1906,12 @@ msgstr "Διαμεσολαβητής Squid "
 msgid "PXE Wizard"
 msgstr "Οδηγός 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."
+msgstr ""
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 #, fuzzy
 msgid "Set PXE server"
@@ -2252,26 +2237,26 @@ msgstr "Ρύθμιση του εξυπηρετητή PXE στο σύστημά �
 msgid "PXE server"
 msgstr "Εξυπηρετητής PXE:"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Οδηγός Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "δεν υπάρχει το %s"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Όλοι - Χωρίς περιορισμούς πρόσβασης"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 "Οι κανόνες μου - Ρωτήστε με ποιοι είναι οι επιτρεπόμενοι και ποιοι οι "
 "απαγορευμένοι υπολογιστές"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2279,38 +2264,38 @@ msgstr ""
 "Το Samba επιτρέπει τον διακομιστή σας να συμπεριφέρεται ως διακομιστής "
 "αρχείων και εξυπηρετητή εκτυπώσεων για σταθμούς εργασίας χωρίς Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει στη ρύθμιση των υπηρεσιών Samba για το "
 "διακομιστή σας."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Το Samba πρέπει να ξέρει την ομάδα εργασίας Windows που θα εξυπηρετεί."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Ομάδα εργασίας"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Ομάδα εργασίας:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Η Ομάδα εργασίας είναι λάθος"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Αρχικό μήνυμα διακομιστή."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2318,19 +2303,19 @@ msgstr ""
 "Το αρχικό μήνυμα διακομιστή είναι το όνομα που θα περιγράφει αυτόν τον "
 "διακομιστή στους σταθμούς εργασίας Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Αρχικό μήνυμα διακομιστή:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Το Αρχικό Μήνυμα του Διακομιστή είναι λανθασμένο"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Επίπεδο πρόσβασης:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2338,7 +2323,7 @@ msgstr ""
 "* Παράδειγμα 1: επέτρεψε όλα τα IP στο 150.203.*.*; εκτός από μια\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2347,7 +2332,7 @@ msgstr ""
 "δικτύου \n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2355,7 +2340,7 @@ msgstr ""
 "*Παράδειγμα 3: επέτρεψε κάποιους υπολογιστές\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2367,25 +2352,25 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Σημειώστε ότι η πρόσβαση ακόμα απαιτεί κατάλληλους κωδικούς πρόσβασης "
 "χρηστών."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Επέτρεψε τους υπολογιστές:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Απέτρεψε τους υπολογιστές:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Ενεργοποιημένες Υπηρεσίες Samba"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2395,19 +2380,19 @@ msgstr ""
 "σταθμούς εργασίας Windows που διαθέτετε, επίσεις μπορεί παρέχει τους "
 "εκτυπωτές που είναι συνδεμένοι στον διακομιστή στους άλλους υπολογιστές."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Ενεργοποίηση της περιοχής κοινόχρηστων αρχείων"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Ενεργοποίηση του Διακομιστή Κοινής Χρήσης Εκτυπωτών"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Κάνε διαθέσιμους τους αρχικούς καταλόγους στους ιδιοκτήτες τους"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2416,28 +2401,28 @@ msgstr ""
 "τους καταλόγους μέσω του samba αλλά εσείς/αυτοί πρέπει να ορίσετε κωδικό "
 "πρόβασης με χρήση του smbpasswd"
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Κοινός κατάλογος:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Δώστε τη θέση του καταλόγου που θέλετε να είναι κοινόχρηστος."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Δικαιώματα Αρχείων"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2447,61 +2432,61 @@ msgstr ""
 "προηγείται ένα '@') π.χ.:\n"
 "root, fred, @users, @wheel για κάθε είδος δικαιωμάτων."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "λίστα ανάγνωσης:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "λίστα εγγραφής:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Επιλέξτε ποιοι εκτυπωτές θα είναι διαθέσιμοι σε γνωστούς χρήστες"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Ενεργοποίηση όλων των εκτυπωτών"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Ρυθμίζεται το Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "το Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Αρχικό Μήνυμα Διακομιστή:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Κοινή Χρήση Αρχείων:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Εξυπηρετητής Εκτυπώσεων:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Σπίτι:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Εκτυπωτές:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Ρυθμίσεις εξυπηρετητή Samba ..."
 
@@ -2750,6 +2735,13 @@ msgstr "Εξυπηρετητής Apache "
 msgid "Configuring your system as Apache server ..."
 msgstr "Το σύστημα σας ρυθμίζεται σαν εξυπηρετητής Apache "
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Χρειάζεται να ξαναρυθμίσετε το όνομα υπολογιστή "
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Όνομα Χρήστη:"
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
diff --git a/po/eo.po b/po/eo.po
index 3601d5fe..cf3ed18d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2003-08-09 15:18+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -23,33 +23,33 @@ msgstr "Konfigurad-sorĉilo"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "Averto"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 #, fuzzy
 msgid "Error."
 msgstr "Sorĉil-eraro."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gratulon"
 
@@ -90,11 +90,11 @@ msgstr "Tiu ĉi sorĉilo helpos vin aldoni novan klienton en via loka DNS."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(vi ne bezonas tajpi la domajnon post la nomo)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "KIienta identigo:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -102,7 +102,7 @@ msgid ""
 msgstr ""
 "Notu ke la donita IP-numero kaj la klientonomo devas esti unikaj en la reto."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,22 +112,22 @@ msgstr ""
 "net. Ĉiu maŝino en la reto devas havi (unikan) IP-adreson, en la kutima "
 "punktita/memreferenca sintakso."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nomo de la maŝino:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP-numero de la maŝino:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Averto"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -136,12 +136,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
@@ -187,12 +187,25 @@ msgstr "Klienta IP:"
 msgid "The wizard successfully added the client."
 msgstr "La sorĉilo sukcese aldonis la klienton."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Fermu"
 
@@ -286,8 +299,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "elŝaltita"
@@ -296,8 +309,8 @@ msgstr "elŝaltita"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "enŝaltita"
@@ -312,53 +325,42 @@ msgstr "Interreto"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "La sorĉilo sukcese konfiguris la DHCP-servojn de via servilo."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "enŝaltita"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS-servilo"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS-servilo"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "Rifuzu gastigantojn:"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -366,12 +368,12 @@ msgstr ""
 "DNS (Domain Name Server) estas la servo kiu listigas IP-adreson de maŝino "
 "kun interreta komputilnomo."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "DNS-konfigurad-sorĉilo"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -381,93 +383,93 @@ msgstr ""
 "konfigurado provizos lokan DNS-servon por lokaj komputilnomoj, kun nelokaj "
 "demandoj plusendataj al ekstera DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "NFS-servilo"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(vi ne bezonas tajpi la domajnon post la nomo)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Servil-nomo:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Komputita domajno-nomo"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "Rifuzu gastigantojn:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Komputita domajno-nomo"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurante la DNS-servilon"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "Ekstera kluzo"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -475,120 +477,120 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Tio ne estas valida adreso... premu SEKVA por daŭrigi"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Tio ne estas valida adreso... premu SEKVA por daŭrigi"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Tio ne estas valida adreso... premu SEKVA por daŭrigi"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Sorĉil-eraro."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS-sorĉilo (konfigurado)"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 #, fuzzy
 msgid "Computer name:"
 msgstr "Komputita domajno-nomo"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP-adreso de la servilo:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Servil-nomo:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "La sorĉilo sukcese aldonis la klienton."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "La sorĉilo sukcese aldonis la klienton."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "La sorĉilo sukcese konfiguris la DNS-servojn de via servilo."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurante la DNS-servilon"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurante la DNS-servilon"
@@ -620,7 +622,7 @@ msgstr "Poŝt-servilo"
 msgid "FTP server"
 msgstr "FTP-servilo"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Datenbaz-servilo"
@@ -649,7 +651,7 @@ msgstr "Novaĵ-servilo"
 msgid "Mandrakelinux Install server"
 msgstr "Nomo de poŝt-servilo:"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Datenbaz-servilo"
@@ -674,7 +676,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "Elektu instalklason"
@@ -912,13 +914,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Sorĉilo por Samba-konfigurado"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -926,309 +922,298 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Sorĉilo por konfiguri Teksaĵ-servilon"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Pasvorto:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, 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:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Gastiganto-nomo"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Uzul-dosierujo:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Mi konfiguras la FTP-servilon"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Mi konfiguras la FTP-servilon"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap-sorĉilo"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Konfigurad-sorĉilo"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Konfigurad-sorĉilo"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Konfigurad-sorĉilo"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Datenbaz-servilo"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Konfiguraĵo de tempo-servilo konservita"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Uzul-aldono"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "Gastiganto-nomo:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Uzulnomo:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Uzul-aldono"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Pasvorto:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Pasvorto:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "La pasvortoj ne egalas"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Mi konfiguras Samba-on"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Komputita domajno-nomo"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Komputita domajno-nomo%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Uzul-dosierujo:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Uzul-dosierujo:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Pasvorto:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Pasvorto:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Uzul-dosierujo:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Gastiganto-nomo:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Uzulnomo:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurante la DHCP-servilon"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Uzul-aldono"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "La sorĉilo sukcese konfiguris vian prokur-servilon."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "enŝaltita"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Sorĉil-eraro."
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Novaĵ-sorĉilo"
@@ -1369,13 +1354,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Dosierujo:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "La pado, kiun vi enigis, ne ekzistas."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Alir-kontrolo"
 
@@ -1429,148 +1414,142 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "La sorĉilo sukcese konfiguris vian NFS-servilon"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Novaĵ-servilo"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "Klienta IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS-servilo"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Hejmo:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Komputita domajno-nomo"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "Uzul-dosierujo:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Komputita domajno-nomo"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Opuza dosierujo:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurante la DNS-servilon"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Novaĵ-servilo"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurante la DNS-servilon"
@@ -1936,7 +1915,7 @@ msgstr ""
 "prokuron:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1969,6 +1948,12 @@ msgstr "Squid prokuro"
 msgid "PXE Wizard"
 msgstr "PXE-sorĉilo"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2292,24 +2277,24 @@ msgstr ""
 msgid "PXE server"
 msgstr "NFS-servilo"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba-sorĉilo"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Ĉiuj - Neniu aliro-restrikto"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Miaj reguloj - Demandu min pri permesitaj kaj rifuzitaj gastigantoj"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2317,36 +2302,36 @@ msgstr ""
 "Samba-o ebligas al via servilo konduti kiel dosier- kaj pres-servilo por "
 "laborstacioj funkciantaj per nelinuksaj sistemoj."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Sorĉilo por Samba-konfigurado"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Tiu ĉi sorĉilo helpos vin konfiguri la Samba-servojn de via servilo."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba-o devas scii la Vindozan laborgrupon kiun ĝi servu."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Laborgrupo"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Laborgrupo:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "La laborgrupo malĝustas"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Servil-rubando."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2354,19 +2339,19 @@ msgstr ""
 "La rubando estas la maniero en kiu tiu ĉi servilo estu priskribata en la "
 "Vindozaj laborstacioj."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Rubando:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "La servil-rubando malĝustas"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Alir-nivelo:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2374,7 +2359,7 @@ msgstr ""
 "* Ekzemplo 1: permesu ĉiujn IP-ojn en 150.203.*.*; escepte de unu\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2383,7 +2368,7 @@ msgstr ""
 "netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2391,7 +2376,7 @@ msgstr ""
 "* Ekzemplo 3: permesu paron da gastigantoj\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2403,23 +2388,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Notu ke la aliro daŭre postulas ĝustajn pasvortojn de uzul-nivelo."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Permesu gastigantojn:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Rifuzu gastigantojn:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Enŝaltitaj Samba-servoj"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2429,19 +2414,19 @@ msgstr ""
 "laborstacio, kaj povas ankaŭ provizi presil-opuzon por la presiloj "
 "konektitaj al via servilo."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Enŝaltu areon de dosiera opuzado"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Enŝaltu opuzon de servil-presilo"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Igu la hejm-dosierujojn alireblaj por iliaj posedantoj"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2449,28 +2434,28 @@ msgstr ""
 "Vi elektis permesi al uzuloj aliri siajn hejm-dosierujojn pere de samba, sed "
 "vi/ili devas uzi smbpasswd por difini pasvorton."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Opuza dosierujo:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Entajpu la padon de la dosierujo kiun vi deziras esti opuza."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Dosier-permesoj"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2480,60 +2465,60 @@ msgstr ""
 "ĉi: \n"
 "root, fred, @users, @wheel por ĉiu speco de permeso."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "legu liston:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "skribu liston:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Elektu kiujn presilojn vi deziras alireblaj ekde konataj uzuloj"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Enŝaltu ĉiujn presilojn"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Mi konfiguras Samba-on"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "La sorĉilo kolektis jenajn parametrojn bezonatajn por konfiguri Samba-on."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Servil-rubando:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Dosier-opuzo:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Presil-servilo:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Hejmo:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Presiloj:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Mi konfiguras la FTP-servilon"
@@ -2781,6 +2766,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurante la DNS-servilon"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Uzul-aldono"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Konfigurante la DHCP-servilon"
 
diff --git a/po/es.po b/po/es.po
index 7a6ac6e0..6e30f61c 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: 2004-11-05 12:34+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-07 20:10+0100\n"
 "Last-Translator: Jaime Crespo <505201@unizar.es>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -23,31 +23,31 @@ msgstr "Asistente de configuración"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Advertencia."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Error."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Felicidades"
 
@@ -88,11 +88,11 @@ msgstr "Este asistente lo ayudará a añadir un cliente nuevo en su DNS local."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(no necesita teclear el dominio luego del nombre)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identificación del cliente:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -100,7 +100,7 @@ msgstr ""
 "Note que la dirección IP y el nombre del cliente dados deberían ser únicos "
 "en la red."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -110,21 +110,21 @@ msgstr ""
 "empresa.net. Cada máquina en la red debe tener una dirección IP (única), en "
 "la notación puntuada corriente."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nombre de la máquina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Dirección IP de la máquina:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Advertencia"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Está usando dhcp, puede que el servidor no funcione con su configuración."
@@ -132,12 +132,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
@@ -182,13 +182,33 @@ msgstr "IP del cliente:"
 msgid "The wizard successfully added the client."
 msgstr "El asistente añadió exitosamente al cliente."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Debe volver a ajustar su nombre de dominio. Para un servidor DNS necesita un "
+"nombre de dominio correcto, distinto a 'localdomain' o vacío. Lance "
+"drakconnect para ajustarlo."
+
+#: ../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."
+msgstr ""
+"Debe volver a ajustar su nombre de dominio. Para un servidor DNS necesita un "
+"nombre de dominio correcto, distinto a 'localdomain' o vacío. Lance "
+"drakconnect para ajustarlo."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "El comando todavía está ejecutando ¿Desea finalizarlo y salir del Asistente?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Cerrar"
 
@@ -282,8 +302,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "deshabilitado"
@@ -292,8 +312,8 @@ msgstr "deshabilitado"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "habilitado"
@@ -306,52 +326,38 @@ msgstr "Interfaz:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "El asistente configuró exitosamente los servicios DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Falló"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Vuelva a lanzar drakwizard, e intente cambiar algunos parámetros."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Debe volver a ajustar su nombre de host."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Debe volver a ajustar su nombre de dominio. Para un servidor DNS necesita un "
-"nombre de dominio correcto, distinto a 'localdomain' o vacío. Lance "
-"drakconnect para ajustarlo."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Servidor DNS maestro"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Servidor DNS esclavo"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Añadir host en DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Quitar host en DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -359,11 +365,11 @@ msgstr ""
 "DNS (Servidor de Nombres de Dominio) es el servicio que hace corresponder "
 "una máquina con un nombre de host de Internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Asistente de configuración DNS maestro"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -373,44 +379,44 @@ msgstr ""
 "Esta configuración brindará un servicio de DNS local para los nombres de las "
 "computadoras locales, reenviando los pedidos no locales a un DNS externo."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Qué desea hacer:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "Interfaz de servidor DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(no necesita añadir el dominio luego del nombre)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "Nombre de dominio DNS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Elija, en la lista siguiente, el host que desea quitar."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Quitar un host en una configuración DNS existente."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Quitar host:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Nómbre de computadora:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -420,11 +426,11 @@ msgstr ""
 "nombres primario, y también funcionará como un respaldo, en caso que su "
 "servidor maestro no se pueda acceder."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Dirección IP para el servidor DNS maestro:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -432,11 +438,11 @@ msgstr ""
 "El reenvío sólo ocurre para aquellas consultas para las cuales el servidor "
 "no es autoritativo y no tiene la respuesta en su cache."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP de su reenviador"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -444,15 +450,15 @@ msgstr ""
 "Por lo que si lo necesita y conoce la IP de su reenviador, ingrese la misma, "
 "si no la conoce, déjela vacía."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS externo:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Añadir dominio de búsqueda"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -460,7 +466,7 @@ msgstr ""
 "Se añade automáticamente el nombre de dominio de este servidor, y no "
 "necesita añadirlo aquí."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -472,29 +478,29 @@ msgstr ""
 "sólo contiene el nombre de dominio local. Esto se puede cambiar listando la "
 "rúta de búsqueda del dominio deseado luego de la palabra clave 'search'"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Nombre de dominio predet. a buscar:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Esta no es una dirección IP válida para su reenviador... presione siguiente "
 "para continuar"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Esta no es una dirección IP válida para el DNS Maestro... presione siguiente "
 "para continuar"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 "Esta no es una IP dirección válida... presione siguiente para continuar"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -502,11 +508,11 @@ msgstr ""
 "Parece que ese host ya está en su configuración DNS... persione siguiente "
 "para continuar"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Error:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -514,7 +520,7 @@ msgstr ""
 "Parece que este no está presente en su configuración DNS... presione "
 "siguiente para continuar"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -522,72 +528,72 @@ msgstr ""
 "Parece que no se configuró servidor DNS con el asistente. Por favor ejecute "
 "el asistente DNS: Servidor DNS maestro."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Parece que no es un servidor DNS maestro, sino uno esclavo. Por lo tanto, no "
 "puedo añadir/quitar hosts."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Ahora el Asistente generará la configuración de su DNS esclavo"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "con esta configuración:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "El cliente con esta identificación se añadirá a su DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Nombre de computadora:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Dirección IP de computadora:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "El cliente con esta identificación se quitará de su DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "El servidor DNS está a punto de ser configurado de la manera siguiente"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Nombre de host del servidor:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Nombre de dominio:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "El asistente añadió exitosamente al host en su DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "El asistente quitó exitosamente al host del DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "El asistente configuró exitosamente el servicio DNS de su servidor."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Por favor, vuelva a lanzar drakwizard, e intente cambiar algunos parámetros."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurando su sistema como un servidor DNS maestro ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurando su sistema como un servidor DNS esclavo ..."
 
@@ -615,7 +621,7 @@ msgstr "Servidor de correo"
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Servidor Samba"
 
@@ -639,7 +645,7 @@ msgstr "Servidor NIS + Autofs"
 msgid "Mandrakelinux Install server"
 msgstr "Servidor de instalación Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -664,7 +670,7 @@ msgstr ""
 "%s no está instalado\n"
 "Pulse sobre «Siguiente» para instalarlo o sobre «Cancelar» para salir"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Falló la instalación"
 
@@ -909,15 +915,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Asistente de configuración de Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Debe volver a ajustar su nombre de dominio. no igual a 'localdomain' o "
-"'none'. Por favor, lance drakconnect para ajustarlo."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -930,7 +928,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:59
+#: ../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 "
@@ -940,39 +938,39 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Bienvenido al asistente de configuración del servidor Groupware Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Ingrese contraseña para la cuenta administrador del servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Contraseña (de nuevo):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Nombre de host:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Dominio de correo:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -980,45 +978,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instalación en progreso"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Instalando servidor Kolab en su sistema..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando servidor Kolab en su sistema..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Asistente de Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Debe volver a ajustar su nombre de dominio. Para un servidor LDAP necesita "
-"un nombre de dominio correcto, distinto a 'localdomain' o vacío. Lance "
-"drakconnect para ajustarlo."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Mostrar la configuración Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Añadir usuario en servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Borrar la configuración Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1026,194 +1014,192 @@ msgstr ""
 "Es un protocolo sencillo para acceder a servicios de directorio, "
 "específicamente, servicios de directorio basados en X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP son las siglas de \"Lightweight Directory Access Protocol\"."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Asistente de configuración Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Debe primero configurar un servidor Ldap."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Su elección:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Borrar la configuración"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Guardando base existente en /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Añadiendo usuario LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Usuario creado en: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Usuario creado en: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Nombre:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Nombre de usuario:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Debe ingresar un nombre válido."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Debe ingresar un apellido válido."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Debe ingresar un nombre de usuario válido."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Contraseña de usuario LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "las contraseñas no coinciden"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Contraseña (de nuevo):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Debe ingresar una contraseña para LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "El administrador es un usuario especial con permisos de acceso a la base de "
 "datos LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrador,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Configurando servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Nombre de dominio: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Nombre de dominio: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Administrador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Árbol de directorios de LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 "La asignación de nombres DNS se usa para la definición del árbol de "
 "directorios LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Árbol de directorios LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Administrador LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Contraseña LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Contraseña LDAP (de nuevo):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Debe ingresar un árbol de directorios.LDAP válido"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Confirmación del usuario a crear"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Nombre:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Nombre de usuario:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Crear en:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Confirmación de la información para crear el servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Contenedor de usuarios:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "El asistente configuró LDAP exitosamente."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Usuario añadido con éxito"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Error al añadir usuario en servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Servidor ya configurado"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Su servidor Ldap ya ha sido configurado"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s falló"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "¡Error!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Imposible conectarse a %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Asistente de Noticias"
@@ -1356,13 +1342,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directorio:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "La ruta que ingresó no existe."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Control de acceso"
 
@@ -1417,30 +1403,22 @@ msgstr "Máscara de red:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "El asistente configuró exitosamente su servidor NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Debe volver a ajustar su nombre de dominio NIS. Para un servidor NIS "
-"necesita un nombre de dominio NIS correcto, distinto a 'localdomain' o vacío."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Servidor NIS + Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Configurar un servidor NIS con mapeo autofs, y archivos auto.home y auto."
 "master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1448,28 +1426,28 @@ msgstr ""
 "Los clientes pueden montar automáticamente sus directorios personales cuando "
 "se conectan en una red de computadoras cliente NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "¿Qué desea hacer?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Configurar la computadora como cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Sólo tiene que poner nisdomain y nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Servidor NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Dominio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1480,7 +1458,7 @@ msgstr ""
 "el usuario NIS monte automáticamente su directorio personal en una "
 "computadora NIS cliente."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1488,42 +1466,42 @@ msgstr ""
 "Home NIS: directorio personal para los usuarios en el servidor NIS. Este "
 "directorio se exportará a través de un servidor NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Dominio NIS: dominio NIS a usar (por lo general, el mismo que su dominio "
 "DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Servidor NIS: nombre de su computadora."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Nombre de dominio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "El asistente configurará su servidor NIS con mapeo autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Directorio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nombre de dominio NIS: nombre del dominio NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Servidor NIS: Nombre de host del servidor NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1531,39 +1509,39 @@ msgstr ""
 "El demonio YPBIND encuentra el servidor para los dominios NIS y mantiene la "
 "información de enlace del demonio NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Error, debería ser un directorio."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Error, nombre de dominio NIS no debería ser 'localdomain' o 'none'"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Por favor ajústelo."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "El asistente configuró exitosamente su máquina para ser un cliente NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 "El asistente configuró exitosamente su máquina para NIS con mapeo autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Configurando su sistema para ser un servidor NIS+Autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "Servidor NIS + Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Configurando su sistema como Cliente NIS..."
 
@@ -1935,7 +1913,7 @@ msgstr ""
 "su proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1967,6 +1945,14 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Asistente 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."
+msgstr ""
+"Debe volver a ajustar su nombre de dominio. no igual a 'localdomain' o "
+"'none'. Por favor, lance drakconnect para ajustarlo."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Configurar un servidor PXE"
@@ -2333,24 +2319,24 @@ msgstr "Configurando servidor PXE en su sistema..."
 msgid "PXE server"
 msgstr "Servidor PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Asistente de Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s no existe."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Todo - sin restricción de acceso"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mis reglas - Preguntarme los hosts permitidos y negados"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2358,37 +2344,37 @@ msgstr ""
 "Samba permite que su servidor se comporte como un servidor de archivos e "
 "impresoras para las estaciones de trabajo que no corren sistemas Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Asistente de configuración de Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Este asistente lo ayudará a configurar los servicios Samba de su servidor."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba necesita saber el Grupo de Trabajo Windows al que va a servir."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grupo de trabajo"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grupo de trabajo:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "El Grupo de trabajo es incorrecto"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Cartel del servidor."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2396,19 +2382,19 @@ msgstr ""
 "El cartel es la forma en la que se describirá este servidor en sus "
 "estaciones de trabajo Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Cartel:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "El Cartel del Servidor es incorrecto"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2416,7 +2402,7 @@ msgstr ""
 "* Ejemplo 1: permitir todas las IP en 150.203.*.*; excepto una\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2424,7 +2410,7 @@ msgstr ""
 "* Ejemplo 2: permitir a los hosts que coincidan con la red/máscara dadas\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2432,7 +2418,7 @@ msgstr ""
 "* Ejemplo 3: permitir algunos hosts\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2444,24 +2430,24 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirata"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Note que el acceso todavía necesita contraseñas adecuadas a nivel de usuario."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Hosts permitidos:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Negar hosts:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Servicios Samba habilitados"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2471,19 +2457,19 @@ msgstr ""
 "de trabajo Windows, y también puede compartir las impresoras conectadas a su "
 "servidor."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Habilitar el área para compartir archivos"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Habilitar el compartir impresoras del servidor"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Hacer que los directorios personales estén disponibles para sus dueños"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2492,28 +2478,28 @@ msgstr ""
 "personales por medio de Samba que Usted/ellos deben usuar smbpasswd para "
 "configurar una contraseña."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Directorio compartido:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Teclee la ruta del directorio que desea que se comparta."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Crear directorio compartido, si no existe"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "No se pudo crear directorio."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permisos de archivo"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2523,61 +2509,61 @@ msgstr ""
 "precederse por una '@', por ejemplo:\n"
 "root, fred, @usuarios, @wheel para cada tipo de permiso."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "lista de lectura:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "lista de escritura:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Seleccione las impresoras de los usuarios conocidos a las que desea acceder"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Habilitar todas las impresoras"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Configurando Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "El asistente recolectó los parámetros siguientes para configurar Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Cartel del servidor:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Compartir archivos:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Servidor de Impresión:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Personal:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Impresoras:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "El asistente configuró exitosamente su servidor Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Configurando su servidor Samba..."
 
@@ -2821,3 +2807,26 @@ msgstr "Servidor Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando su sistema como un servidor Apache ..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Debe volver a ajustar su nombre de host."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Debe volver a ajustar su nombre de dominio. Para un servidor LDAP "
+#~ "necesita un nombre de dominio correcto, distinto a 'localdomain' o vacío. "
+#~ "Lance drakconnect para ajustarlo."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Imposible conectarse a %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Debe volver a ajustar su nombre de dominio NIS. Para un servidor NIS "
+#~ "necesita un nombre de dominio NIS correcto, distinto a 'localdomain' o "
+#~ "vacío."
diff --git a/po/et.po b/po/et.po
index 930906cc..3f55b67b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-05 15:48+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -21,31 +21,31 @@ msgstr "seadistuste nõustaja"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Hoiatus."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Viga."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Õnnitlused"
 
@@ -87,18 +87,18 @@ msgstr "See nõustaja aitab Teil lisada uue kliendi kohalikule DNS-ile."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(nime järele pole vaja kirjutada domeeni)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Kliendi andmed:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Pange tähele, et IP aadress ja kliendinimi peavad olema võrgus unikaalsed."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -108,33 +108,33 @@ msgstr ""
 "arvutil peab võrgus olema (unikaalne) IP aadress, mis tavaliselt esitatakse "
 "punktidega eraldatud kujul."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Arvuti nimi:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Arvuti IP aadress:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Hoiatus"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Viga"
@@ -178,12 +178,34 @@ msgstr "Kliendi IP:"
 msgid "The wizard successfully added the client."
 msgstr "Nõustaja lisas edukalt kliendi."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Teil tuleb täpsustada domeeninime. Nimeserveril peab olema korrektne "
+"domeeninimi, mitte localdomain või üldse puuduma. Masinanimi peab olema FQDN "
+"ehk täielikult kvalifitseeritud domeeninimi. Käivitage täpsustamiseks "
+"Drakconnect."
+
+#: ../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."
+msgstr ""
+"Teil tuleb täpsustada domeeninime. Nimeserveril peab olema korrektne "
+"domeeninimi, mitte localdomain või üldse puuduma. Masinanimi peab olema FQDN "
+"ehk täielikult kvalifitseeritud domeeninimi. Käivitage täpsustamiseks "
+"Drakconnect."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Käsk töötab veel. Kas soovite selle tappa ja nõustajast väljuda?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Sulge"
 
@@ -273,8 +295,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "keelatud"
@@ -283,8 +305,8 @@ msgstr "keelatud"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "lubatud"
@@ -297,53 +319,38 @@ msgstr "Liides:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Nõustaja seadistas edukalt DHCP teenused."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Ebaõnnestus"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Teil tuleb täpsustada masinanime."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Teil tuleb täpsustada domeeninime. Nimeserveril peab olema korrektne "
-"domeeninimi, mitte localdomain või üldse puuduma. Masinanimi peab olema FQDN "
-"ehk täielikult kvalifitseeritud domeeninimi. Käivitage täpsustamiseks "
-"Drakconnect."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Esmane nimeserver"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Teisene nimeserver"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Masina lisamine DNS-ile"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Masina eemaldamine DNS-ist"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -351,11 +358,11 @@ msgstr ""
 "DNS (DomeeniNime Server ehk lihtsalt nimeserver) on teenus, mis määrab "
 "vastavuse arvuti ning Interneti masinanime vahel."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Esmase DNS seadistamise nõustaja"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -365,44 +372,44 @@ msgstr ""
 "tagatakse kohalikus võrgus aadresside korrektne lahendamine, suunates samas "
 "kõik muud nimepäringud väljaspool asuvale nimeserverile."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Mida soovite ette võtta:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "DNS serveri liides"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(nime järele pole vaja kirjutada domeeni)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Server:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "DNS domeeninimi:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Valige nimekirjast masin, mida soovite eemaldada."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Masina eemaldamine olemasolevast DNS seadistusest."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Eemaldatav masin:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Arvuti nimi:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -411,11 +418,11 @@ msgstr ""
 "Teisene nimeserver võtab veidi koormust vähemaks esmaselt nimeserverilt ja "
 "on ka varuserveri eest, kui esmane nimeserver ei peaks olema kättesaadav."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Esmase nimeserveri IP aadress:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -423,11 +430,11 @@ msgstr ""
 "Edastatakse ainult sellised päringud, mille suhtes server ei ole kompetentne "
 "ja millele puuduvad puhvris vastused."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Teie edastusserveri IP"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -435,22 +442,22 @@ msgstr ""
 "Kui Teil seda vaja läheb ja Te teate oma edastusserveri IP aadressi, "
 "kirjutage see siia, muidu jätke tühjaks"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Väline DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Otsingudomeeni lisamine"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 "Selle serveri domeeninimi lisatakse automaatselt, seda ei ole vaja siin anda."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -461,29 +468,29 @@ msgstr ""
 "domeeninime põhjal ja vaikimisi sisaldab ainult kohalikku domeeninime. Seda "
 "saab muuta, kui anda soovitud domeeninime otsingutee koos otsingu võtmesõnaga"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Vaikimisi otsitav domeeninimi:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "See ei ole edastusserverile korrektne IP aadress... vajutage jätkamiseks "
 "nupule 'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "See ei ole esmase DNS korrektne IP aadress... vajutage jätkamiseks nupule "
 "'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 "See ei ole korrektne IP aadress... vajutage jätkamiseks nupule 'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -491,11 +498,11 @@ msgstr ""
 "Paistab, et see masin on juba DNS seadistuses... vajutage jätkamiseks nupule "
 "'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Viga:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -503,7 +510,7 @@ msgstr ""
 "Paistab, et seda masinat DNS seadistuses ei ole... vajutage jätkamiseks "
 "nupule 'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -511,71 +518,71 @@ msgstr ""
 "Paistab, et nõustaja abil ei ole seadistatud ühtki nimeserverit. Palun "
 "käivitage DNS nõustaja: esmane nimeserver."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Paistab, et Teil ei ole esmane nimeserver, seepärast ei saa ka masinat "
 "lisada/eemaldada."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Nõustaja tekitab nüüd Teie teisese DNS seadistuse"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "seadistusega:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Teie DNS-ile lisatakse selline klient"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Arvuti nimi:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Arvuti IP aadress:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Teie DNS-ist eemaldatakse selline klient"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Nimeserver seadistatakse järgmise seadistusega"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Serveri nimi:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domeeninimi:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Nõustaja lisas edukalt DNS-ile masina."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Nõustaja eemaldas edukalt masina DNS-ist."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Nõustaja seadistas edukalt Teie serveri DNS teenused."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Käivitage drakwizard uuesti ja proovige parameetreid muuta."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Süsteemi seadistamine esmaseks nimeserveriks..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Süsteemi seadistamine teiseseks nimeserveriks..."
 
@@ -603,7 +610,7 @@ msgstr "Meiliserver"
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba server"
 
@@ -627,7 +634,7 @@ msgstr "NIS server Autofs tabeliga"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinuxi paigaldusserver"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolabi server"
 
@@ -653,7 +660,7 @@ msgstr ""
 "Klõpsake paigaldamiseks nupule \"Järgmine\" või \"Loobu\", kui soovite "
 "loobuda"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
@@ -887,15 +894,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolabi seadistamise nõustaja"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Teil tuleb täpsustada domeeninime, mis peab olema korrektne domeeninimi, "
-"mitte localdomain või üldse puuduma. Käivitage täpsutamiseks Drakconnect."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -907,7 +906,7 @@ msgstr ""
 "kasutajatele kui kontaktidele ning nii POP3 kui IMAP4 (rev1) kirjade "
 "vastuvõtmiseks"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -917,39 +916,39 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth). Nõustaja teeb Teie nende teenuste "
 "varasematest konfiguratsioonifailidest varukoopia."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Tere tulemast kasutama Kolabi grupitöö serveri seadistamise nõustajat."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Sisestage Kolabi serveri haldurikonto parool."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Parool teist korda:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Masina nimi:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "E-posti domeen:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -958,46 +957,35 @@ msgstr ""
 "(manager) aadressil https://127.0.0.1/kolab/admin/, kasutades äsja "
 "sisestatud parooli."
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Paigaldamine..."
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Kolabi serveri paigaldamine Teie süsteemi..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Teie süsteemi seadistamine Kolabi serveriks..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap nõustaja"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Teil tuleb täpsustada domeeninime. Nimeserveril peab olema korrektne "
-"domeeninimi, mitte localdomain või üldse puuduma. Masinanimi peab olema FQDN "
-"ehk täielikult kvalifitseeritud domeeninimi. Käivitage täpsustamiseks "
-"Drakconnect."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Ldap seadistuste näitamine"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Kasutaja lisamine Ldap serverile"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Ldap seadistuste kustutamine"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1005,193 +993,191 @@ msgstr ""
 "See on lihtne protokoll kataloogiteenuste, eriti just X.500 "
 "kataloogiteenuste kasutamiseks."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP tähendab lihtsustatud kataloogisirvimise protokoll (Lightweight "
 "Directory Access Protocol)."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Ldap seadistuste nõustaja"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Kõigepealt tuleb Ldap server seadistada."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Teie valik:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Seadistuse kustutamine"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Olemasoleva baasi salvestamine failina /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP kasutaja lisamine"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Kasutaja loomine asukohta: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Kasutaja loomine asukohta: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Eesnimi:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Anda tuleb kehtiv eesnimi."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Anda tuleb kehtiv nimi."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Anda tuleb kehtiv kasutajatunnus."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP kasutaja parool"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "paroolid peavad klappima"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Parool teist korda:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "LDAP vajab parooli andmist."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Paroolid ei klapi"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administraator"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Administraatoril on õigus anda ja võtta LDAP andmebaasi kasutamise õigust"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administraator,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "LDAP serveri seadistamine"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Domeeninimi:"
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Domeeninimi:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP administraator"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP kataloogipuu"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "LDAP kataloogipuu määratluses kasutatakse nimelahendust (DNS)"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP kataloogipuu:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP administraator:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP parool:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP parool teist korda:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Anda tuleb kehtiv LDAP kataloogipuu."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Kasutaja loomise kinnitus"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Eesnimi:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Kasutajatunnus:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Luuakse asukohta:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "LDAP serveri loomise kinnitus"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Kasutajate konteiner:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Nõustaja seadistas edukalt Teie LDAP serveri."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Kasutaja edukalt lisatud"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Viga kasutaja lisamisel Ldap andmebaasi"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Server on juba seadistatud"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Te olete juba seadistanud oma Ldap serveri"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s ebaõnnestus"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Viga!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Ühendus %s-ga ebaõnnestus"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Uudistegruppide nõustaja"
@@ -1328,13 +1314,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Kataloog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Sisestatud asukohta ei ole olemas."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Ligipääsu kontroll"
 
@@ -1387,30 +1373,22 @@ msgstr "Võrgumask: "
 msgid "The wizard successfully configured your NFS server."
 msgstr "Nõustaja seadistas edukalt Teie NFS serveri."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Teil tuleb täpsustada NIS domeeni nime. NIS serveril peab olema korrektne "
-"NIS domeeni nimi, mitte localdomain või üldse puuduma."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS server Autofs tabeliga"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "NIS serveri seadistamine Autofs tabeliga ja failidega auto.home ning auto."
 "master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1418,28 +1396,28 @@ msgstr ""
 "Kasutaja saab automaatselt haakida oma kodukataloogi, kui logib sisse NIS "
 "klientarvuti võrku."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Mida soovite ette võtta?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Süsteemi seadistamine NIS kliendiks"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Tuleb ainult anda NIS domeen ja server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS domeen:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1449,7 +1427,7 @@ msgstr ""
 "Nõustaja loob ka autofs tabeli, mis pakub NIS kasutajale võimaluse "
 "automaatselt haakida oma kodukataloog NIS klientarvutil."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1457,40 +1435,40 @@ msgstr ""
 "NIS kodukataloog: NIS serveri kasutajate kodukataloog. See kataloog "
 "eksporditakse üle NFS serveri."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "NIS domeen: Teie NIS serveri NIS domeen."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS server: Teie arvuti nimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS kodukataloog:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS domeeninimi:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Nõustaja seadistab Teie NIS serveri Autofs tabeliga"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS kataloog:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domeeninimi: NIS domeeni nimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS server: NIS serveri masinanimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1498,38 +1476,38 @@ msgstr ""
 "YPBIND deemon otsib NIS domeenidele serveri ja hooldab NIS serverite "
 "sidumise infot."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Viga: peab olema kataloog"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 "Viga: NIS domeen peab olema korrektne (mitte puuduma või kohalik domeen)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Palun parandage viga."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Nõustaja seadistas edukalt Teie masina NIS kliendiks."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Nõustaja seadistas edukalt Teie masina NIS serveriks Autofs tabeliga."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Süsteemi seadistamine NIS serveriks Autofs tabeliga..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS Autofs tabeliga"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Süsteemi seadistamine NIS kliendiks..."
 
@@ -1894,7 +1872,7 @@ msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja vahendaja seadistamiseks:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1926,6 +1904,14 @@ msgstr "Squid vahendaja"
 msgid "PXE Wizard"
 msgstr "PXE nõustaja"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Teil tuleb täpsustada domeeninime, mis peab olema korrektne domeeninimi, "
+"mitte localdomain või üldse puuduma. Käivitage täpsutamiseks Drakconnect."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXE serveri seadistamine"
@@ -2272,24 +2258,24 @@ msgstr "Süsteemi seadistamine PXE serveriks..."
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba nõustaja"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s puudub."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Kõik - ei mingeid ligipääsupiiranguid"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Minu reeglid - küsi minu käest lubatud ja keelatud masinaid"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2297,55 +2283,55 @@ msgstr ""
 "Samba võimaldab Teie serveril toimida faili- ja trükiserverina tööjaamadele, "
 "mis ei kasuta Linuxit."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba seadistamise nõustaja"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "See nõustaja aitab seadistada Teie serveri Samba-teenused."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba peab teadma Windowsi töögruppi, mida ta teenindab."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Töögrupp"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Töögrupp:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Töögrupp on vale"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Serveri nimetus."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "Nimetus on identiteet, millena see server näitab ennast Windowsi tööjaamades."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Nimetus:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Serveri nimetus ei ole korrektne"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Ligipääsu tase:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2353,7 +2339,7 @@ msgstr ""
 "* Näide 1: kõigi IP-de lubamine aadressil 150.203.*.*, välja arvatud üks\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2361,7 +2347,7 @@ msgstr ""
 "* Näide 2: masinate lubamine, mis vastavad antud võrgule/võrgumaskile\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2369,7 +2355,7 @@ msgstr ""
 "* Näide 3: kahe kasutaja lubamine\n"
 "hosts allow = laplane, tuhajuss"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2381,23 +2367,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Märkus: ligipääs nõuab siiski sobivat kasutaja parooli."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Lubatud masinad:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Keelatud masinad:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Samba-teenused on lubatud"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2406,19 +2392,19 @@ msgstr ""
 "Samba võib pakkuda Teie Windows-tööjaamadele ühist failijagamisala, samuti "
 "Teie serveriga ühendatud printerite jagamist."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Failide jagamisala lubamine"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Printserveri jagamise lubamine"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Kodukataloog on kättesaadav nende omanikele"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2426,28 +2412,28 @@ msgstr ""
 "Te lubasite kasutajatele ligipääsu nende kodukataloogile, kuid Teil/neil "
 "tuleb kasutada sinna pääsemise parooli määramiseks smbpasswordi."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Jagatud kataloog:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Sisestage kataloogi asukoht, mida soovite jagada."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Jagatud kataloogi loomine, kui seda veel pole"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Kataloogi loomine ebaõnnestus."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Faili õigused"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2457,59 +2443,59 @@ msgstr ""
 "'@'), näiteks:\n"
 "root, fred, @users, @wheel igat liiki õiguse jaoks."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "lugemisõigusega:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "kirjutamisõigusega:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Valige, millised printerid on tuntud kasutajatele kättesaadavad"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Kõigi printerite lubamine"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Samba seadistamine"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Nõustaja kogus järgmised andmed, mida on vaja Samba seadistamiseks."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Serveri nimetus:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Failijagamine:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Printserver:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Kodukataloog:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Printerid:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Nõustaja seadistas edukalt Teie Samba-serveri."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Samba serveri seadistamine..."
 
@@ -2750,6 +2736,29 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Süsteemi seadistamine Apache serveriks..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Teil tuleb täpsustada masinanime."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Teil tuleb täpsustada domeeninime. Nimeserveril peab olema korrektne "
+#~ "domeeninimi, mitte localdomain või üldse puuduma. Masinanimi peab olema "
+#~ "FQDN ehk täielikult kvalifitseeritud domeeninimi. Käivitage "
+#~ "täpsustamiseks Drakconnect."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Ühendus %s-ga ebaõnnestus"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Teil tuleb täpsustada NIS domeeni nime. NIS serveril peab olema korrektne "
+#~ "NIS domeeni nimi, mitte localdomain või üldse puuduma."
+
 #~ msgid "Organisation LDAP:"
 #~ msgstr "LDAP organisatsioon:"
 
diff --git a/po/eu.po b/po/eu.po
index a97ab0c3..7d1fe117 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:34+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-05 23:24+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -26,31 +26,31 @@ msgstr "konfigurazio morroia"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Abisua."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Errorea."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Zorionak"
 
@@ -90,11 +90,11 @@ msgstr "Morroi honek DNS lokalean bezero berria gehitzen lagunduko dizu."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(ez duzu izenaren ondoren domeinua idatzi behar)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Bezeroaren identifikazioa:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -102,7 +102,7 @@ msgstr ""
 "Kontuan izan emandako IP helbideak eta bezero-izenak sarean esklusiboak izan "
 "behar dutela."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,21 +112,21 @@ msgstr ""
 "bezala. Sareko makina guztiek IP helbide bakarra izango dute, puntuzko ohiko "
 "sintaxian."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Makinaren izena:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Makinaren IP helbidea:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Abisua"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "dhcp erabiltzen ari zara, baliteke zerbitzariak zure konfigurazioarekin ez "
@@ -135,12 +135,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Errorea"
@@ -184,13 +184,35 @@ msgstr "Bezeroaren IPa:"
 msgid "The wizard successfully added the client."
 msgstr "Morroiak behar bezala gehitu du bezeroa."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Domeinu-izena berregokitu behar duzu. DNS zerbitzarirako domeinu-izen egokia "
+"behar duzu, ezin da localdomain edo hutsa izan. Ostalari-izena FQDN izan "
+"behar da: Fully Qualified Domain Name/Erabat Kualifikatutako Domeinu Izena. "
+"Abiarazi drakconnect berau egokitzeko."
+
+#: ../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."
+msgstr ""
+"Domeinu-izena berregokitu behar duzu. DNS zerbitzarirako domeinu-izen egokia "
+"behar duzu, ezin da localdomain edo hutsa izan. Ostalari-izena FQDN izan "
+"behar da: Fully Qualified Domain Name/Erabat Kualifikatutako Domeinu Izena. "
+"Abiarazi drakconnect berau egokitzeko."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "Komandoa martxan da oraindik. Berau akabatu eta Morroitik irten nahi duzu?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Itxi"
 
@@ -283,8 +305,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "desgaituta"
@@ -293,8 +315,8 @@ msgstr "desgaituta"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "gaituta"
@@ -307,53 +329,38 @@ msgstr "Interfazea:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Morroiak behar bezala konfiguratu ditu DHCP zerbitzuak."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Huts egin du"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Berrabiarazi drakwizard, eta saiatu parametro batzuk aldatzen."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Ostalari-izena aldatu behar duzu."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Domeinu-izena berregokitu behar duzu. DNS zerbitzarirako domeinu-izen egokia "
-"behar duzu, ezin da localdomain edo hutsa izan. Ostalari-izena FQDN izan "
-"behar da: Fully Qualified Domain Name/Erabat Kualifikatutako Domeinu Izena. "
-"Abiarazi drakconnect berau egokitzeko."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "DNS zerbitzari maisua"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Mendeko DNS zerbitzaria"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Gehitu ostalaria DNSan"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Kendu ostalaria DNStik"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -361,11 +368,11 @@ msgstr ""
 "DNS (Domeinu-izenen zerbitzaria) IP helbidea Interneteko ostalari-izenarekin "
 "bat egiten duen zerbitzua da."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "DNS konfigurazio-morroi maisua"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -375,44 +382,44 @@ msgstr ""
 "Konfigurazio honek DNS zerbitzu lokala emango du ordenagailu-izen "
 "lokalentzat, kanpoko DNS bati eskaera lokalik egiten ez diotenei."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Zer egin nahi duzu:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "DNS zerbitzariaren Interfazea"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(ez duzu izenaren ondoren domeinua idatzi behar)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "DNS domeinu izena:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Aukeratu ondorengo zerrendatik kendu nahi duzun ostalaria."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Kendu ostalari bat lehendik dagoen DNS konfiguraziotik."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Kendu ostalaria:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Ordenagailu-izena:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -422,11 +429,11 @@ msgstr ""
 "hartuko ditu, eta babeskopien zerbitzari gisa ere arituko da, zerbitzari "
 "maisua ezin bada atzitu."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "DNS zerbitzari masterraren IP helbidea:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -434,11 +441,11 @@ msgstr ""
 "Birbidaltzea kontsulta hauetan bakarrik gertatzen da: zerbitzaria "
 "autoritarioa ez denean eta erantzunak bere cachean ez dituenean."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Zure bidaltzailearen IPa "
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -446,15 +453,15 @@ msgstr ""
 "IP bidaltzailea behar baduzu eta ezagutzen baduzu, sartu bere IP helbidea, "
 "ez badakizu, hutsik utzi"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Kanpoko DNSa:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Gehitu bilaketa-domeinua"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -462,7 +469,7 @@ msgstr ""
 "Zerbitzari honen domeinu-izena automatikoki gehitzen da, eta ez duzu "
 "hemengehitu behar."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -474,28 +481,28 @@ msgstr ""
 "bakarrikdauka. Hori nahi duzun domeinuaren bilaketarako bide-izena "
 "zerrendatuz alda daiteke, bilaketaren gako-hitzari jarraituz"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Bilatu beharreko domeinu-izen lehenetsia:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Zure bidaltzailearen IP helbide hau ez da baliozkoa... sakatu 'Hurrengoa' "
 "jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "DNS maisuaren IP helbide hau ez da baliozkoa... sakatu 'Hurrengoa' "
 "jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "IP helbide hau ez da baliozkoa... sakatu 'Hurrengoa' jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -503,11 +510,11 @@ msgstr ""
 "Ostalaria dagoeneko zure DNS konfigurazioan dagoela dirudi... sakatu "
 "'Hurrengoa' jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Errorea:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -515,7 +522,7 @@ msgstr ""
 "Hori zure DNS konfigurazioan ez dagoela dirudi... sakatu 'Hurrengoa' "
 "jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -523,71 +530,71 @@ msgstr ""
 "Morroiaren bidez DNS zerbitzaririk ez dela ezarri dirudi. Exekutatu morroia: "
 "DNS zerbitzari maisua."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "DNS zerbitzari maisua ez zarela dirudi, beraz, ezin dut ostalaririk gehitu/"
 "kendu."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Morroiak ez du zure mendeko DNSaren konfigurazioa osatuko"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "konfigurazio honekin:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Identifikazio hau duen bezeroa zure DNSari gehituko zaio"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Ordenagailu-izena:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Ordenagailuaren IP helbidea:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Identifikazio hau duen bezeroa zure DNStik kenduko da"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS zerbitzaria konfigurazio honekin konfiguratzera doa"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Zerbitzariaren ostalari-izena:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domeinu-izena:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Morroiak behar bezala gehitu du ostalaria zure DNSan."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Morroiak behar bezala kendu du ostalaria zure DNStik. "
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Morroiak behar bezala konfiguratu du zure zerbitzariko DNS zerbitzua. "
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Berrabiarazi drakwizard, eta saiatu parametro batzuk aldatzen."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Sistema DNS zerbitzari maisu gisa konfiguratzen..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Sistema mendeko DNS zerbitzari gisa konfiguratzen..."
 
@@ -615,7 +622,7 @@ msgstr "Posta-zerbitzaria"
 msgid "FTP server"
 msgstr "FTP zerbitzaria"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba zerbitzaria"
 
@@ -639,7 +646,7 @@ msgstr "NIS zerbitzariaren autofs mapa"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux Instalazio Zerbitzaria"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab zerbitzaria "
 
@@ -664,7 +671,7 @@ msgstr ""
 "%s ez dago instalatuta\n"
 "Sakatu \"Hurrengoa\" instalatzeko, edo \"Utzi\" irteteko"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalazioak huts egin du"
 
@@ -915,15 +922,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab konfigurazio-morroia"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Domeinu-izena aldatu behar duzu, ez da izango domeinu lokala edo hutsa. "
-"Abiarazi drakconnect izena aldatzeko."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -935,7 +934,7 @@ msgstr ""
 "helbide-liburu partekatua, postontziko erabiltzaileentzako zerbitzuarekin "
 "eta kontaktuekin, eta postarako POP3 eta IMAP4(rev1) sarbideak"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -945,39 +944,39 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Morroiak aurreko konfigurazio-"
 "fitxategi guztien babeskopia egingo du zerbitzu horientzat."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Ongi etorri Kolab talde-lanerako zerbitzaria konfiguratzeko morroira."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Sartu Kolab zerbitzariaren kudeatzaile-kontuaren pasahitza."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Pasahitza ez dator bat edo nulua da, zuzendu."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Pasahitza berriro:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Morroiak Kolab zerbitzaria parametro hauekin konfiguratuko du orain"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Ostalari-izena:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Postaren domeinua:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -986,46 +985,35 @@ msgstr ""
 "saioa 'kudeatzaile' gisa helbide honetan sartutako pasahitzarekin: "
 "https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instalatzen ari da"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Kolab zerbitzaria sisteman instalatzen..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab zerbitzaria sisteman konfiguratzen..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldapren morroia"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Domeinu-izena berregokitu behar duzu. LDAP zerbitzarirako domeinu-izen "
-"egokia behar duzu, ezin da localdomain edo hutsa izan. Ostalari-izena FQDN "
-"izan behar da: Fully Qualified Domain Name/Erabat Kualifikatutako Domeinu "
-"Izena. Abiarazi drakconnect berau egokitzeko."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Erakutsi Ldap konfigurazioa"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Erantsi erabiltzailea Ldap zerbitzarian"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Ezabatu Ldap konfigurazioa"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1033,194 +1021,192 @@ msgstr ""
 "Direktorio zerbitzuetara sartzeko protokolo arina da, zehazki X.500-"
 "oirarridun direktorio zerbitzuak."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP esanahia Lightweight Directory Access Protocol / Direktorioetan "
 "Sartzeko Protokolo Arina da."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Ldap konfigurazio morroia"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Ldap zerbitzari bat ezarri behar duzu aurrena."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Zure aukera:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Konfigurazioa ezabatu"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Gorde existitzen den oinarria /root/ldap-sav.ldiff-en"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP Erabiltzailea Eransketa"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Erabiltzailea hemen sortuta: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Erabiltzailea hemen sortuta: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Izena:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Erabiltzaile Sarrera:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Izen balioduna sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Izen balioduna sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Erabiltzaile Izen balioduna sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDA Erabiltzaile Pasahitza"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "Pasahitzak bat etorri behar dute"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Pasahitza (berriro):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "LDAPentzako pasahitza sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Pasahitzak ez datoz bat"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administratzailea"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Administratzailea erabiltzaile indartsua da LDAP datubasean eskubideak "
 "emateko gaitasuna duena"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administratzailea,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "LDAP Zerbitzaria Konfiguratzen"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Domeinu izena: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Domeinu izena: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP Administratzailea"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP direktorio zuhaitza"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS izendaketa erabiltzen da LDAP direktorio zuhaitzaren definiziorako"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP direktorio zuhaitza:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP Administratzailea:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP Pasahitza:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP Pasahitza (berriro):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "LDAP direktorio zuhaitz balioduna sartu behar duzu."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Sortu beharreko erabiltzailearen onespena"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Izena:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Sortu hemen:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "LDAP zerbitzaria sortzeko Baieztapen Informazioa"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Erabiltzaileen edukiontzia:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Morroiak behar bezala konfiguratu du LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Erabiltzailea arrakastaz erantsia"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Akatsa Ldap zerbitzariaren datubasean erabiltzailea eranstean"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Zerbitzaria dagoeneko konfiguratuta"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Dagoeneko konfiguratu duzu zure Ldap Zerbitzaria"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s-k huts egin du"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Akatsa!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Ezin da %s-ra konektatu"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Berrien morroia"
@@ -1362,13 +1348,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorioa:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Zuk sartutako bide-izena ez dago."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Sarbide-kontrola"
 
@@ -1422,30 +1408,22 @@ msgstr "Sare-maskara:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Morroiak behar bezala konfiguratu du zure NFS zerbitzaria."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"NIS domeinu-izena aldatu behar duzu. NIS zerbitzarirako domeinu-izen egokia "
-"behar duzu, ez da izango domeinu lokala edo hutsa."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS zerbitzaria autofs maparekin"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS bezeroa"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Instalatu NIS zerbitzaria autofs maparekin eta auto.home eta auto.master "
 "fitxategiekin. "
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1453,28 +1431,28 @@ msgstr ""
 "Erabiltzaileek beren etxeko direktorioa automatikoki munta dezakete "
 "zerbitzaritik, NIS ordenagailu-sare bezeroan saioa hastean."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Zer egin nahi duzu?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Konfiguratu ordenagailua NIS bezero gisa "
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "nis domeinua eta nis zerbitzaria jarri besterik ez duzu."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS zerbitzaria:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS domeinua:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1485,7 +1463,7 @@ msgstr ""
 "beren etxeko direktorioa NIS ordenagailu-bezeroan automatikoki muntatu ahal "
 "izateko."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1493,42 +1471,42 @@ msgstr ""
 "Etxeko NIS: etxean oinarritutako direktorioa NIS zerbitzariko "
 "erabiltzaileentzat. Direktorio hori NFS zerbitzariaren bidez esportatuko da."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS domeinua: Erabili beharreko NIS domeinua (orokorrean, zure DNS domeinu-"
 "izenaren berdina)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS zerbitzaria: zure ordenagailuaren izena."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Etxeko NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS domeinu-izena:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Morroiak zure NIS zerbitzaria autofs maparekin konfiguratuko du"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS direktorioa:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domeinu-izena: NIS domeinuaren izena."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS zerbitzaria: NIS zerbitzariaren ostalari-izena."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1536,24 +1514,24 @@ msgstr ""
 "YPBIND daemon-ak NIS domeinuentzako zerbitzaria aurkitzen du eta NISekin "
 "lotutako informazioa gordetzen du."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Errorea: direktorioa izan behar du."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Errorea: nis domeinu-izenak ezin du izan'hutsa' edo 'domeinu lokala'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Alda ezazu."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "Morroiak zure ordenagailua NIS bezeroa izateko behar bezala konfiguratu du."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1561,15 +1539,15 @@ msgstr ""
 "Morroiak zure ordenagailua autofs mapa duen NIS zerbitzaria izateko behar "
 "bezala konfiguratu du."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Zure sistema Autofs mapa duen NIS zerbitzaria izateko konfiguratzen..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS Autofs maparekin"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Zure sistema NIS bezero gisa konfiguratzen..."
 
@@ -1933,7 +1911,7 @@ msgstr ""
 "Morroiak zure proxy-a konfiguratzeko behar diren parametroak bildu ditu:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1965,6 +1943,14 @@ msgstr "Squid proxy-a"
 msgid "PXE Wizard"
 msgstr "PXE morroia"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Domeinu-izena aldatu behar duzu, ez da izango domeinu lokala edo hutsa. "
+"Abiarazi drakconnect izena aldatzeko."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Instalatu PXE zerbitzaria"
@@ -2323,24 +2309,24 @@ msgstr "PXE zerbitzaria sisteman konfiguratzen..."
 msgid "PXE server"
 msgstr "PXE zerbitzaria"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Sambaren morroia"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s ez dago."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Denak - Ez dago sarbide-mugarik"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Nire arauak - Galdetu niri onartutako eta ukatutako ostalariak"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2349,57 +2335,57 @@ msgstr ""
 "jokatzeko baimena ematen dio Linux sistemak exekutatzen ez dituzten "
 "lanpostuetarako."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba konfiguratzeko morroia"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Morroi honek zure zerbitzariko Samba zerbitzuak konfiguratzen lagunduko dizu."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 "Sambak zerbitzua Windows-eko zein lan-talderi eman behar dion jakin behar du."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Lantaldea"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Lan-taldea:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Lan-taldea okerra da"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Zerbitzariaren titularra."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "Titularra zerbitzari hau Windows-eko lanpostuetan azalduko den modua da."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Titularra:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Zerbitzariaren titularra okerra da"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Sarbide-maila:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2407,7 +2393,7 @@ msgstr ""
 "* 1. adibidea: baimendu IP guztiak 150.203n.*.*; bat izan ezik\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2416,7 +2402,7 @@ msgstr ""
 "ostalariak\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2424,7 +2410,7 @@ msgstr ""
 "* 3. adibidea: baimendu ostalari batzuk\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2436,25 +2422,25 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Kontuan izan sartzeko oraindik erabiltzailearen mailako pasahitz egokiak "
 "behar direla."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Ostalari baimenduak:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Ukatu ostalariak:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Gaitutako Samba zerbitzuak"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2464,19 +2450,19 @@ msgstr ""
 "dezake eta zure zerbitzarira konektatutako inprimagailuak ere parteka "
 "ditzake."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Gaitu fitxategiak partekatzeko area"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Gaitu zerbitzariko inprimagailuak partekatzea"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Etxeko direktorioak beren jabeentzat erabilgarri jarri"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2484,28 +2470,28 @@ msgstr ""
 "Erabiltzaileei beren etxeko direktorioetarako sarbidea baimentzea hautatu "
 "duzu Sambaren bidez, baina smbpasswd erabili behar duzu pasahitza ezartzeko."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Direktorio partekatua:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Idatzi partekatu nahi duzun direktorioaren bide-izena."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Sortu direktorio elkarbanatua dagoeneko ez badago"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Direktorio sorrerak huts egin du."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Fitxategi-baimenak"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2515,59 +2501,59 @@ msgstr ""
 "behar dute). Adibidez,:\n"
 "root, fred, @erabiltzaileak, @wheel, baimen-mota bakoitzerako."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Irakurketa-zerrenda:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @erabiltzaileak, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Idazketa-zerrenda:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Hautatu erabiltzaile ezagunen zein inprimagailu atzitu nahi dituzun"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Gaitu inprimagailu guztiak"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Samba konfiguratzen"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Morroiak parametro hauek bildu ditu Samba konfiguratzeko."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Zerbitzariaren titularra:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Fitxategi-partekatzea:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Inprimaketa-zerbitzaria:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Etxea:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Inprimagailuak:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Morroiak behar bezala konfiguratu du zure Sambaren zerbitzaria."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Samba zerbitzaria konfiguratzen..."
 
@@ -2813,3 +2799,26 @@ msgstr "Apache zerbitzaria"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Sistema Apache zerbitzari gisa konfiguratzen..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Ostalari-izena aldatu behar duzu."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Domeinu-izena berregokitu behar duzu. LDAP zerbitzarirako domeinu-izen "
+#~ "egokia behar duzu, ezin da localdomain edo hutsa izan. Ostalari-izena "
+#~ "FQDN izan behar da: Fully Qualified Domain Name/Erabat Kualifikatutako "
+#~ "Domeinu Izena. Abiarazi drakconnect berau egokitzeko."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Ezin da %s-ra konektatu"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "NIS domeinu-izena aldatu behar duzu. NIS zerbitzarirako domeinu-izen "
+#~ "egokia behar duzu, ez da izango domeinu lokala edo hutsa."
diff --git a/po/fa.po b/po/fa.po
index eebb2c9a..0ee67779 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-10-05 14:03+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -23,31 +23,31 @@ msgstr "جادوگر پیکربندی"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "هشدار."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "خطا."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "تبریک می‌گوئیم "
 
@@ -88,18 +88,18 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(نیازی نیست که دامنه را بعد از نام تایپ کنید)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "شناسائی کارگیر:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "توجه داشته باشید که نشانی آی‌پی و نام کارگیر داده شده باید در شبکه یگانه باشد."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -109,33 +109,33 @@ msgstr ""
 "شبکه یا  clientname.company.net. هر ماشینی در شبکه باید یک نشانی (یگانه) "
 "آی‌پی، به روش ترکیب نقطه‌ای داشته باشد."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "نام ماشین:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "نشانی آی‌پی ماشین:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "هشدار"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "شما در dhcp هستید, کارگزار ممکن است با پیکربندی شما کار نکند."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "خطا"
@@ -180,13 +180,33 @@ msgstr "آی‌پی کارگیر:"
 msgid "The wizard successfully added the client."
 msgstr "جادوگر با موفقیت کارگیر را اضافه کرد."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"شما نیاز به تنظیم مجدد نام دامنه خود دارید. برای یک کارگزار DNS نیاز به یک "
+"نام دامنه درست، نه دامنه‌ی محلی یا بدون نام دامنه، دارید. نام میزبان باید یک "
+"FQDN: نام دامنه کاملا تأیید شده. drakconnect رابرای سازگار کردن آن اجرا کنید."
+
+#: ../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."
+msgstr ""
+"شما نیاز به تنظیم مجدد نام دامنه خود دارید. برای یک کارگزار DNS نیاز به یک "
+"نام دامنه درست، نه دامنه‌ی محلی یا بدون نام دامنه، دارید. نام میزبان باید یک "
+"FQDN: نام دامنه کاملا تأیید شده. drakconnect رابرای سازگار کردن آن اجرا کنید."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "فرمان هنوز در حال اجراست. آیا میخواهید آن را بکشید و جادوگر را ترک کنید؟"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "بستن"
 
@@ -278,8 +298,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "از کار افتاده"
@@ -288,8 +308,8 @@ msgstr "از کار افتاده"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "بکار افتاده"
@@ -302,54 +322,40 @@ msgstr "واسط:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "جادوگر با موفقیت سرویس‌های DHCP کارگزارتان را پیکربندی کرد."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "شکست خورد"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "drakwizard را دوباره راه‌اندازی کرده و تلاش کنید بعضی از پارامترها را نغییر "
 "دهید."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "شما فقط نیاز به خواندن نام میزبان خود دارید."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"شما نیاز به تنظیم مجدد نام دامنه خود دارید. برای یک کارگزار DNS نیاز به یک "
-"نام دامنه درست، نه دامنه‌ی محلی یا بدون نام دامنه، دارید. نام میزبان باید یک "
-"FQDN: نام دامنه کاملا تأیید شده. drakconnect رابرای سازگار کردن آن اجرا کنید."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "کارگزار ارشد DNS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "کارگزار برده‌ی DNS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "افزودن میزبان در DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "برداشتن میزبان از DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -357,11 +363,11 @@ msgstr ""
 "DNS (Domain Name Server) سرویسی است که نشانی آی‌پی یک رایانه را با یک نام "
 "میزبان اینترنت مطابقت میدهد."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "جادوگر پیکربندی ارشد DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -371,47 +377,47 @@ msgstr ""
 "سرویس محلی DNS را برای نام‌های رایانه‌ها عرضه خواهد‌ کرد، تقاضاهای غیر-محلی به "
 "یک DNS خارجی فرستاده می‌شود."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "چکار می‌خواهید انجام دهید:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "کارگزار DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(نیازی نیست که دامنه را بعد از نام تایپ کنید)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "آی‌پی کارگزار:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS domainname:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "میزبانی را که می‌خواهید بردارید از لیست بدنبال آمده انتخاب کنید."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "برداشتن میزبانی از پیکربندی موجود DNS."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "برداشتن میزبان:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "نام رایانه:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -421,11 +427,11 @@ msgstr ""
 "داشت، و همچنین در صورتی که کارگزار ارشدتان در دسترس نباشد مانند کارگزار "
 "ذخیره‌ی پشتیبان عمل خواهد کرد."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "نشانی آی‌پی کارگزار ارشد DNS:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -433,11 +439,11 @@ msgstr ""
 "پیش‌فرستی فقط برای پرسش‌هایی که کارگزار آن تأیید هویتی نباشد رخ می‌دهد و پاسخی "
 "در حافظه‌ی نهانش ندارد."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "آی‌پی پیش‌فرست شما"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -445,15 +451,15 @@ msgstr ""
 "پس اگر به آن نیاز دارید و آی‌پی پیش‌فرست خود را می‌دانید نشانی آی‌پی آن را وارد "
 "کنید، اگر آن را نمی‌دانید آن را خالی بگذارید"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS بیرونی:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "افزودن دامنه‌ی جستجو"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -461,7 +467,7 @@ msgstr ""
 "نام‌دامنه‌ی این کارگزار بطور خودکار افزوده شد، و نیازی نیست آن را در اینجا "
 "اضافه کنید."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -473,26 +479,26 @@ msgstr ""
 "بوسیله‌ی فهرست کردن مسیر جستجوی دامنه‌ی خواسته شده و بدنبالش واژه‌کلید جستجو "
 "تغییر یابد"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "نام دامنه‌ی پیش‌فرض برای جستجو:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "این نشانی آی‌پی معتبری برای پیش‌فرست شما نیست... بعدی را برای ادامه فشار دهید"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "این نشانی آی‌پی معتبری برای DNS ارشد نیست... بعدی را برای ادامه فشار دهید"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "این نشانی آی‌پی معتبری نیست... بعدی را برای ادامه فشار دهید"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -500,11 +506,11 @@ msgstr ""
 "بنظر می‌رسد که آن میزبان از قبل در پیکربندی DNS شما هست...بعدی را برای ادامه "
 "فشار دهید"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "خطا:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -512,7 +518,7 @@ msgstr ""
 "بنظر می‌رسد که این در پیکربندی DNS شما حضور ندارد... بعدی را برای ادامه فشار "
 "دهید"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -520,73 +526,73 @@ msgstr ""
 "بنظر می‌رسد که هیچ کارگزار DNS از طریق جادوگر گذاشته نشده است. لطفاً جادوگر "
 "DNS را اجرا کنید: کارگزار DNS ارشد."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "بنظر می‌رسد که کارگزار DNS شما ارشد نیست، و فقط برده‌ای است. پس نمی‌توانم "
 "میزبان را افزوده یا بردارم."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "جادوگر اکنون پیکربندی DNS برده‌ی شما را خواهد ساخت"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "با این پیکربندی:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "کارگیر با این شناسائی به DNS شما افزوده خواهد شد"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "نام رایانه:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "نشانی آی‌پی رایانه:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "کارگیر با این شناسائی از DNS شما برداشته خواهد شد"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "کارگزار DNS در شرف پیکربندی شدن با پیکربندی بدنبال آمده می‌باشد"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "نام‌میزبان کارگزار:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "نام‌دامنه:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "جادوگر با موفقیت میزبان را به DNS شما اضافه کرد."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "جادوگر با موفقیت میزبان را از DNS شما برداشت."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "جادوگر با موفقیت سرویس‌های DNS کارگزارتان را پیکربندی کرد."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "لطفا drakwizard را دوباره راه‌اندازی کرده و تلاش کنید بعضی از پارامترها را "
 "نغییر دهید."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "پیکربندی سیستم شما مانند کارگزار ارشد DNS ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "پیکربندی سیستم شما مانند کارگزار برده‌ی DNS ..."
 
@@ -614,7 +620,7 @@ msgstr "کارگزار پست"
 msgid "FTP server"
 msgstr "کارگزار FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "کارگزار‌ سامبا"
 
@@ -638,7 +644,7 @@ msgstr "NIS server autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "کارگزار نصب لینوکس ماندرایک"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "کارگزار‌ Kolab"
 
@@ -663,7 +669,7 @@ msgstr ""
 "%s نصب نشده است\n"
 "\"بعدی\" را برای نصب یا \"لغو\" را برای ترک کردن کلیک کنید"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "نصب شکست خورد"
 
@@ -904,15 +910,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "جادوگر پیکربندی Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"شما نیاز به سازگار کردن دوباره‌ی نام دامنه‌ی خود دارید، نه دامنه‌ی محلی یا "
-"هیچکدام. drakconnect را برای سازگار کردن آن راه‌اندازی کنید."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -923,7 +921,7 @@ msgstr ""
 "واسط مدیریت وب، دفتر نشانی مشترک با تدارک برای کاربران جعبه‌پست و همچنین "
 "تماس‌هاو یک POP3 و همچنین IMAP4 rev1 (دستیابی به پست)"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -933,39 +931,39 @@ msgstr ""
 "·CyrusPostfix,·Imap,·Saslauth. جادوگر از تمام پرونده‌های پیکربندی پیشین برای "
 "این سرویس‌ها ذخیره‌ی پشتیبان خواهد ساخت."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "به جادوگر پیکربندی کارگزار گروه‌افزار Kolab خوش آمدید."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "گذرواژه‌‌ی برای حساب مدیر کارگزار Kolab را وارد کنید."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "عدم تطابق گذرواژه، یا هیچ گذرواژه، لطفا درستش کنید."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "گذرواژه دوباره:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "جادوگر اکنون کارگزار Kolab را با این پارامترها پیکربندی خواهد کرد"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "نام میزبان:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "دامنه‌ی پست:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -973,45 +971,35 @@ msgstr ""
 "کارگزار kolab اکنون پیکربندی شده و در حال اجراست. مانند مدیر با گذرواژه‌ای که "
 "وارد کردیددر http://127.0.0.1/kolab/admin ثبت ورود کنید."
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "نصب کردن در پیشروی است"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "در حال نصب کردن کارگزار Kolab بر سیستم شما..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "در حال پیکربندی کارگزار Kolab بر سیستم شما..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "جادوگر سامبا"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"شما نیاز به تنظیم مجدد نام دامنه خود دارید. برای یک کارگزار LDAP نیاز به یک "
-"نام دامنه درست، نه دامنه‌ی محلی یا بدون نام دامنه، دارید. نام میزبان باید یک "
-"FQDN: نام دامنه کاملا تأیید شده. drakconnect رابرای سازگار کردن آن اجرا کنید."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "نشان دادن پیکربندی Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "افزودن کاربر در کارگزار Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "حذف پیکربندی Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1019,190 +1007,188 @@ msgstr ""
 "آن پایانه نامه سبک وزنی برای دسترسی به سرویسهای شاخه، مخصوصا سرویسهای شاخه "
 "براساس-X.500، است."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP مخفف Lightweight Directory Access Protocol است."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "جادوگر پیکربندی Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "شما باید یک کارگزار Ldap را نخست برپاسازی کنید."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "انتخاب شما:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "حذف پیکربندی"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "ذخیره پایه موجود در /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP کاربری را اضافه میکند"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "کاربر ایجاد شده در: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "کاربر ایجاد شده در: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "نام کوچک:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "نام:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "ثبت ورود کاربر:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "شما باید نام کوچک معتبری را وارد کنید. "
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "شما باید نام معتبری را وارد کنید."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "شما باید نام کاربری معتبری را وارد کنید."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "گذرواژه کاربر LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "گذرواژه‌ها باید تطابق داشته باشند"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "گذرواژه (دوباره):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "شما باید گذرواژه‌ای را برای LDAP وارد کنید."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "گذرواژه‌ها مطابقت نمی‌کنند"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "مدیر"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "مدیر، کاربر قدرتی با مجوز دستیابی به پایگاه داده LDAP است"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "مدیر,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "پیکربندی کارگزار LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "نام دامنه: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "نام دامنه: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "مدیر LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "درخت شاخه LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "نامگذاری DNS برای تعریف درخت شاخه LDAP استفاده میگردد"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "درخت شاخه LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "مدیر LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "گذرواژه LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "گذرواژه LDAP (دوباره):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "شما باید یک درخت شاخه LDAP معتبری را وارد کنید."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "تصدیق ایجاد کاربر"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "نام کوچک:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "نام کاربر:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "ایجاد کردن در:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "تصدیق اطلاعات برای ایجاد یک کارگزار DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "انبار کاربران:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "جادوگر با موفقیت کارگزار LDAP را پیکربندی کرد."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "کاربر با موفقیت اضافه گردید"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "خطا هنگام افزودن کاربر در پایگاه داده LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "کارگزار از قبل پیکربندی شده است"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "شما از قبل کارگزار Ldap خود را پیکربندی کرده‌اید"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s شکست خورد"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "خطا!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "نمیتوان به %s اتصال برقرار کرد"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "جادوگر اخبار"
@@ -1341,13 +1327,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "شاخه:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "مسیری که وارد کردید وجود ندارد."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "کنترل دستیابی"
 
@@ -1400,28 +1386,20 @@ msgstr "نقاب‌شبکه:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "جادوگر با موفقیت کارگزار NFS شما را پیکربندی کرد"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"شما نیاز به سازگار کردن نام میزبان DNS خود دارید. برای به یک کارگزار NISنیاز "
-"به یک نام دامنه‌ی NIS درست دارید، نه دامنه‌ی محلی یا هیچکدام."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "کارگزار NIS با autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "کارگیر NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "برپاسازی کارگزار NIS با autofs map، auto.home و پرونده‌های auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1429,28 +1407,28 @@ msgstr ""
 "کاربرها می‌توانند بطور خودکار شاخه‌ی خانه‌ی خود را وقتی که بر شبکه‌ی رایانه‌ی "
 "کارگیر NIS ثبت‌ورود می‌کنند سوار کنند."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "چکار می‌خواهید انجام دهید ؟"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "پیکربندی رایانه برای کارگیر NIS شدن"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "شما فقط باید nisdomain و nisserver را بگذارید"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "کارگزار NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "دامنه‌ی NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1460,7 +1438,7 @@ msgstr ""
 "همچنیننقشه‌ی autofs را می‌سازد، پس آن برای کاربر NIS توانایی سوار کردن خودکار "
 "شاخه‌ی آغازه‌یشان را بر یک رایانه‌ی کارگیر NIS عرضه می‌کند."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1468,40 +1446,40 @@ msgstr ""
 "خانه‌ی NIS: شاخه‌ی پایه‌ی خانه برای کاربرهای بر روی کارگزار NIS. این شاخه از "
 "میان کارگزار NFS صادر خواهد شد."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "دامنه‌ی NIS: دامنه‌ی NIS برای استفاده (معمولا همان نام دامنه‌ی NIS شما)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "کارگزار NIS: نام رایانه‌ی شما."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "خانه‌ی NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS domainname:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "جادوگر کارگزار NIS شما را با autofs map خواهد گذارد"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "شاخه‌ی NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domainname: نام NIS domainname."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS server: نام‌میزبان NIS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1509,23 +1487,23 @@ msgstr ""
 "شبح YPBIND کارگزار برای دامنه‌های NIS را پیدا می‌کند و اطلاعات الزامی NIS را "
 "نگهداریمی‌کند."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "خطا باید یک شاخه‌ باشد."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "خطا: nisdomainname نباید 'هیچکدام' یا 'دامنه‌ی محلی' باشد."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "لطفا آن را میزان کنید."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "جادوگر با موفقیت رایانه‌ی شما را برای کارگیر شدن NIS پیکربندی کرد."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1533,15 +1511,15 @@ msgstr ""
 "جادوگر با موفقیت رایانه‌اتان را برای کارگزار NIS شدن با autofs map پیکربندی "
 "کرد."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "پیکربندی سیستم‌تان به کارگزار NIS شدن با autofs map..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS با autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "پیکربندی سیستم‌تان مانند کارگیر NIS ..."
 
@@ -1901,7 +1879,7 @@ msgstr ""
 "جادوگر پارامترهای بدنبال آمده‌ی لازم را برای پیکربندی پراکسی شما جمع آوری کرد:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1933,6 +1911,14 @@ msgstr "پراکسی Squid"
 msgid "PXE Wizard"
 msgstr "جادوگر 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."
+msgstr ""
+"شما نیاز به سازگار کردن دوباره‌ی نام دامنه‌ی خود دارید، نه دامنه‌ی محلی یا "
+"هیچکدام. drakconnect را برای سازگار کردن آن راه‌اندازی کنید."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "گذاردن کارگزار PXE"
@@ -2282,24 +2268,24 @@ msgstr "پیکربندی کارگزار PXE بر سیستم شما..."
 msgid "PXE server"
 msgstr "کارگزار PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "جادوگر سامبا"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s وجود ندارد."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "همه - هیچ محدودیت دستیابی"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "قواعد من - میزبان‌های مجاز و غیرمجاز از من پرسیده شود"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2307,55 +2293,55 @@ msgstr ""
 "سامبا به کارگزار شما اجازه می‌دهد تا مانند یک کارگزار پرونده و چاپگر برای "
 "پایگاه‌هایی که سیستم‌های غیر-لینوکس را اجرا می‌کنند رفتار کند."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "جادوگر پیکربندی سامبا"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "این جادوگر به شما در پیکربندی سرویس‌های سامبای کارگزارتان کمک خواهد کرد."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "سامبا به دانستن گروه‌کاری ویندوزی که به آن خدمت خواهد داد نیاز دارد."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "گروه‌کاری"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "گروه‌کاری:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "گروه‌کاری اشتباه است"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "اعلانیه‌ی کارگزار."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "اعلانیه روشی است که این کارگزار در پایگاه‌های‌کار ویندوز توصیف خواهد شد."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "اعلانیه:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "اعلانیه‌ی کارگزار درست نیست"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "سطح دستیابی:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2363,7 +2349,7 @@ msgstr ""
 "مثال ۱: اجازه‌ی تمام آی پی‌ها در ۱۵۰.۲۰۳.*.*؛ بجز یکی\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2371,7 +2357,7 @@ msgstr ""
 "مثال ۲: اجازه به میزبان‌هایی که با یک شبکه/ماسک شبکه داده شده مطابقت دارد\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2379,7 +2365,7 @@ msgstr ""
 "مثال ۳: اجازه‌ به چند میزبان\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2389,23 +2375,23 @@ msgstr ""
 "مثال ۴: فقط میزبان‌های گروه شبکه NIS اجازه داده شوند \"foonet\"، ولی دستیابی "
 "از یک میزبان مشخص منع شود \\nhosts allow = @foonet\\nhosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "توجه شود که دستیابی هنوز نیاز به گذرواژه‌های سطح-کاربر مناسب دارد."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "میزبان‌های مجاز:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "میزبان‌های غیرمجاز:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "سرویس‌های بکار افتاده‌ی سامبا"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2415,19 +2401,19 @@ msgstr ""
 "دارد، و همچنین می‌تواند اشتراک چاپگر برای چاپگرهای وصل شده به کارگزار شما را "
 "عرضه کند."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "بکار انداختن ناحیه‌ی اشتراک پرونده"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "بکار انداختن اشتراک کارگزار چاپگر"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "در دسترس قرار دادن شاخه‌های خانه برای صاحبان آنها"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2435,28 +2421,28 @@ msgstr ""
 "شما اجازه‌ی دستیابی کاربرها به شاخه‌های خانه خود را از طریق سامبا انتخاب "
 "کرده‌اید ولی شما/آنها باید از smbpasswd برای گذاردن یک گذرواژه استفاده کنید."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "شاخه‌ی مشترک:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "مسیر شاخه‌ای را که می‌خواهید به اشتراک بگذارید تایپ کنید."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "ایجاد کردن شاخه اشتراکی اگر از قبل وجود ندارد"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "در ایجاد شاخه شکست خورد."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "اجازه‌های پرونده"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2466,60 +2452,60 @@ msgstr ""
 "شروع شوند) مانند این:\n"
 " root, fred, @users, @wheel برای هر نوع اجازه."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "لیست خواندن:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "لیست نگارش:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "چاپگرهایی را که می‌خواهید قابل دستیابی کاربرهای شناخته شده باشند انتخاب کنید"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "بکار انداختن تمام چاپگرها"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "پیکربندی سامبا"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "جادوگر پارامترهای بدنبال آمده‌ را برای پیکربندی سامبا جمع آوری کرد."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "اعلانیه‌ی کارگزار:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "اشتراک پرونده:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "کارگزار چاپ:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "خانه:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "چاپگرها:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "جادوگر با موفقیت کارگزار سامبای شما را پیکربندی کرد."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "پیکربندی کارگزار سامبای شما..."
 
@@ -2757,3 +2743,26 @@ msgstr "کارگزار آپاچی"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "پیکربندی سیستم شما مانند کارگزار آپاچی ..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "شما فقط نیاز به خواندن نام میزبان خود دارید."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "شما نیاز به تنظیم مجدد نام دامنه خود دارید. برای یک کارگزار LDAP نیاز به "
+#~ "یک نام دامنه درست، نه دامنه‌ی محلی یا بدون نام دامنه، دارید. نام میزبان "
+#~ "باید یک FQDN: نام دامنه کاملا تأیید شده. drakconnect رابرای سازگار کردن "
+#~ "آن اجرا کنید."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "نمیتوان به %s اتصال برقرار کرد"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "شما نیاز به سازگار کردن نام میزبان DNS خود دارید. برای به یک کارگزار "
+#~ "NISنیاز به یک نام دامنه‌ی NIS درست دارید، نه دامنه‌ی محلی یا هیچکدام."
diff --git a/po/fi.po b/po/fi.po
index d351b28e..04e4b6fc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fi - MDK 10.1 Release\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-10-01 20:14+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrakelinux.com>\n"
@@ -27,31 +27,31 @@ msgstr "asetusvelho"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Varoitus."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Virhe."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Onnittelut"
 
@@ -92,11 +92,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(sinun ei tarvitse kirjoittaa verkkoaluetta nimen jälkeen)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Asiakkaan tiedot:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -104,7 +104,7 @@ msgstr ""
 "Huomaa, että annetun IP-osoitteen ja asiakasnimen on oltava ainutlaatuisia "
 "verkossa."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -114,33 +114,33 @@ msgstr ""
 "yritys.net. Joka kone verkossa vaatii ainutlaatuisen IP-osoitteen, yleisessä "
 "piste-muodossa (aaa.bbb.ccc.ddd)."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Koneen nimi:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Koneen IP-osoite:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Varoitus"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Virhe"
@@ -185,12 +185,32 @@ msgstr "Asiakas-IP:"
 msgid "The wizard successfully added the client."
 msgstr "Velho lisäsi asiakkaan onnistuneesti."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Sinun täytyy uudelleenmäärittää verkkoaluenimesi. DNS palvelimelle tarvitset "
+"oikean verkkoalueen nimi, joka ei saa olla localdomain tai none, vaan pitää "
+"olla FQDN. Käytä drakconnect muokataaksesi sitä."
+
+#: ../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."
+msgstr ""
+"Sinun täytyy uudelleenmäärittää verkkoaluenimesi. DNS palvelimelle tarvitset "
+"oikean verkkoalueen nimi, joka ei saa olla localdomain tai none, vaan pitää "
+"olla FQDN. Käytä drakconnect muokataaksesi sitä."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Komento suoritetaan vielä. Haluatko tappaa sitä ja lopettaa velhon?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Sulje"
 
@@ -283,8 +303,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "Poistettu käytöstä"
@@ -293,8 +313,8 @@ msgstr "Poistettu käytöstä"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "Käytössä"
@@ -307,52 +327,38 @@ msgstr "Liitäntä:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Velho asetti palvelimesi DHCP-palvelun onnistuneesti."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Epäonnistui"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Käyynistä drakwizard uudelleen ja yritä muuttaa joitakin parametreja."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Sinun täytyy uudelleenmäärittää koneesi nimi."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Sinun täytyy uudelleenmäärittää verkkoaluenimesi. DNS palvelimelle tarvitset "
-"oikean verkkoalueen nimi, joka ei saa olla localdomain tai none, vaan pitää "
-"olla FQDN. Käytä drakconnect muokataaksesi sitä."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Isäntä DNS-palvelin"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Orja DNS-palvelin"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Lisää kone DNS-palveluun"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Poista kone DNS-palvelusta"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -360,11 +366,11 @@ msgstr ""
 "DNS (Domain Name Server, eli Nimipalvelin) on palvelu joka yhdistää koneen "
 "IP-osoitteen vastaavaan Internet konenimeen."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "DNS Isäntä asetusvelho"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -374,47 +380,47 @@ msgstr ""
 "tarjoaa paikallisen DNS-palvelun paikallisille työasemille, sekä ei-"
 "paikallisten hakujen edelleenlähettämisen ulkoiselle DNS palvelimelle."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Mitä haluat tehdä:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS-palvelin"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(sinun ei tarvitse kirjoittaa verkkoaluetta nimen jälkeen)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Palvelin IP:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS verkkoalueen nimi:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Valitse kone jota haluat poistaa seuraavassa listauksessa."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Poista kone olemassaolevasta DNS-asetuksesta."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Poista kone:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Tietokoneen nimi:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -423,11 +429,11 @@ msgstr ""
 "DNS orjapalvelin vähentää osan Isäntäpalvelimen kuormasta , ja toimii myös "
 "varmistuspalvelimena, jos isäntäpalvelimeen ei saada yhteyttä."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "DNS isäntäpalvelimen IP-osoite:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -435,11 +441,11 @@ msgstr ""
 "Edelleenlähetys tapahtuu ainostaan niille kyselyille, johon palvelin ei ole "
 "vastuussa, tai jos sitä tietoa ei ole välimuistissa."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Edelleenlähettäjän IP-osoite:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -447,15 +453,15 @@ msgstr ""
 "Joten jos tarvitset sitä ja tiedät ip-edellenlähettäjäsi, syöte sen IP-"
 "osoite. Muussa tapauksissa jätä tyhjäksi."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Ulkoinen DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Lisää etsittävä verkkoalue"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -463,7 +469,7 @@ msgstr ""
 "Tämän palvelimen verkkoaluetta lisätään automaattisesti, joten sitä ei "
 "tarvitse lisätä tässä."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -475,28 +481,28 @@ msgstr ""
 "verkkoalueen nimi. Tätä voidaan muuttaa listaamalla kaikki toivotut "
 "verkkoalueen hakupolut \"search\" avainsanan jälkeen."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Oletusverkkoalue jossa etsitään:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Tämä ei ole oikeanmuotoinen osoite edelleenlähettäjällesi... paina "
 "'seuraava' jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Tämä ei ole oikeanmuotoinen DNS Isännän IP-osoite... paina 'seuraava' "
 "jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Tämä ei ole oikeanmuotoinen osoite... paina 'seuraava' jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -504,11 +510,11 @@ msgstr ""
 "Näyttää siltä että tuo kone on jo DNS asetuksissasi... paina 'seuraava' "
 "jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -516,7 +522,7 @@ msgstr ""
 "Näyttää siltä ettei tämä kone ole DNS asetuksissasi... paina 'seuraava' "
 "jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -524,71 +530,71 @@ msgstr ""
 "Näyttää siltä ettei DNS palvelinta on asetettu velhon kautta. Ole hyvä ja "
 "suorita DNS velho: Isäntä DNS-palvelin."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Näyttää siltä ettei tämä kone ole DNS Isäntä, vain ainoastaan orjana. Joten "
 "en voi lisätä/poistaa konetta."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Ok, nyt luon DNS-orja asetuksesi"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "näillä asetuksella:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Asiakas näillä tunnisteilla lisätään DNS-palveluun"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Tietokoneen nimi:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Tietokoneen IP-osoite:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Asiakas näillä tunnisteilla poistetaan DNS-palvelusta"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS-palvelinta ollaan asettamassa seuraavilla asetuksilla:"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Palvelimen konenimi:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Verkkoalue:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Velho lisäsi koneen DNS-palveluun onnistuneesti."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Velho poisti koneen DNS-palvelusta onnistuneesti."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Velho asetti palvelimesi DNS-palvelun onnistuneesti."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Käyynistä drakwizard uudelleen ja yritä muuttaa joitakin parametreja."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Asetetaan järjestelmäsi DNS Isäntäpalvelimeksi ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Asetetaan järjestelmäsi DNS orjapalvelimeksi ..."
 
@@ -616,7 +622,7 @@ msgstr "Sähköpostipalvelin"
 msgid "FTP server"
 msgstr "FTP-palvelin"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba-palvelin"
 
@@ -640,7 +646,7 @@ msgstr "Nis palvelin + Autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux Asennuspalvelin"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab-palvelin"
 
@@ -665,7 +671,7 @@ msgstr ""
 "%s ei ole asennettu.\n"
 "Paina \"Seuraava\" asentaaksesi tai \"Poistu\" lopettaaksesi."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Asennus epäonnistui"
 
@@ -904,15 +910,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab asetusvelho"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Sinun täytyy uudelleenmäärittää verkkoaluenimesi joka ei saa olla "
-"localdomain tai none. Käytä drakconnect muokataaksesi sitä."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -924,7 +922,7 @@ msgstr ""
 "osoitteisto varustettuna tuella postitileille ja yhteystiedoille sekä POP3 "
 "ja IMAP4(rev1) tuki postin lukemiseen"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -934,39 +932,39 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Velho varmuuskopioi kaikki nykysten "
 "palvelujen asetustiedostoja ennen niiden uudelleenasettaminen Kolab-tuelle."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Tervetuloa Kolab Groupware palvelimen asetusvelhoon"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Anna Kolab-palvelimen hallintatilin salasanaa."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Salasana ei täsmää, tai tyhjää salasanaa, ole hyvä ja korjaa."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Salasana uudestaan:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Kolab-palvelinta asetetaan nyt näillä parametreilla."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Konenimi:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Sähköposti verkkoalue:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -974,45 +972,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Asennus käynnissä"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Asennetaan Kolab-palvelinta järjestelmääsi..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Asetetaan järjestelmäsi Kolab-palvelinta..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "LDAP velho"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Sinun täytyy uudelleenmäärittää verkkoaluenimesi. LDAP palvelimelle "
-"tarvitset oikean verkkoalueen nimi, joka ei saa olla localdomain tai none, "
-"vaan pitää olla FQDN. Käytä drakconnect muokataaksesi sitä."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Näytä LDAP asetukset"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Lisää käyttäjää LDAP palvelimeen"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Poista LDAP asetukset"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1020,194 +1008,192 @@ msgstr ""
 "Se on kevyt protokolla hakemistopalvelujen käyttämiseksi, erityisesti X.500 "
 "pohjaiset hakemistoplavelut."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP tarkoittaa Lightweight Directory Access Protocol, eli kevyt hakemiston "
 "käyttöprotokolla."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "LDAP asetusvelho"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Sinun täytyy asettaa LDAP-palvelinta ensin."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Valintasi:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Poista asetukset"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Tallennetaan nykyinen pohja /root/ldap-sav.ldiff tiedostoon"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP lisää käyttäjää"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Käyttäjä luotu kohteessa: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Käyttäjä luotu kohteessa: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Etunimi:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Kirjautumistunnus:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Sinun täytyy antaa pätevä etunimi."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Sinun täytyy antaa pätevä nimi."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Sinun täytyy antaa pätevä käyttäjänimi."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP käyttäjä salasana"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "salasanat pitää täsmää"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Salasana (uudestaan):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Sinun täytyy antaa LDAP salasanaa."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Salasanat poikkeavat toisistaan"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Järjestelmävalvoja"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Järjestelmävalvoja on tehokäyttäjä jolla on täydet oikeudet LDAP "
 "tietokannassa"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Järjestelmävalvoja,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Asetetaan LDAP palvelinta"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Verkkoalue: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Verkkoalue: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP Järjestelmävalvoja"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP hakemistopuu"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS nimitys käytetään LDAP hakemistopuun määrittelyyn."
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP hakemistopuu:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP Järjestelmävalvoja:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP Salasana:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP Salasana (uudestaan):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Sinun täytyy antaa pätevän LDAP hakemistopuun."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Vahvistaminen käyttäjän luontiin"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Etunimi:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Käyttäjänimi:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Luo kohdassa:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Vahvistaminen LDAP palvelimen luontiin"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Käyttäjät Säiliö:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Velho asetti LDAP onnistuneesti."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "käyttäjää lisätty onnistuneesti"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Virhe lisättäessä käyttäjää LDAP tietokantaan"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Palvelin on jo määritelty"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Olet jo määrittänyt LDAP palvelintasi"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Epäonnistui"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Virhe!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Ei voitu yhdistää kohteeseen %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Uutispalvelin velho"
@@ -1346,13 +1332,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Hakemisto:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Annettua hakemistoa ei ole."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Käyttörajoitus"
 
@@ -1405,30 +1391,21 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Velho asetti NFS-palvelimen onnistuneesti."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Sinun täytyy uudelleenmäärittää NIS verkkoaluenimesi. NIS palvelimelle "
-"tarvitset oikean NIS verkkoalueen nimi, joka ei saa olla localdomain tai "
-"none."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Nis palvelin + Autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Nis-asiakas"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Aseta NIS-palvelinta + autofs map, auto.home ja auto.master tiedostoja."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1436,28 +1413,28 @@ msgstr ""
 "Asiakkaat voivat automattisesti littää kotihakemistonsa kun he kirjautuvat "
 "NIS-verkkoon."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Mitä haluat tehdä?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Tarvitset vain asettaa nis-verkkoalue ja nis-palvelin"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS-palvelin:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Nis verkkoalue:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1468,7 +1445,7 @@ msgstr ""
 "kotihakemisto liitetään automaattisesti kuin ne kirjautuvat NIS "
 "asiakaskoneelle."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1476,42 +1453,42 @@ msgstr ""
 "NIS koti: käyttäjien kotihakemisto NIS-palvelimella. Tämä hakemisto jaetaan "
 "NFS-palvelimen kautta."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS verkkoalue: Käytettävä NIS verkkoalue (Yleensä sama kuin DNS "
 "verkkonimesi)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS palvelin: koneesi nimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS Kotihakemisto:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS verkkoalueen nimi:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Welho asettaa NIS palvelintasi + autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS hakemisto:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS verkkoalueen nimi: NIS verkkoalueen nimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS palvelin: NIS-palvelimen konenimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1519,37 +1496,37 @@ msgstr ""
 "YPBIND demoni löytää NIS verkkoalueiden palvelimet ja hallitsee NIS-"
 "liitoksien tietoja."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Virhe, Pitää olla hakemisto."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Virhe, nis-verkkoaluenimi ei saa olla 'none' tai 'localdomain'"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Ole hyvä ja korjaa sitä."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Velho asetti koneesi NIS asiakkaaksi onnistuneesti."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Velho asetti koneesi NIS-palvelimeksi + autofs onnistuneesti."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Asetetaan järjestelmäsi Nis+Autofs(nfs) palvelimeksi ..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "Nis palvelin + Autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi ..."
 
@@ -1916,7 +1893,7 @@ msgstr ""
 "asettamiseksi:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1948,6 +1925,14 @@ msgstr "Squid välityspalvelin"
 msgid "PXE Wizard"
 msgstr "PXE-velho"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Sinun täytyy uudelleenmäärittää verkkoaluenimesi joka ei saa olla "
+"localdomain tai none. Käytä drakconnect muokataaksesi sitä."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Aseta PXE-palvelin"
@@ -2309,24 +2294,24 @@ msgstr "Asetetaan järjestelmäsi PXE-palvelinta..."
 msgid "PXE server"
 msgstr "PXE-palvelin"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba velho"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s ei ole olemassa."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Kaikki - Ei käyttörajoituksia"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Omat säännöt - Vahvista sallitut ja kielletyt osoitteet"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2334,54 +2319,54 @@ msgstr ""
 "Samba sallii palvelimesi toimia tiedosto- ja tulostuspalvelimena "
 "työasemille, jotka eivät käytä Linuxia."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba asetusvelho"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Tämä velho auttaa asettamaan palvelimesi Samba-palvelut."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samban täytyy tietää Windows-työryhmä, jota sen pitää palvella."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Työryhmä"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Työryhmä:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Työryhmä on väärä"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Palvelin juliste:"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "Juliste määrää tämän palvelimen kuvauksen Windows-työasemissa."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Juliste:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Palvelimen juliste on virheellinen"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Käyttörajoitustaso:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2390,7 +2375,7 @@ msgstr ""
 "tietty\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2398,7 +2383,7 @@ msgstr ""
 "* Esimerkki 2: hyväksy koneet jotka vastaavat annettua verkkoa/verkkomaskia\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2406,7 +2391,7 @@ msgstr ""
 "* Esimerkki 3: hyväksy muutama kone\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2418,23 +2403,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Huomaa että yhteys vaatii silti oikein määritetyn käyttäjän/salasanan."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Hyväksy osoitteet:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Kiellä osoitteet:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Käytössä olevat Samba-palvelut"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2443,19 +2428,19 @@ msgstr ""
 "Samba voi tarjota yleisen tiedostonjakelualueen Windows-työasemillesi, sekä "
 "tulostimen jaon kaikille tulostimille jotka on kytketty palvelimeen."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Ota käyttöön jaettu alue"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Ota käyttöön Palvelimen jaettu tulostus"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Aseta kotihakemistot omistajiensa saataville."
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2464,28 +2449,28 @@ msgstr ""
 "kautta, mutta sinun/heidän on käytettävä smbpasswd salasanan "
 "määrittelemiseksi."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Jaettu hakemisto:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Syötä hakemisto jonka haluat jakaa."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Luo jaettu hakemisto jos sitä ei ole olemassa"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Hakemiston luonti epäonnistui"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Tiedoston oikeudet"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2495,63 +2480,63 @@ msgstr ""
 "esimerkiksi näin:\n"
 "root fred @users @wheel jokaiselle eri oikeudelle."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Lukulista:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Kirjoituslista:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Valitse mitkä tulostimia haluat olla käytettävissä tunnistetuille "
 "käyttäjille."
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Ota käyttöön kaikki tulostimet"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Asetetaan Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaanSamba-palvelun "
 "asettamiseksi."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Palvelin juliste:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Tiedostojako:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Tulostuspalvelin:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Kotihakemisto:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Tulostimet:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Velho asetti Samba-palvelimesi onnistuneesti."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Asetetaan Samaba-palvelimesi."
 
@@ -2789,6 +2774,29 @@ msgstr "Apache palvelin"
 msgid "Configuring your system as Apache server ..."
 msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Sinun täytyy uudelleenmäärittää koneesi nimi."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Sinun täytyy uudelleenmäärittää verkkoaluenimesi. LDAP palvelimelle "
+#~ "tarvitset oikean verkkoalueen nimi, joka ei saa olla localdomain tai "
+#~ "none, vaan pitää olla FQDN. Käytä drakconnect muokataaksesi sitä."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Ei voitu yhdistää kohteeseen %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Sinun täytyy uudelleenmäärittää NIS verkkoaluenimesi. NIS palvelimelle "
+#~ "tarvitset oikean NIS verkkoalueen nimi, joka ei saa olla localdomain tai "
+#~ "none."
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Asetetaan DHCP-palvelin"
diff --git a/po/fr.po b/po/fr.po
index 5c56c0f6..8ee476f0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,19 +8,20 @@
 # Pablo Saratxaga <pablo@mandrakesoft.com>, 2004.
 # Lecureuil Nicolas <n1c0l4s.l3@wanadoo.fr>, 2004.
 # RICHARD Nicolas <richardnicolas22@yahoo.fr>, 2004.
+# Teletchéa <steletch@free.fr>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
-"PO-Revision-Date: 2004-11-14 22:04+0100\n"
-"Last-Translator: Lecureuil Nicolas <n1c0l4s.l3@wanadoo.fr>\n"
-"Language-Team: francais <fr@li.org>\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
+"PO-Revision-Date: 2004-12-13 15:18+0100\n"
+"Last-Translator: Teletchéa <steletch@free.fr>\n"
+"Language-Team: Français <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: ../Wiztemplate.pm:31
@@ -29,31 +30,31 @@ msgstr "assistant de configuration"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Attention."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Erreur."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Félicitations"
 
@@ -94,11 +95,11 @@ msgstr "Cet assistant vous aide à ajouter un nouveau client dans votre DNS"
 msgid "(you don't need to type the domain after the name)"
 msgstr "(il n'est pas nécessaire de saisir le domaine après le nom)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identification du client :"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -106,7 +107,7 @@ msgstr ""
 "Notez bien que l'adresse IP et le nom du client doivent être uniques dans le "
 "réseau."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -116,21 +117,21 @@ msgstr ""
 "compagnie.net . Chaque machine sur le réseau doit avoir une adresse IP "
 "(unique) dans la syntaxe habituelle avec des points."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nom de la machine :"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Adresse IP de la machine :"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Attention"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Vous êtes en DHCP, le serveur pourrait ne pas marcher avec cette "
@@ -139,12 +140,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erreur"
@@ -189,14 +190,36 @@ msgstr "Adresse IP :"
 msgid "The wizard successfully added the client."
 msgstr "L'assistant a ajouté le client au DNS."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Réajustez le nom de votre domaine. Pour configurer un serveur DNS vous avez "
+"besoin d'un nom de domaine correct, différent du nom de domaine local et non "
+"nul. le nom d'hôte doit être un nom de domaine pleinement qualifié. Lancez "
+"drakconnect pour l'ajuster."
+
+#: ../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."
+msgstr ""
+"Réajustez le nom de votre domaine. Pour configurer un serveur DNS vous avez "
+"besoin d'un nom de domaine correct, différent du nom de domaine local et non "
+"nul. le nom d'hôte doit être un nom de domaine pleinement qualifié. Lancez "
+"drakconnect pour l'ajuster."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "La command est en cours d'éxécution. Voulez-vous la terminer et quitter "
 "l'assistant ?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Fermer"
 
@@ -292,8 +315,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "désactivé"
@@ -302,8 +325,8 @@ msgstr "désactivé"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "activé"
@@ -316,53 +339,38 @@ msgstr "Interface :"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "L'assistant a configuré avec succès les services DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Échec"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Relancez drakwizard en changeant quelques paramètres."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "SVP réajustez votre nom d'ordinateur."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Réajustez le nom de votre domaine. Pour configurer un serveur DNS vous avez "
-"besoin d'un nom de domaine correct, différent du nom de domaine local et non "
-"nul. le nom d'hôte doit être un nom de domaine pleinement qualifié. Lancez "
-"drakconnect pour l'ajuster."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Serveur DNS maître"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Serveur DNS secondaire"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Ajouter un hôte au DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Enlever un hôte du DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -370,11 +378,11 @@ msgstr ""
 "le DNS (Serveur de Noms de Domaine) est le service qui met en correspondance "
 "les adresses réseau (IP) et les noms d'hôtes"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Assistant de configuration du DNS maître"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -384,44 +392,44 @@ msgstr ""
 "fournira un service local de DNS pour les noms d'ordinateurs locaux, avec "
 "renvoi des requêtes autres que locales vers un DNS externe."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Que voulez vous faire ?"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "Interface de serveur DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Il n'est pas nécessaire de saisir le domaine après le nom)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "Nom de domaine DNS :"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Choisissez l'ordinateur que vous voulez retirer."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Enlève un ordinateur de la configuration DNS existante."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Enlever un hôte :"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Nom de la machine :"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -430,11 +438,11 @@ msgstr ""
 "Un serveur DNS esclave sert de serveur de sauvegarde à un serveur DNS "
 "primaire, au cas où votre serveur principal n'est pas joignable."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Adresse IP du serveur DNS maître :"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -444,11 +452,11 @@ msgstr ""
 "cache."
 
 # don't know if thqt's the good translation for "forwarder"
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP de l'expéditeur"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -456,15 +464,15 @@ msgstr ""
 "Si vous ne connaissez pas de serveur externe, ou si vous ne savez pas ce que "
 "c'est, ne mettez rien."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS externe :"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Ajouter un domaine de recherche"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -472,7 +480,7 @@ msgstr ""
 "Le nom de domaine de ce serveur est ajouté automatiquement, et vous n'avez "
 "pas besoin de l'ajouter ici."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -484,29 +492,29 @@ msgstr ""
 "défaut. Pour changer cela, parcourir la liste et indiquer le chemin du "
 "domaine de recherche en suivant les mots-clés"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Domaine de recherche par défaut :"
 
 # don't know if that's the good word for forwarder
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "L'adresse IP de l'envoyeur est incorrecte... Appuyez sur Suivant pour "
 "continuer"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Cette adresse IP n'est pas valable pour le serveur maître DNS... Appuyez sur "
 "Suivant pour continuer"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Cette adresse IP est incorrecte... Appuyez sur Suivant pour continuer"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -514,11 +522,11 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Erreur :"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -526,7 +534,7 @@ msgstr ""
 "Il semble que ceci ne soit pas présent dans votre configuration DNS... "
 "Appuyez sur Suivant pour continuer"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -534,71 +542,71 @@ msgstr ""
 "Aucune configuration DNS n'a été mise en place au travers de l'assistant DNS."
 "Lancez l'assistant DNS en choisissant : Serveur DNS maître."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Il semble que vous ne soyez pas un serveur DNS primaire mais un serveur DNS "
 "esclave. Il est donc impossible d'ajouter/retirer des ordinateurs."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "L'assistant fera maintenant la configuration de votre DNS esclave"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "avec cette configuration :"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Le Client avec cette identification va être ajouté à votre DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Nom de la machine :"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Adresse IP du serveur :"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Cet ordinateur va être retirer."
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Le serveur DNS va être configuré comme suit"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Nom du serveur :"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Nom du domaine :"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "L'assistant a ajouté avec succès le client au DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "L'assistant a retiré avec succès l'hôte de votre DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "L'assistant a configuré avec succès le service DNS de votre serveur."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Relancez drakwizard en changeant quelques paramètres."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurer votre système en tant que serveur DNS maître ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurer votre système en tant que serveur DNS secondaire ..."
 
@@ -626,7 +634,7 @@ msgstr "Serveur de messagerie (Postfix)"
 msgid "FTP server"
 msgstr "Serveur de fichier (FTP)"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Serveur Samba"
 
@@ -650,7 +658,7 @@ msgstr "Serveur d'utilisateur (mappage Autofs)"
 msgid "Mandrakelinux Install server"
 msgstr "Serveur d'installation Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Serveur Kolab"
 
@@ -675,7 +683,7 @@ msgstr ""
 "le paquetage %s n'est pas installé\n"
 "Cliquez sur « Suivant » pour l'installer ou « Annuler » pour quitter"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "L'installation a échoué"
 
@@ -933,15 +941,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Assistant de configuration de Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Vous devez réajuster le nom de votre domaine, il ne doit pas être égal à "
-"« localdomain » ni être nul. Lancez drakconnect pour l'ajuster."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -953,7 +953,7 @@ msgstr ""
 "d'administration web, un carnet d'adresses partagé, et un accès mail POP3 et "
 "IMAP4."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -963,42 +963,42 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Bienvenu dans l'Assistant de configuration du serveur Kolab"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Entrez le mot de passe de l'administrateur Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Mot de Passe :"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Mot de Passe (encore une fois) :"
 
 # uncertain
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Nom d'hôte :"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Domaine de courrier :"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -1006,46 +1006,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Installation en cours"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Configuration du serveur Kolab sur votre système..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Assistant Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Réajustez le nom de votre domaine. Pour configurer un serveur LDAP vous avez "
-"besoin d'un nom de domaine correct, différent du nom de domaine local et non "
-"nul. le nom d'hôte doit être un nom de domaine pleinement qualifié. Lancez "
-"drakconnect pour l'ajuster."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Montrer la configuration Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Ajouter un utilisateur au serveur Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Effacer la configuration Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1053,197 +1042,194 @@ msgstr ""
 "Ceci est un protocole léger pour accéder au service d'annuaires, "
 "spécialement les service d'annuaires basés sur X.500"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP signifie Lightweight Directory Access Protocol (protocole léger d'accès "
 "aux annuaires)."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Assistant de configuration Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Vous devez d'abord configurer un serveur Ldap."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Votre choix :"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Effacer la configuration"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Sauvegarder la base existante dans /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Ajout d'utilisateurs LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Utilisateur crée dans :"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Utilisateur crée dans : %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Prénom :"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nom :"
 
 # non breaking space before colon in french
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Nom d'utilisateur :"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Vous devez entrer un prénom valide."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Vous devez entrer un nom valide."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Vous devez entrer un nom d'utilisateur valide."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Mot de passe de l'utilisateur LDAP :"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "Les mots de passe doivent correspondre"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Mot de passe (encore une fois) :"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Vous devez entrer un mot de passe pour LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Les mots de passe ne sont pas identiques"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrateur"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "L'administrateur est un super utilisateur avec des droits sur la base de "
 "données LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrateur,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Configuration du serveur LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Nom du domaine : "
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Nom du domaine : %s%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Administrateur LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Arborescence LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "Le nommage DNS est utilisé pour définir l'arborescence de LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Arborescence LDAP : "
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Administrateur LDAP :"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Mot de passe LDAP :"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Mot de passe LDAP (encore une fois) :"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Vous devez entrer une arborescence valide pour LDAP."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Confirmation de l'utilisateur a créer"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Prénom :"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Nom d'utilisateur :"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Créer dans :"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Confirmation des informations afin de créer un serveur LDAP"
 
 # non breaking space before colon in french
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
-msgstr "Contenant :"
+msgstr "Classe d'utilisateurs :"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "L'assistant a configuré LDAP avec succès."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Utilisateur ajouté avec succès"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Erreur durant l'ajout d'utilisateur dans la base de données LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Serveur déjà configuré"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Vous avez déjà configuré votre serveur Ldap"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Échec"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Erreur !"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Impossible de se connecter à %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Assistant de serveur de forums"
@@ -1382,13 +1368,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Répertoire :"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Le chemin entré n'existe pas."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Contrôle d'accès"
 
@@ -1442,30 +1428,22 @@ msgstr "Masque de réseau :"
 msgid "The wizard successfully configured your NFS server."
 msgstr "L'assistant a configuré avec succès votre serveur NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Réajustez le nom de votre domaine NIS. Pour un serveur NIS vous avez besoin "
-"d'un nom de domaine correct, qui ne soit ni égal à « localdomain », ni nul."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Serveur NIS  avec mappage Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Configurer un serveur NIS, avec des maps autofs et des fichiers « auto."
 "home » et « auto.master »."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1474,28 +1452,28 @@ msgstr ""
 "partir du serveur, lorsqu'ils se connectent au réseau via un poste client "
 "NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Que voulez-vous faire ?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Configurer votre système en tant que client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Vous devez juste remplir les champs nisdomain et nisserver."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Serveur NFS :"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Domaine NIS :"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1505,7 +1483,7 @@ msgstr ""
 "et d'ordinateurs. Cet assistant permet aussi aux utilisateurs d'accéder à "
 "leur répertoire personnel depuis un ordinateur client NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1513,43 +1491,43 @@ msgstr ""
 "Répertoire personnel NIS : répertoire personnel de base pour les "
 "utilisateurs de serveur NIS. Ce répertoire sera exporté via le serveur NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Domaine NIS : domaine NIS à utiliser (généralement le même que votre domaine "
 "DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Serveur NIS : nom de votre ordinateur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Répertoire NIS personnel :"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Nom de domaine NIS :"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Cet assistant installera votre serveur NIS avec le mappage Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Dossier NIS :"
 
 # i love this sort of explanation!
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nom de domaine NIS : nom du domaine de NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Serveur NIS : nom d'hôte du serveur NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1558,40 +1536,40 @@ msgstr ""
 "informations."
 
 # I had to modify that one a bit...
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Erreur : ce doit être un répertoire."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 "Erreur : le nom de domaine NIS ne peut être « none » ni « localdomain »."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Corrigez SVP."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "L'assistant a configuré avec succès votre système pour être un client NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 "L'assistant a configuré avec succès votre machine en tant que serveur NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Configurer votre système en tant que client NIS avec mappage Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "Serveur NIS avec mappage Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Configurer votre système en tant que client NIS ..."
 
@@ -1965,7 +1943,7 @@ msgstr ""
 "votre proxy :"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2000,6 +1978,14 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Assistant 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."
+msgstr ""
+"Vous devez réajuster le nom de votre domaine, il ne doit pas être égal à "
+"« localdomain » ni être nul. Lancez drakconnect pour l'ajuster."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Configurer un serveur PXE"
@@ -2380,24 +2366,24 @@ msgstr "Configurer le serveur PXE sur votre système..."
 msgid "PXE server"
 msgstr "Serveur de démarrage (PXE)"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Assistant Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s n'existe pas."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Tous - Pas de restriction d'accès"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Spécifier quels hôtes sont autorisés ou non"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2405,37 +2391,37 @@ msgstr ""
 "Samba permet au serveur d'agir comme serveur de fichier et d'impression pour "
 "des postes clients n'utilisant pas Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Configuration du partage de fichiers"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Cet assistant vous aide à configurer le service Samba de votre serveur."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba a besoin de connaître le groupe de travail Windows desservi."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Groupe de travail"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Groupe de travail :"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Le groupe de travail est incorrect"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Bannière du serveur Samba."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2443,19 +2429,19 @@ msgstr ""
 "La bannière est la description du serveur fournie aux clients samba du "
 "réseau."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Bannière :"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "La bannière du serveur est incorrecte"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Niveau d'accès :"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2464,7 +2450,7 @@ msgstr ""
 "sauf une\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2473,7 +2459,7 @@ msgstr ""
 "spécifié\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2481,7 +2467,7 @@ msgstr ""
 "* Exemple 3 : autoriser un couple d'hôtes\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2493,24 +2479,24 @@ msgstr ""
 "hosts allow = @un_groupe_nis\n"
 "hosts deny = un_pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Notez que l'accès nécessite toujours un mot de passe utilisateur approprié."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Hôtes autorisés :"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Hôtes non autorisés :"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Services Samba actifs"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2520,19 +2506,19 @@ msgstr ""
 "Windows de votre réseau, ainsi que le partage des imprimantes connectées à "
 "votre serveur."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Activer l'espace public d'échange"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Activer le partage d'imprimantes"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Permettre l'accès aux répertoires personnels à leurs propriétaires."
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2541,28 +2527,28 @@ msgstr ""
 "utilisateurs via samba mais vous devrez utiliser smbpasswd pour enregistrer "
 "un mot de passe samba."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Répertoire partagé :"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Tapez le chemin du répertoire à partager."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Créer le répertoire partagé s'il n'existe déjà"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Echec lors de la création du dossier."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Droits sur les fichiers"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2572,64 +2558,64 @@ msgstr ""
 "séparés par des virgules. Par exemple :\n"
 "root, fred, @users, @wheel pour chaque type de permission."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "droit de lecture :"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @utilisateurs, @superutilisateurs"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "droit d'écriture :"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Sélectionnez les imprimantes qui seront accessibles par les utilisateurs "
 "connus."
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Toutes les imprimantes"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Configuration de Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "L'assistant a rassemblé les paramètres suivants nécessaires à la "
 "configuration de Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Bannière du serveur :"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Partage de fichiers :"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Partage d'imprimante :"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Accès aux répertoires personnel :"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Imprimantes :"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 "L'assistant a configuré avec succès le service Samba sur votre serveur."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Configuration du serveur Samba..."
 
@@ -2879,3 +2865,35 @@ msgstr "Serveur Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurer votre système en tant que serveur Apache ..."
+
+#~ msgid "Administrator is a power user with grant access on LDAP database,%s"
+#~ msgstr ""
+#~ ",%sL'administrateur est un super utilisateur avec des droits sur la base "
+#~ "de ,%sdonnées LDAP"
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "SVP réajustez votre nom d'ordinateur."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Réajustez le nom de votre domaine. Pour configurer un serveur LDAP vous "
+#~ "avez besoin d'un nom de domaine correct, différent du nom de domaine "
+#~ "local et non nul. le nom d'hôte doit être un nom de domaine pleinement "
+#~ "qualifié. Lancez drakconnect pour l'ajuster."
+
+#~ msgid "User Created in: "
+#~ msgstr "Utilisateur crée dans :"
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Impossible de se connecter à %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Réajustez le nom de votre domaine NIS. Pour un serveur NIS vous avez "
+#~ "besoin d'un nom de domaine correct, qui ne soit ni égal à "
+#~ "« localdomain », ni nul."
diff --git a/po/fur.po b/po/fur.po
index 74f55311..382c154b 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-06-28 17:19+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -23,31 +23,31 @@ msgstr "configuration wizard"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Avertence."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Fal."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Congratulazions"
 
@@ -87,18 +87,18 @@ msgstr "Chest assistent a ti judarâ a zontâ un gnûf client tal to DNS locâl.
 msgid "(you don't need to type the domain after the name)"
 msgstr "(no tu âs bisugne di insedâ il domini daspò dal non)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identificazion Client:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Visiti che il recapit IP e il non dal client e an di sedi ugnulis te rêt."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -108,21 +108,21 @@ msgstr ""
 "aziende.net. Dutis les machinis te rêt e an di vê un (ugnul) recapit IP, te "
 "forme standard."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Non de machine:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Recapit IP de machine:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Avertence"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Tu stas doprant dhcp, il server al podares no funzionâ un le to "
@@ -131,12 +131,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fal"
@@ -181,12 +181,33 @@ msgstr "IP dal client:"
 msgid "The wizard successfully added the client."
 msgstr "L'assistent al à zontât il client cun sucès."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Tu âs di mudâ il to non di domini. Par un server DNS tu âs bisugne di un non "
+"di domini valevul, diferent dal domini locâl o di vueit. Invie drakconnect "
+"par mudâlu."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+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 ""
+"Tu âs di mudâ il to non di domini. Par un server DNS tu âs bisugne di un non "
+"di domini valevul, diferent dal domini locâl o di vueit. Invie drakconnect "
+"par mudâlu."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Siere"
 
@@ -279,8 +300,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "disabilitât"
@@ -289,8 +310,8 @@ msgstr "disabilitât"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "abilitât"
@@ -303,53 +324,38 @@ msgstr "Interface:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "L'assistent al à configurât cun sucès i servizis DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Falât"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Torne a inviâ drakwizard, e cîr di mudâ cualchi parametri."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Tu âs di mudâ il to non di host."
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"Tu âs di mudâ il to non di domini. Par un server DNS tu âs bisugne di un non "
-"di domini valevul, diferent dal domini locâl o di vueit. Invie drakconnect "
-"par mudâlu."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Server DNS primari"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Server DNS secondari"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Zonte un host in DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Gjave un host in DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -357,11 +363,11 @@ msgstr ""
 "DNS (Server di non di domini) al è il servizi che al mape un recapit IP di "
 "une machine cunt' un non di host interni."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Assistent di configurazion di un server DNS primari"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -371,47 +377,47 @@ msgstr ""
 "configurazion a procurarâ un servizi locâl DNS par i nons dai computer "
 "locâls, e les domandis no locâlis e vignaran inviadis a un DNS esterni."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Ce vuelistu fa:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Server DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(No tu âs bisugne di zontâ il domini daspò dal non)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP dal server:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Non di domini NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Sielç di cheste liste il host che tu vuelis rimovi."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Rimôf un host di une configurazion DNS esistint."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Rimôf host:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Non dal Computer:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -420,11 +426,11 @@ msgstr ""
 "Un server di non secondari al rint plui lisêr il lavôr di chel primari, e "
 "tal câs che il primari no si podedi cjatâ, al fâs ancje il backup."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Recapit IP dal server DNS primari:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -432,11 +438,11 @@ msgstr ""
 "Il reinstradament al ven dome par les domandis par les cuâl il server nol è "
 "competent e nol à le rispueste te so cache."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Recapit IP par il reinstradament"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -444,15 +450,15 @@ msgstr ""
 "Se tu âs bisugne e tu cognossis il recapit IP dal server di reinstradament, "
 "insedilu, altrimentri lasse vueit"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS esterni:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Zonte un domini di ricercje"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -460,7 +466,7 @@ msgstr ""
 "Il non di domini di chest server al è zontât automatichementri, e no tu âs "
 "bisugne di zontâlu chi."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -472,28 +478,28 @@ msgstr ""
 "possibil mudâlu insedant il percors di ricercje sielzût daspò de clâf di "
 "ricercje"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Non di domini predefinît di cirî:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Ches nol è un recapit IP valevul par il reinstradament... frache prossin par "
 "continuâ"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Chest nol è un recapit valit di un server DNS primari... frache prossin par "
 "continuâ"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Chest nol è un recapit IP valevul... frache prossin par continuâ"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -501,11 +507,11 @@ msgstr ""
 "Al somee che l'host al sedi dizà te to configurazion DNS... frache prossin "
 "par continuâ"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Fal:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -513,7 +519,7 @@ msgstr ""
 "Al somee che chest nol sedi present te to configurazion DNS... frache "
 "prossin par continuâ"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -521,72 +527,72 @@ msgstr ""
 "Al somee che nissun server DNS al sedi stât impostât a mieç dal assistent. "
 "Par plasê invie l'assistent DNS: DNS server primari."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Al somee che il server DNS nol sedi primari, cussì no pues zontâ/rimovi "
 "l'host."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 "L'assistent al crearâ cumò le to configurazion dal server DNS secondari"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "cun cheste configurazion:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Il client cun chest identificatîf al vignarâ zontât al to DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Non dal computer:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Recapit IP dal computer:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Il client cun chest identificatîf al vignarâ rimovût dal to DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Il sever DNS al sta par sedi configurât cun chescj valôrs"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Non host dal server:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Non di domini:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "L'assistent al à zontât l'host tal to DNS cun sucès."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "L'assistent al à rimovût l'host dal to DNS cun sucès."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "L'assistent al à configurât il servizi DNS dal to server cun sucès."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Par plasè torne a inviâ drakwizard, e cîr di cambiâ cualchi parametri."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "O configuri il to sisteme sicu server DNS primari ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "O configuri il to sisteme sicu DNS server secondari ..."
 
@@ -614,7 +620,7 @@ msgstr "Server Mail"
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Server Samba"
 
@@ -639,7 +645,7 @@ msgstr "Mapadûre autofs dal server NIS"
 msgid "Mandrakelinux Install server"
 msgstr "Server di installazion Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Server Kolab"
 
@@ -665,7 +671,7 @@ msgstr ""
 "%s nol è instalât\n"
 "Frache \"Prossin\" par instalâlu o \"Scancele\" par jessî"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalazion falade"
 
@@ -917,15 +923,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Assistent di configurazion Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Tu âs di justâ il non di domini, in maniere che al sedi diferent di "
-"\"localdomain\" o nissun. Par plasè, invie drakconnect par cambiâlu."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -936,7 +934,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:59
+#: ../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 "
@@ -946,39 +944,39 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Benvignût  tal assistent di configurazion dal server Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Insede le password par l'account dal aministratôr dial server Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Password no corispondent, o password vueide, par plasè, juste."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Password ancjemò:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Non host:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Domini mail:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -986,259 +984,245 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instalazion in vore"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "O stoi configurant il server Kolab tal to sisteme..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Assistent Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Tu âs di mudâ il to non di domini. Par un server LDAP tu âs bisugne di un "
-"non di domini valevul, diferent dal domini locâl o di vueit. Invie "
-"drakconnect par mudâlu."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Assistent di configurazion LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "Zonte - Zonte une vôs tal server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Assistent di configurazion LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Assistent di configurazion LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Sielç un server PXE."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Configurazion dal server di instalazion"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Non utent:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Non:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Non utent:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Contenidôr:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Password"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Password ancjemò:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Le password no corispuint"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "O configuri Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Non di domini: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Non di domini: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Cartele TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Cartele TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Password ancjemò:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Cartele TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Non:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Non utent:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "O configuri il server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Contenidôr:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "L'assistent al à configurât LDAP cun sucès."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Dâts zontâts cun sucès"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Zonte - Zonte une vôs tal server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "L'assistent al à configurât cun sucès il to server Samba."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Falât"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Fal"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Assistent News"
@@ -1373,13 +1357,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Cartele:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Il percôrs che tu âs insedât nol esist."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Control di acès"
 
@@ -1433,28 +1417,20 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "L'assistent al à configurât cun sucès il to server NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Tu âs di justâ il to non di domini NIS. Par un server NIS tu âs bisugne di "
-"un non di domini NIS just, no compagn al domini locâl e no vueit."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Server NIS cun mape autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Imposte un server NIS cun mape autofs, file auto.home e auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1462,28 +1438,28 @@ msgstr ""
 "I utents e montin automatichementri le lôr cartele home dal server, cuant "
 "che jentrin int'une rêt di clients NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Ce âstu voe di fâ?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Configure il computer par cal sedi un client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Tu âs juste di insedâ il non e server NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Server NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Domini NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1493,7 +1469,7 @@ msgstr ""
 "L'assistent al cree ancje mapis autofs, par fâ si che l'utent NIS al podedi "
 "montâ automatichementri le so cartele home su un client NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1501,41 +1477,41 @@ msgstr ""
 "Home NIS: cartele base di home par i utents dal server NIS. Cheste cartele e "
 "vignarâ espuartade a mieç dal server NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Domini NIS: domini NIS di doprâ (di solit compagn dal non di domini DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Server NIS: non dal to computer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Non di domini NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "L'assistent al impostarâ il to server NIS cun le mape autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Cartele NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Non di domini NIS: non dal domini NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Server NIS: non di host dal server NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1543,24 +1519,24 @@ msgstr ""
 "Il demon YPBIND al cjate i server pai dominis NIS e al ten les informazions "
 "di binding di NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Fal: e vares di sedi une cartele."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Fal: il non di domini nis nol vares di sedi 'nissun' o 'domini locâl'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Par plasê, juste."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "L'assistent al à configurât cun sucès le to machine par sedi un client NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1568,15 +1544,15 @@ msgstr ""
 "L'assistent al à configurât cun sucès le to machine par sedi un server NIS "
 "cun mape autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "O configuri il to sisteme par sedi un server NIS cun mape autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS cun mape autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "O configuri il to sisteme sicu client NIS ..."
 
@@ -1944,7 +1920,7 @@ msgstr ""
 "to proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1976,6 +1952,14 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Assistent 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."
+msgstr ""
+"Tu âs di justâ il non di domini, in maniere che al sedi diferent di "
+"\"localdomain\" o nissun. Par plasè, invie drakconnect par cambiâlu."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Sielç il server PXE"
@@ -2349,24 +2333,24 @@ msgstr "O configuri il server PXE tal to sisteme..."
 msgid "PXE server"
 msgstr "Server PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Assistent Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s nol esist."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Ducj - nissune restrizion di acès"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mês regulis - domandimi hosts permitûts e dineâs"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2374,37 +2358,37 @@ msgstr ""
 "Samba al permet al to server  di compuartâsi sicu server di stampe e di file "
 "par workstations no Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Assistent di configurazion Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Chest assistent a ti judarà a configurâ i servizis Samba dal to server."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba al à bisugne di savê cuâl Grop di lavôr Windows al servissarà."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grop di lavôr"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grop di lavôr:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Il grop di lavôr nol è valevul"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Intestadure dal server."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2412,19 +2396,19 @@ msgstr ""
 "Le intestadure e je le maniere che chest server al è descrivût tes "
 "workstation di Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Intestadure:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Le intestadure dal server no je valevule"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nivel di acès:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2432,7 +2416,7 @@ msgstr ""
 "* Esempli 1: abilite ducj i IP in 150.203.*.*; fûr che un\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2441,7 +2425,7 @@ msgstr ""
 "specificade\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2449,7 +2433,7 @@ msgstr ""
 "* Esempli 3: abilite une copie di host\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2461,23 +2445,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Viôt che l'acès al domande ancjemò une password a nivel utent juste."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Abilite host:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Dinee host:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Abilite servizis Samba"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2487,19 +2471,19 @@ msgstr ""
 "workstation Windows, e ancje une condivision di stampant pes stampantis "
 "leadis al to server."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Abilite le aree di condivision file"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Abilite condivision dal server di stampe"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Fas deventâ le cartelis home disponibilis par i lôr parons"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2507,28 +2491,28 @@ msgstr ""
 "Tu âs sielzût di permeti l'acès dai utent tes lôr cartelis home a mieç di "
 "samba ma tu âs/e an di doprâ smbpasswd par impostâ une password."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Cartele condividude:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Insede il percors de cartele che tu vuelis che sedi condividude."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permès file"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2538,61 +2522,61 @@ msgstr ""
 "precedûts di une '@') sicu:\n"
 "root, fred, @utents, @ruede par ductis les sortis di permès."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Liste lei:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred @utents, @ruede"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Liste scrîf:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Sielç cuâlis stampantis tu vuelis che sedin disponibilis par i utents "
 "cognossûs"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Abilite dutis les stampantis"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "O configuri Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "L'assistent al à cjatât chescj parametris par configurâ Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Intestadure dal server:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Condivision file:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Server di stampe:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Home:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Stampantis:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "L'assistent al à configurât cun sucès il to server Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "O configuri il to server Samba..."
 
@@ -2829,6 +2813,30 @@ msgstr "Server Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "O configuri il to sisteme sicu server Apache ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Tu âs di mudâ il to non di host."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Tu âs di mudâ il to non di domini. Par un server LDAP tu âs bisugne di un "
+#~ "non di domini valevul, diferent dal domini locâl o di vueit. Invie "
+#~ "drakconnect par mudâlu."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Non utent:"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Tu âs di justâ il to non di domini NIS. Par un server NIS tu âs bisugne "
+#~ "di un non di domini NIS just, no compagn al domini locâl e no vueit."
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "O configuri il server DHCP"
diff --git a/po/gl.po b/po/gl.po
index e0ef8b87..59a85a85 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:34+0100\n"
-"PO-Revision-Date: 2004-10-15 21:12+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
+"PO-Revision-Date: 2004-12-18 18:24+0100\n"
 "Last-Translator: Leandro Regueiro <unho@gulo.org>\n"
 "Language-Team: Galician\n"
 "MIME-Version: 1.0\n"
@@ -21,31 +21,31 @@ msgstr "asistente de configuración"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Advertencia."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Erro."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Noraboa"
 
@@ -86,50 +86,50 @@ msgstr "Este asistente axudaralle a engadir un novo cliente ó seu DNS local."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(non é preciso escribi-lo dominio despois do nome)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identificación do cliente:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nome da máquina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Enderezo IP da máquina:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Advertencia"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erro"
@@ -174,14 +174,27 @@ msgstr "IP do cliente:"
 msgid "The wizard successfully added the client."
 msgstr "O asistente engadiu o cliente con éxito."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 #, fuzzy
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "O comando ainda se está executando. ¿Desexa matalo e saír do Asistente?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Pechar"
 
@@ -212,6 +225,9 @@ msgid ""
 "eXecution Environment, a protocol that allows computers to boot through the "
 "network)."
 msgstr ""
+"Se desexa activar PXE no seu servidor DHCP marque o cadro (Pre-boot "
+"eXecution Environment, un protocolo que lles permite ós ordenadores arrincar "
+"a través da rede)."
 
 #: ../dhcp_wizard/Dhcp.pm:72
 msgid "Range of addresses used by DHCP"
@@ -236,13 +252,12 @@ msgid "Highest IP address:"
 msgstr "Enderezo IP superior:"
 
 #: ../dhcp_wizard/Dhcp.pm:84 ../dhcp_wizard/Dhcp.pm:117
-#, fuzzy
 msgid "Gateway IP address:"
 msgstr "Enderezo IP da pasarela:"
 
 #: ../dhcp_wizard/Dhcp.pm:85 ../dhcp_wizard/Dhcp.pm:119
 msgid "Enable PXE:"
-msgstr ""
+msgstr "Activar PXE:"
 
 #: ../dhcp_wizard/Dhcp.pm:95
 msgid "The IP range specified is not correct."
@@ -272,8 +287,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "deshabilitado"
@@ -282,8 +297,8 @@ msgstr "deshabilitado"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "habilitado"
@@ -296,149 +311,139 @@ msgstr "Interface:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "O asistente configurou con éxito os servicios DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Fallou"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Volva executar drakwizard, e intente cambiando algúns parámetros."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Servidor DNS Mestre"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Servidor DNS Escravo"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 #, fuzzy
 msgid "Add host in DNS"
-msgstr "Engadir unha máquina no DNS"
+msgstr "Engadir unha máquina ó DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "Eliminar unha máquina do DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
+"DNS (Domain Name Server) é o servicio que convirte un enderezo IP dunha "
+"máquina nun nome de máquina de internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Asistente de configuración do DNS Mestre"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Qué desexa facer:"
 
-#: ../dns_wizard/Bind.pm:126
-#, fuzzy
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
-msgstr "Servidor DNS"
+msgstr "Interface do servidor DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Non cómpre engadi-lo dominio despois do nome)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
-#, fuzzy
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
-msgstr "IP do servidor:"
+msgstr "Servidor:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
-#, fuzzy
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
-msgstr "Nome do dominio:"
+msgstr "Nome do dominio DNS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Escolla a máquina que desexa eliminar da seguinte lista."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
-msgstr ""
+msgstr "Eliminar máquina:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Nome do Ordenador:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Enderezo IP do servidor DNS mestre:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
-msgstr ""
+msgstr "DNS externo:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
+"O nome de dominio deste servidor engádese automáticamente, e non cómpre "
+"engadilo aquí."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -446,110 +451,113 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Isto non é un enderezo IP correcto... prema seguinte para continuar"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
+"Semella ser que esta máquina xa está na configuración do seu DNS... prema "
+"seguinte para continuar"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "con esta configuración:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Enderezo IP do ordenador:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
-msgstr ""
+msgstr "O cliente con esta identificación eliminarase do seu DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
+"O servidor DNS está a piques de ser configurado ca seguinte configuración"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
-msgstr ""
+msgstr "Nome de Máquina do Servidor:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Nome do dominio:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "O asistente engadiu con éxito a máquina ó DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "O asistente eliminou con éxito a máquina do DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "O asistente configurou con éxito o servicio DNS do seu servidor."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Volva executar drakwizard, e intente cambiar algúns dos parámetros."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurando o seu sistema coma un servidor DNS Mestre ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurando o seu sistema coma un servidor DNS Escravo ..."
 
@@ -577,7 +585,7 @@ msgstr "Servidor de Correo-e"
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Servidor Samba"
 
@@ -601,7 +609,7 @@ msgstr ""
 msgid "Mandrakelinux Install server"
 msgstr "Servidor de Instalación de Linux Mandrake"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -626,7 +634,7 @@ msgstr ""
 "%s non está instalado\n"
 "Prema \"Seguinte\" para instalalo ou \"Cancelar\" para saír"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Fallo na instalación"
 
@@ -710,6 +718,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:106
 msgid "You are in DHCP, server may not work with your configuration."
 msgstr ""
+"Está usando DHCP, e pode ser que o seu servidor non funcione ca súa "
+"configuración."
 
 #: ../ftp_wizard/Proftpd.pm:111
 msgid ""
@@ -828,19 +838,20 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:81
 msgid "The destination directory is already in use. Please choose another one."
-msgstr ""
+msgstr "O directorio de destion xa se está usando. Escolla outro."
 
 #: ../installsrv_wizard/Installsrv.pm:85
 msgid "Your install server will be configured with these parameters"
 msgstr ""
+"Vaise configurar o seu servidor de instalación cos seguintes parámetros"
 
 #: ../installsrv_wizard/Installsrv.pm:93
 msgid "Enable NFS install server:"
-msgstr ""
+msgstr "Activar o servidor de instalación NFS:"
 
 #: ../installsrv_wizard/Installsrv.pm:94
 msgid "Enable HTTP install server:"
-msgstr ""
+msgstr "Activar o servidor de instalación HTTP:"
 
 #: ../installsrv_wizard/Installsrv.pm:100
 msgid "Configuring your system, please wait..."
@@ -852,18 +863,15 @@ msgid ""
 "configure a DHCP server with PXE support, and a PXE server. So it will be "
 "very easy to install Mandrakelinux through a network."
 msgstr ""
+"Noraboa, o servidor de Instalación de Mandrakelinux está preparado. Agora "
+"pode configurar un servidor DHCP con soporte PXE, e un servidor PXE. Así "
+"será moi sinxelo instalar Mandrakelinux a través dunha rede."
 
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
 msgstr "Asistente de configuración de Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -871,276 +879,272 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
+"Advertencia: Kolab necesita configurar outros servicios: Proftpd, LDAP, "
+"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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
-msgstr ""
+msgstr "Introduza o contrasinal para a conta manager do servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
-msgstr ""
+msgstr "Os contrasinais non coinciden ou non hai contrasinal, corríxao."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Contrasinal outra vez:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
-msgstr ""
+msgstr "O asistente vai configurar o servidor Kolab con estes parámetros"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
-msgstr ""
+msgstr "Nome de máquina:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instalando"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Instalando o servidor Kolab no seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor Kolab do seu sistema..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Asistente Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Amosa-la configuración de Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Engadir un usuario no servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Elimina-la configuración de Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
-msgstr ""
+msgstr "LDAP significa Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Asistente de configuración de Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
-msgstr ""
+msgstr "Primeiro debe configurar un servidor Ldap."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Elimina-la configuración"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
-msgstr ""
+msgstr "Nome de Usuario:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Debe introducir un Nome válido."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
-msgstr ""
+msgstr "Debe introducir un Nome de Usuario válido."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Contrasinal de usuario LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "os contrasinais deben coincidir"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Contrasinal (outra vez):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Debe introducir un contrasinal para LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrador,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Configurando o Servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Nome do dominio:"
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Nome do dominio:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Administrador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
-msgstr ""
+msgstr "Árbore de directorios LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
-msgstr ""
+msgstr "Árbore de directorios LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Administrador LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Contrasinal LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Contrasinal LDAP (outra vez):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
-msgstr ""
+msgstr "Debe introducir unha árbore de directorios LDAP válida."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
-msgstr ""
+msgstr "Nome de Usuario:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "O asistente configurou o LDAP con éxito."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "O Usuario engadiuse con éxito"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Erro ó engadi-lo usuario á base de datos de Ldap"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "O servidor xa está configurado"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Xa configurou o seu Servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "Fallou %s"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Erro!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Non se puido conectar a %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Asistente de Novas"
@@ -1169,6 +1173,8 @@ 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 ""
+"O nome do servidor de novas é o nome da máquina que proporciona as novas de "
+"Internet á súa rede; normalmente o seu provedor proporcionaralle o nome."
 
 #: ../news_wizard/Inn.pm:54
 msgid "News server name:"
@@ -1212,6 +1218,8 @@ msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News service:"
 msgstr ""
+"O asistente recolleu os seguintes parámetros necesarios para configurar o "
+"seu servicio de Novas de Internet:"
 
 #: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
 msgid ""
@@ -1271,13 +1279,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directorio:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "A ruta que introduciu non existe."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Control de acceso"
 
@@ -1308,7 +1316,7 @@ msgstr ""
 
 #: ../nfs_wizard/NFS.pm:88
 msgid "The wizard collected the following parameters."
-msgstr ""
+msgstr "O asistente recolleu os seguintes parámetros:"
 
 #: ../nfs_wizard/NFS.pm:94
 msgid "Exported dir:"
@@ -1326,135 +1334,130 @@ msgstr "Máscara de rede:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "O asistente configurou con éxito o seu servidor NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "¿Que desexa facer?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Servidor NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Dominio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Erro: debe ser un directorio."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
+"O asistente configurou con éxito a súa máquina para ser un cliente NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Configurando o seu sistema coma un cliente NIS ..."
 
@@ -1487,6 +1490,8 @@ msgid ""
 "This wizard will help you configure an internal mail server for your "
 "network, or configure an external mail server."
 msgstr ""
+"Este asistente axudaralle a configurar un servidor de correo interno para a "
+"súa rede, ou un servidor de correo externo."
 
 #: ../postfix_wizard/Postfix.pm:82
 msgid ""
@@ -1538,6 +1543,8 @@ msgid ""
 "Error, sendmail is installed. Please remove it before installing or "
 "configuring Postfix"
 msgstr ""
+"Erro, está instalado o Sendmail. Elimíneo antes de instalar ou configurar "
+"Postfix"
 
 #: ../postfix_wizard/Postfix.pm:108
 msgid ""
@@ -1558,7 +1565,7 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
-msgstr ""
+msgstr "Nome do servidor de correo:"
 
 #: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
@@ -1609,7 +1616,7 @@ msgstr "Servidor Postfix"
 
 #: ../postfix_wizard/Postfix.pm:170
 msgid "removing Sendmail to avoid conflict...."
-msgstr ""
+msgstr "eliminando o Sendmail para evitar conflictos..."
 
 #: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:265
 msgid "Configuring your Postfix server....."
@@ -1617,7 +1624,7 @@ msgstr "Configurando o seu servidor Postfix..."
 
 #: ../proxy_wizard/Squid.pm:41
 msgid "Localhost - access restricted to this server only"
-msgstr ""
+msgstr "Localhost - acceso restrinxido só a este servidor"
 
 #: ../proxy_wizard/Squid.pm:44
 msgid "No upper level proxy (recommended)"
@@ -1784,7 +1791,7 @@ msgstr ""
 "configurar o seu proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1816,6 +1823,12 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Asistente de 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."
+msgstr ""
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr ""
@@ -1883,7 +1896,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:142
 msgid "Add all.rdz boot image"
-msgstr ""
+msgstr "Engadir a imaxe de arrinque all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:142
 msgid ""
@@ -1894,7 +1907,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:142
 msgid "Path to all.rdz: provide the full path to all.rdz image"
-msgstr ""
+msgstr "Ruta a all.rdz: proporcione a ruta completa á imaxe all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:142
 msgid ""
@@ -1947,10 +1960,12 @@ msgstr ""
 msgid ""
 "Install directory: the full path to Mandrakelinux install server directory"
 msgstr ""
+"Directorio de instalación: a ruta completa ó directorio do servidor de "
+"instalación de Mandrakelinux"
 
 #: ../pxe_wizard/Pxe.pm:170
 msgid "Installation method: choose NFS or HTTP."
-msgstr ""
+msgstr "Método de instalación: escolla NFS ou HTTP."
 
 #: ../pxe_wizard/Pxe.pm:170
 msgid ""
@@ -1978,10 +1993,13 @@ msgid "ACPI option: Advanced Configuration and Power Interface"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
+#, fuzzy
 msgid ""
 "Network client interface: the network interface used for the installation "
 "process."
 msgstr ""
+"Interface de rede do cliente: a interface de rede que se usará para o "
+"proceso de instalación."
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "Ramsize: adjust the ramsize parameter on boot image."
@@ -1992,8 +2010,9 @@ msgid "VGA option: if you encounter any problem with VGA, please adjust. "
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:182 ../pxe_wizard/Pxe.pm:254
+#, fuzzy
 msgid "Network client interface:"
-msgstr ""
+msgstr "Interface de rede do cliente:"
 
 #: ../pxe_wizard/Pxe.pm:183 ../pxe_wizard/Pxe.pm:255
 msgid "Ramsize:"
@@ -2067,7 +2086,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:229 ../pxe_wizard/Pxe.pm:233
 msgid "Please provide another one."
-msgstr ""
+msgstr "Proporcione outro."
 
 #: ../pxe_wizard/Pxe.pm:237
 msgid "The wizard will now prepare all default files to set your PXE server"
@@ -2079,7 +2098,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:240
 msgid "Boot image path:"
-msgstr ""
+msgstr "Ruta da imaxe de arrinque:"
 
 #: ../pxe_wizard/Pxe.pm:241
 msgid "PXE 'default' file:"
@@ -2119,34 +2138,34 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:325
 msgid "The wizard successfully configured your PXE server."
-msgstr ""
+msgstr "O asistente configurou con éxito o servidor PXE."
 
 #: ../pxe_wizard/Pxe.pm:624
 msgid "Configuring PXE server on your system..."
-msgstr ""
+msgstr "Configurando un servidor PXE no seu sistema..."
 
 #: ../pxe_wizard/Pxe.pm:624
 msgid "PXE server"
 msgstr "Servidor PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Asistente de Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s non existe."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2154,73 +2173,73 @@ msgstr ""
 "Samba permítelle ó seu servidor comportarse coma un servidor de ficheiros e "
 "de impresión para estacións de traballo que usan Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Asistente de configuración de Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Este asistente axudaralle a configurar os servicios Samba do seu servidor."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba necesita saber a que Grupo de Traballo Windows vai servir."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grupo de traballo"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grupo de traballo:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "O grupo de traballo é incorrecto"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2228,23 +2247,23 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Os servicios Samba están activados"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2254,105 +2273,108 @@ msgstr ""
 "súas estacións de traballo Windows, e tamén pode compartir as impresoras "
 "conectadas ó seu servidor."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Directorio compartido:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Escriba a ruta do directorio que desexa compartir."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Crear o directorio compartido se non existe"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Fallo ó vrea-lo directorio."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permisos dos ficheiros"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
+"Introduza os usuario ou grupos separados por comas (os grupos deben comezar "
+"por '@') así:\n"
+"root, perico, @usuarios, @outrogrupo  para cada tipo de permiso."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
-msgstr ""
+msgstr "Lista de lectura:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
-msgstr ""
+msgstr "root, perico, @usuarios, @outrogrupo"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
-msgstr ""
+msgstr "Lista de escritura:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
-msgstr ""
+msgstr "Seleccione a que impresoras deixará que accedan os usuarios coñecidos"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
-msgstr ""
+msgstr "Habilitar tódalas impresoras"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Configurando Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "O asistente reuniu os seguintes parámetros para configurar Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Servidor de impresión:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Impresoras:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "O asistente configurou con éxito o seu servidor Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Configurando o seu servidor Samba..."
 
@@ -2366,7 +2388,7 @@ msgstr "Inténteo de outra vez"
 
 #: ../time_wizard/Ntp.pm:61
 msgid "Save config without test"
-msgstr ""
+msgstr "Gardar a configuración sen probala"
 
 #: ../time_wizard/Ntp.pm:82
 msgid ""
@@ -2514,6 +2536,10 @@ msgid ""
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
+"* Módulo de usuario: permítelle ós usuario ter un directorio nos seus "
+"directorios persoais dispoñible no seu servidor http escribindo http://www."
+"oseuservidor.com/~usuario nun navegador, preguntaráselle o nome deste "
+"directorio máis tarde."
 
 #: ../web_wizard/Apache.pm:90
 msgid "Modules:"
@@ -2524,24 +2550,31 @@ msgid ""
 "Allows users to get a directory in their home directories \n"
 "available on your http server via http://www.yourserver.com/~user."
 msgstr ""
+"Permitir que os usuarios teñan un directorio nos seus directorios persoais \n"
+"dispoñible no seu servidor http escribindo http://www.oseuservidor.com/"
+"~usuario."
 
 #: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:103
 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 ""
+"Introduza o nome do directorio que os usuarios deben crear nos seus "
+"directorios persoais (sen ~/) para que se poida acceder a el escribindo "
+"http://www.oseuservidor.com/~usuario"
 
 #: ../web_wizard/Apache.pm:103
 msgid "user http sub-directory: ~/"
-msgstr ""
+msgstr "sub-directorio http do usuario: ~/"
 
 #: ../web_wizard/Apache.pm:108
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
+"Introduza a ruta do directorio que quere que sexa a raíz dos documentos."
 
 #: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
 msgid "Document root:"
-msgstr ""
+msgstr "Raíz dos documentos:"
 
 #: ../web_wizard/Apache.pm:131
 msgid "Configuring the Web server"
@@ -2565,7 +2598,7 @@ msgstr "Servidor web de Internet:"
 
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
-msgstr ""
+msgstr "Directorio de usuario:"
 
 #: ../web_wizard/Apache.pm:147
 msgid "The wizard successfully configured your intranet/Internet Web server"
@@ -2579,3 +2612,12 @@ msgstr "Servidor Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando o seu sistema coma servidor Apache..."
+
+#~ msgid "Administrator"
+#~ msgstr "Administrador"
+
+#~ msgid "Domain name: "
+#~ msgstr "Nome do dominio:"
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Non se puido conectar a %s"
diff --git a/po/he.po b/po/he.po
index a7bcda10..e1fe1b68 100644
--- a/po/he.po
+++ b/po/he.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-12-24 21:59+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <mdk-hebrew@iglu.org.il>\n"
@@ -28,31 +28,31 @@ msgstr "אשף הגדרות"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "אזהרה."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "שגיאה"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "איחולי"
 
@@ -68,7 +68,8 @@ msgstr "עליך להריץ בשלב ראשון את אשף שרת ה DNS"
 msgid ""
 "A client of your local network is a machine connected to the network having "
 "its own name and IP address."
-msgstr "לקוח ברשת המקומית שלך הוא מחשב המחובר לרשת ואשר יש לו שם וכתובת IP משלו."
+msgstr ""
+"לקוח ברשת המקומית שלך הוא מחשב המחובר לרשת ואשר יש לו שם וכתובת IP משלו."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
@@ -78,7 +79,8 @@ msgstr "יש לבחור 'המשך' בכדי להתחיל, או 'ביטול' בכ
 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 "השרת ישתמש במידע המוכנס כאן על מנת לפרסם את שם הלקוח למחשבים אחרים ברשת שלך."
+msgstr ""
+"השרת ישתמש במידע המוכנס כאן על מנת לפרסם את שם הלקוח למחשבים אחרים ברשת שלך."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
@@ -88,17 +90,17 @@ msgstr "אשף זה יעזור לך להוסיף לקוח חדש ל-DNS המקו
 msgid "(you don't need to type the domain after the name)"
 msgstr "(אין צורך בהקלדת מרחב הכתובות [domain] לאחר השם)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "זיהוי לקוח:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "יש להקפיד על כך שכתובת ה-IP ושם הלקוח יהיו ייחודיים ברשת."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -107,33 +109,33 @@ msgstr ""
 "הלקוח שלך ברשת יזוהה לפי שם כדלהלן: clientname.company.net. לכל מחשב ברשת "
 "חייבת להיות כתובת IP (ייחודית) בהתאם לתחביר המקובל."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "שם המחשב:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "כתובת IP של המחשב:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "אזהרה"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "הנך בהגדרת DHCP, השרת עלול שלא לעבוד עם תצורה זו."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "שגיאה"
@@ -176,11 +178,34 @@ msgstr "כתובת IP של הלקוח:"
 msgid "The wizard successfully added the client."
 msgstr "האשף הוסיף את הלקוח בהצלחה."
 
-#: ../common/Wizcommon.pm:86
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"עליך לתקן את שם מתחם שלך. עבור שרת DNS יש להגדיר שם מתחם תקין, שאינו זהה ל-"
+"localdomain וכמו כן אסור להגדיר שם ריק. שם המחשב המארח חייב להתאים לתקן "
+"Fully Qualified Domain Name - FQDN. עליך להפעיל את האשף drakconnect בכדי "
+"לתקן הגדרות אלו."
+
+#: ../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."
+msgstr ""
+"עליך לתקן את שם מתחם שלך. עבור שרת DNS יש להגדיר שם מתחם תקין, שאינו זהה ל-"
+"localdomain וכמו כן אסור להגדיר שם ריק. שם המחשב המארח חייב להתאים לתקן "
+"Fully Qualified Domain Name - FQDN. עליך להפעיל את האשף drakconnect בכדי "
+"לתקן הגדרות אלו."
+
+#: ../common/Wizcommon.pm:98
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "הפקודה עדיין מתבצעת. האם ברצונך להפסיק את ביצועה ולצאת מהאשף?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "סגירה"
 
@@ -267,8 +292,8 @@ msgstr "אשף זה אסף את הנתונים הבאים אשר נדרשים ל
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "חסום"
@@ -277,8 +302,8 @@ msgstr "חסום"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "מאופשר"
@@ -291,53 +316,38 @@ msgstr "ממשק:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרותי DHCP של השרת שלך."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "נכשל"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "עליך להריץ מחדש את drakwizard, ולנסות לשנות מספר הגדרות."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "יש להגדיר מחדש את שם המחשב (hostname)."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"עליך לתקן את שם מתחם שלך. עבור שרת DNS יש להגדיר שם מתחם תקין, שאינו זהה ל-"
-"localdomain וכמו כן אסור להגדיר שם ריק. שם המחשב המארח חייב להתאים לתקן "
-"Fully Qualified Domain Name - FQDN. עליך להפעיל את האשף drakconnect בכדי "
-"לתקן הגדרות אלו."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "שרת DNS ראשי"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "שרת DNS משני"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "הוספת לקוח ל DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "מחיקת לקוח מה DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -345,11 +355,11 @@ msgstr ""
 "שרות ה-DNS (ראשי תיבות של שרת  שמות מרחבי כתובות) ממפה כתובת IP של מכונה לשם "
 "אתר באינטרנט."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "אשף הגדרת DNS ראשי"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -359,44 +369,44 @@ msgstr ""
 "עבור שמות מחשבים מקומיים, כאשר בקשות לכתובות שאינן מקומיות יופנו לשרת DNS "
 "חיצוני."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "מה ברצונך לעשות:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "ממשק שרת DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(אין צורך להקליד את מרחב הכתובות [domain] לאחר השם)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "שרת:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "שם מתחם DNS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "עליך לבחור את הלקוח שיש להסיר מהרשימה הבאה."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "הסרת לקוח מתצורת DNS נוכחית."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "הסרת לקוח:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "שם המחשב:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -405,11 +415,11 @@ msgstr ""
 "שרת כתובות משני יפחית את העומס משרת הכתובות הראשי, וגם ישמש כשרת גיבוי, "
 "למקרה בו שרת הכתובות הראשי שלך אינו נגיש."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "כתובת IP של שרת DNS ראשי:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -417,11 +427,11 @@ msgstr ""
 "העברה תתבצע רק עבור שאילתות שהשרת אינו מוסמך לענות עליהן ואין עבורן תשובה "
 "זמינה במטמון."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "כתובת IP של המעביר"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -429,21 +439,21 @@ msgstr ""
 "עליך להגדיר את כתובת ה IP של המעביר אם יש לך צורך בו והיא ידועה לך, אחרת "
 "עליך להשאיר ערך ריק "
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS חיצוני:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "הוספת מתחם חיפוש"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr "שם המתחם של שרת זה הוא הוסף אוטומטי, ואין צורך להוסיף אותו כאן."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -454,107 +464,114 @@ msgstr ""
 "המחדל כוללת רק את שם המחשב המקומי. יש באפשרותך לשנות זאת על ידי ציון נתיב "
 "חיפוש השמות לאחר מילת החיפוש"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "שם מתחם ברירת מחדל לחיפוש:"
 
-#: ../dns_wizard/Bind.pm:182
-msgid "This is not a valid IP address for your forwarder... press next to continue"
-msgstr "כתובת IP זו אינה כתובת תקינה עבור המעביר... עליך לבחור \"הבא\" על מנת להמשיך"
+#: ../dns_wizard/Bind.pm:176
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
+msgstr ""
+"כתובת IP זו אינה כתובת תקינה עבור המעביר... עליך לבחור \"הבא\" על מנת להמשיך"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "כתובת IP זאת אינה חוקית עבור DNS ראשי... נא לבחור \"המשך\" בכדי להתקדם"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "כתובת IP זאת אינה חוקית... נא לבחור \"המשך\" בכדי להתקדם"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
-msgstr "נראה כי הלקוח כבר מופיע בתצורת ה DNS שלך... עליך לבחור \"הבא\" בכדי להמשיך"
+msgstr ""
+"נראה כי הלקוח כבר מופיע בתצורת ה DNS שלך... עליך לבחור \"הבא\" בכדי להמשיך"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "שגיאה:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
-msgstr "נראה כי ערך זה אינו מופיע בתצורת ה DNS שלך... עליך לבחור \"הבא\" בכדי להמשיך"
+msgstr ""
+"נראה כי ערך זה אינו מופיע בתצורת ה DNS שלך... עליך לבחור \"הבא\" בכדי להמשיך"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
-msgstr "נראה כי לא הוגדר שרת DNS דרך אשף. עליך להפעיל את אשף ה DNS: שרת DNS ראשי."
+msgstr ""
+"נראה כי לא הוגדר שרת DNS דרך אשף. עליך להפעיל את אשף ה DNS: שרת DNS ראשי."
 
-#: ../dns_wizard/Bind.pm:217
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+#: ../dns_wizard/Bind.pm:211
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "נראה כי אינך שרת ה DNS הראשי, אלא רק דרת משני. לפיכך אין באפשרותך להוסיף/"
 "להוריד לקוח."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "האשף יגדיר כעת את תצורת ה DNS המשני"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "עם תצורה זו:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "הלקוח עם זיהוי זה יתווסף ל DNS שלך"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "שם המחשב:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "כתובת ה IP של המחשב:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "הלקוח עם זיהוי זה יוסר מה DNS שלך"
 
-#: ../dns_wizard/Bind.pm:249
-msgid "The DNS server is about to be configured with the following configuration"
+#: ../dns_wizard/Bind.pm:243
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "שרת ה DNS יוגדר עם התצורה הבאה"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "שם המחשב של השרת:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "מתחם כתובות:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "האשף הוסיף את הלקוח ל DNS שלך."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "האשף הסיר את הלקוח בהצלחה מה DNS שלך."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "אשף זה סיים להגדיר בהצלחה את שרות ה-DNS של השרת שלך."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "עליך להריץ מחדש את drakwizard, ולנסות לשנות מספר הגדרות."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "הגדרת המערכת שלך כשרת DNS ראשי ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "הגדרת המערכת שלך כשרת DNS משני ..."
 
@@ -582,7 +599,7 @@ msgstr "שרת דואר"
 msgid "FTP server"
 msgstr "שרת FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "שרת Samba"
 
@@ -606,7 +623,7 @@ msgstr "מפת autofs לשרת NIS"
 msgid "Mandrakelinux Install server"
 msgstr "שרת התקנה של מנדרייק-לינוקס"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "שרת Kolab"
 
@@ -631,7 +648,7 @@ msgstr ""
 "%s לא מותקן\n"
 "נא ללחוץ \"הבא\" בכדי להתקין, או \"ביטול\" כדי לצאת"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "ההתקנה נכשלה"
 
@@ -719,7 +736,8 @@ msgstr "הנך בהגדרת DHCP, השרת עלול שלא לעבוד עם הת�
 msgid ""
 "Please choose whether to allow a connection to FTP server from internal or "
 "external hosts."
-msgstr "נא לבחור האם לאפשר חיבור אל שרת FTP מלקוחות פנימיים או חיצוניים לרשת שלך."
+msgstr ""
+"נא לבחור האם לאפשר חיבור אל שרת FTP מלקוחות פנימיים או חיצוניים לרשת שלך."
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
@@ -810,7 +828,8 @@ msgstr "הגדרת שרת התקנה"
 msgid ""
 "Path to data: specify your source directory, should be base of a "
 "Mandrakelinux installation."
-msgstr "נתיב למידע: הגדרת ספריית המקור, אמורה להיות השורש של התקנת מנדרייק-לינוקס"
+msgstr ""
+"נתיב למידע: הגדרת ספריית המקור, אמורה להיות השורש של התקנת מנדרייק-לינוקס"
 
 #: ../installsrv_wizard/Installsrv.pm:73
 msgid "The destination directory could not be '/var/install/'"
@@ -861,15 +880,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "אשף הגדרת Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"יש צורך לעדכן את השם מתחם שלך. כרגע הוא localdomain או ללא שם. נא להריץ "
-"drajconnect לעדכון הערך הזה."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -881,7 +892,7 @@ msgstr ""
 "למשתמשי דואר אלקטרוני, כמו גם אנשי קשר וגישת POP3 ו IMAP (גרסה 1) לדואר "
 "אלקטרוני."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -890,39 +901,39 @@ msgstr ""
 "אזהרה: Kolab מחייב הגדרת שרותים רבים נוספים: Proftpd, LDAP, Cyrus, Postfix, "
 "Imap, Saslauth. האשף יגבה את קבצי התצורה הנוכחיים של שרותים אלו."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "ברוך בואך לאשף הגדרת השרת של המערכת לקבוצות עבודה Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "עליך להגדיר סיסמת חשבון מנהל עבור שרת Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "אין התאמה בין הסיסמאות, או הוגדרה סיסמה ריקה. עליך לתקן זאת."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "סיסמה:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "סיסמה (שוב):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "האשף יגדיר כעת את תצורת שרת Kolab לפי המאפיינים שהוגדרו"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "שם המחשב:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "מתחם הדוא\"ל:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -930,46 +941,35 @@ msgstr ""
 "שרת Kolab מוגדר ופועל כעת. עליך להתחבר למערכת בשם משתמש 'manager' עם הסיסמה "
 "שהגדרת בכתובת https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "ההתקנה מתבצעת כעת"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "מתקין שרת Kolab על המערכת שלך..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "הגדרת שרת Kolab על המערכת שלך..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "אשף Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"עליך לתקן את שם מתחם שלך. עבור שרת LDAP יש להגדיר שם מתחם תקין, שאינו זהה ל-"
-"localdomain וכמו כן אסור להגדיר שם ריק. שם המחשב המארח חייב להתאים לתקן "
-"Fully Qualified Domain Name - FQDN. עליך להפעיל את האשף drakconnect בכדי "
-"לתקן הגדרות אלו."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "הצג הגדרות LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "הוספת משתמש בשרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "הסרת תצורת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -977,190 +977,188 @@ msgstr ""
 "הינו פרוטוקול פשוט לגישה לשרותי מדריך, ובמיוחד שרותי מדריך המבוססים על "
 "פרוטוקול X.500"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP הוא ר\"ת של פרוטוקול גישה קליל לשרותי מדריך."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "אשף הגדרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "עליך להגדיר קודם שרת LDAP."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "בחירתך:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "מחיקת תצורה"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "הבסיס הקיים יישמר ב /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "הוספת משתמש LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "נוצר משתמש ב:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "נוצר משתמש ב: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "שם פרטי:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "שם:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "שם משתמש:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "עליך להגדיר שם פרטי תקין."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "עליך להגדיר שם תקין."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "עליך להגדיר שם משתמש תקין."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "סיסמת משתמש LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "הסיסמאות חייבות להיות זהות"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "סיסמה (שוב):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "עליך להגדיר סיסמה עבור ה LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "הסיסמאות לא תואמות"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "מנהל מערכת"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "מנהל המערכת הוא משתמש על בעל הרשאות גישה למסד נתוני ה LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "מנהל מערכת,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "הגדרת שרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "שם מתחם כתובות: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "שם מתחם כתובות: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "מנהל LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "עץ ספריות ה LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "הגדרת עץ ספריות הLDAP מבוצעת עם שמות DNS"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "עץ ספריות ה LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "מנהל LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "סיסמת LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "סיסמת LDAP (שוב):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "עליך להגדיר עץ ספריות LDAP תקין."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "אישור יצירת המשתמש"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "שם פרטי:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "שם משתמש:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "צור ב:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "אישרור מידע ליצירת שרת LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "מאגר משתמשים:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "המשתמש נוסף בהצלחה"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "חלה תקלה בעת הוספת משתמש לבסיס נתוני ה LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "השרת כבר מוגדר"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "כבר הגדרת את שרת הLDAP שלך"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s נכשל"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "שגיאה!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "אין אפשרות להתחבר ל%s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "אשף קבוצות דיון"
@@ -1201,7 +1199,8 @@ msgstr "שם שרת קבוצות הדיון:"
 msgid ""
 "Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
-msgstr "כתלות בסוג החיבור שלך לאינטרנט, תקופת התשאול האפשרית הוא בין 6 ועד 24 שעות."
+msgstr ""
+"כתלות בסוג החיבור שלך לאינטרנט, תקופת התשאול האפשרית הוא בין 6 ועד 24 שעות."
 
 #: ../news_wizard/Inn.pm:60
 msgid "Polling period"
@@ -1255,7 +1254,8 @@ msgid "Polling interval:"
 msgstr "מרווח שאילתה:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרות קבוצות הדיון בשרת שלך."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1291,13 +1291,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "ספריה:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "הספרייה בה בחרת אינה קיימת."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "בקרת גישה"
 
@@ -1350,55 +1350,48 @@ msgstr "מיסוך רשת (Netmask):"
 msgid "The wizard successfully configured your NFS server."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-NFS שלך"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"יש צורך לתקן את מתחם ה-NIS שלך. עבור שרת NIS יש צורך בשם מתחם NIS מתאים, שלא "
-"שווה ל-localdomain או שלא חסר שם."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "שרת NIS עם מפת Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "לקוח NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "הגדרת שרת NIS עם מפת autofs וקבצי auto.home ו auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
-msgstr "ספריית הבית של משתמשים המתחברים עם לקוח NIS לרשת מחשבים תעוגן בדרך כלל מהרשת."
+msgstr ""
+"ספריית הבית של משתמשים המתחברים עם לקוח NIS לרשת מחשבים תעוגן בדרך כלל מהרשת."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "מה ברצונך לעשות?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "הגדרת המחשב שלך כלקוח NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "יש להגדיר nisdomain ו nisserver בלבד"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "שרת NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "מתחם NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1407,7 +1400,7 @@ msgstr ""
 "שרת NIS שימושי ליצירת משתמש, מסד נתוני שמות מחשבים. השרת גם יבנה מפת autofs, "
 "המאפשרת למשתמש NIS לעגן את ספריית הבית שלהם על מחשב לקוח NIS באופן אוטומטי."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1415,40 +1408,40 @@ msgstr ""
 "בית NIS: ספריית הבית הבסיסית עבור משתמשים על שרת NIS. ספרייה זו תיוצא גרך "
 "שרת NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "מתחם NIS: מתחם ה NIS בו יש להשתמש (בדרך כלל הוא זהה לשם מתחם ה DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "שרת NIS: שם המחשב שלך."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS הבית:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "שם מתחם NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "אשף זה יגדיר את שרת ה NIS עם מפת Autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "ספריית NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "שם מתחם NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "שרת NIS: שם המחשב של שרת ה NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1456,37 +1449,37 @@ msgstr ""
 "תהליך הרקע YPBIND מאתר את השרת עבור מתחמי ה NIS ומתחזק את נתוני ה binding של "
 "שרת ה NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "חלה שגיאה - אמורה להיות ספריה."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "חלה שגיאה: שם מתחם ה NIS לא יכול להיות 'none' או 'localdomain'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "נא לתקן את זאת"
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "אשף זה סיים בהצלחה את הגדרת המחשב שלך כלקוח NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "אשף זה סיים בהצלחה את הגדרת המחשב שלך כ NIS עם מפת Autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "הגדרת המערכת שלך כשרת NIS עם מפת Autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "שרת NIS עם מפת Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "הגדרת המערכת שלך כלקוח NIS ..."
 
@@ -1708,8 +1701,10 @@ msgid "Proxy port:"
 msgstr "ממשק המתווך:"
 
 #: ../proxy_wizard/Squid.pm:83
-msgid "Press Next if you want to keep this value, or Back to correct your choice."
-msgstr "יש לבחור ב\"המשך\" אם ברצונך לשמור ערך זה, או \"חזרה\" לתיקון הבחירה שלך."
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"יש לבחור ב\"המשך\" אם ברצונך לשמור ערך זה, או \"חזרה\" לתיקון הבחירה שלך."
 
 #: ../proxy_wizard/Squid.pm:83
 msgid "You have entered a port that may be useful for this service:"
@@ -1724,7 +1719,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "עליך לבחור ביציאה (port) הגדולה מ 1024 והנמוכה מ 65535"
 
 #: ../proxy_wizard/Squid.pm:94
-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 "מטמון הכונן הינו כמות הזיכרון בכונן שניתן להשתמש בה לאגירת מידע."
 
 #: ../proxy_wizard/Squid.pm:94
@@ -1802,7 +1798,8 @@ msgstr "הירארכיית המטמון"
 msgid ""
 "You can safely select \"No upper level proxy\" if you don't need this "
 "feature."
-msgstr "יש באפשרותך לבחור בבטחה \"ללא מתווך ברמה עליונה\" אם אין לך צורך בתכונה זו."
+msgstr ""
+"יש באפשרותך לבחור בבטחה \"ללא מתווך ברמה עליונה\" אם אין לך צורך בתכונה זו."
 
 #: ../proxy_wizard/Squid.pm:142
 msgid ""
@@ -1825,11 +1822,12 @@ msgid "Configuring the Proxy"
 msgstr "הגדרת השרת המתווך"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-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 "האשף אסף את הנתונים הבאים הדרושים להגדרת השרת המתווך שלך:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1861,6 +1859,14 @@ msgstr "שרת מתווך Squid"
 msgid "PXE Wizard"
 msgstr "אשף 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."
+msgstr ""
+"יש צורך לעדכן את השם מתחם שלך. כרגע הוא localdomain או ללא שם. נא להריץ "
+"drajconnect לעדכון הערך הזה."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "הגדרת שרת PXE"
@@ -1965,7 +1971,8 @@ msgstr ""
 "למשתמש לבחור את תמונת האיתחול המועדפת דרך PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
 msgstr "עליך לבחור את תמונת איתחול PXE שברצונך להסיר משרת ה PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
@@ -1988,10 +1995,12 @@ msgstr "הוספת אפשרות לתצורת האתחול"
 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 "אשף זה יאפשר לך להתאים אישית את תמונת האיתחול עם משתנים נפוצים בצורה קלה."
+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 שברצונך לשנות"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
@@ -2003,7 +2012,8 @@ msgid "Add option to the PXE boot image"
 msgstr "הוספת רשומה לתמונת האתחול של PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandrakelinux install server directory"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr "ספריית ההתקנה: הנתיב המלא לספריית ההתקנה של Mandrake על השרת."
 
 #: ../pxe_wizard/Pxe.pm:170
@@ -2123,7 +2133,8 @@ msgid ""
 msgstr "עליך לספק את שם נכון עבור כניסת PXE (מילה אחת או מספר אחד ללא רווח)."
 
 #: ../pxe_wizard/Pxe.pm:224
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr "להוספת/הסרת/שינוי תמונת אתחול PXE, עליך להפעיל קודם \"הגדרת שרת PXE\"."
 
 #: ../pxe_wizard/Pxe.pm:229 ../pxe_wizard/Pxe.pm:233
@@ -2194,24 +2205,24 @@ msgstr "הגדרת שרת PXE על המערכת שלך..."
 msgid "PXE server"
 msgstr "שרת PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "אשף Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s לא קיים."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "הכל - ללא הגבלות גישה"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "החוקים שלי - התאמה אישית של תחנות מורשות ומוגבלות"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2219,53 +2230,54 @@ msgstr ""
 "השירות Samba מאפשר לשרת שלך לתפקד כשרת קבצים ומדפסות עבור תחנות עבודה "
 "המריצות מערכות הפעלה שאינן לינוקס."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "אשף הגדרת Samba"
 
-#: ../samba_wizard/Samba.pm:72
-msgid "This wizard will help you configuring the Samba services of your server."
+#: ../samba_wizard/Samba.pm:76
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr "אשף זה יעזור לך להגדיר את שרותי ה-Samba עבור השרת שלך."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba צריך לדעת את קבוצת החלונות אותה הוא ישרת (Workgroup)"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "קבוצת עבודה"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "קבוצת עבודה:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "קבוצת העבודה שגויה"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "כרזת השרת."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "ה\"כרזה\" היא האופן בה שרת זה יזוהה בטחנות העבודה של Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "כרזה:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "כרזת השרת אינה תקינה"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "רמת גישה:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2273,7 +2285,7 @@ msgstr ""
 "* דוגמה 1: איפשור כל כתובות ה-IP ב 150.203.*.*; חוץ מאחת\n"
 "hosts allow =150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2281,7 +2293,7 @@ msgstr ""
 "* דוגמה 2: איפשור תחנות התואמות לרשת/מיסוך רשת\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2289,7 +2301,7 @@ msgstr ""
 "* דוגמה 3: אפשור מספר תחנות\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2301,23 +2313,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "לתשומת לבך, גישה דורשת סיסמאות מתאימות ברמת משתמש."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "אפשר תחנות:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "הגבלת תחנות:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "שרותי Samba בעלי גישה"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2326,19 +2338,19 @@ msgstr ""
 "השירות Samba יכול לספק סביבת שיתוף קבצים עם תחנת העבודה של Windows שלך, "
 "וכמוכן יכולה לאפשר שיתוף מדפסות עבור המדפסות המחוברות לשרת שלך."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "אפשר אזור שיתוף קבצים"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "אפשר שיתוף מדפסות בשרת"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "הגדרת נגישות של ספריות הבית לבעליהן"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2346,28 +2358,28 @@ msgstr ""
 "בחרת לאפשר גישת משתמשים לספריית הבית שלהם בעזרת Samba אבל עליך/עליהם להגדיר "
 "סיסמה בעזרת smbpasswd."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "ספריה משותפת:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "יש להקליד את הספרייה שברצונך לשתף."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "יצירת ספריה משותפת אם היא לא קיימת"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "יצירת ספריה נכשלה."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "הרשאות גישה לקבצים"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2377,59 +2389,59 @@ msgstr ""
 "\\') למשל:\n"
 "root, fred, @users, @wheel עבור כל סוג של הרשאה."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "רשימת קריאה:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "רשימת כתיבה:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "יש לבחור איזה מדפסות יהיו נגישות על-ידי משתמשים ידועים"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "אפשר גישה לכל המדפסות"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "הגדרת Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "האשף אסף את הנתונים הבאים הנדרשים להגדרת Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "כרזת שרת:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "שיתוף קבצים:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "שרת הדפסה:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "בית:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "מדפסות:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-Samba שלך."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "הגדרת שרת ה Samba שלך."
 
@@ -2663,3 +2675,25 @@ msgstr "שרת Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "הגדרת המערכת שלך כשרת Apache ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "יש להגדיר מחדש את שם המחשב (hostname)."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "עליך לתקן את שם מתחם שלך. עבור שרת LDAP יש להגדיר שם מתחם תקין, שאינו זהה "
+#~ "ל-localdomain וכמו כן אסור להגדיר שם ריק. שם המחשב המארח חייב להתאים לתקן "
+#~ "Fully Qualified Domain Name - FQDN. עליך להפעיל את האשף drakconnect בכדי "
+#~ "לתקן הגדרות אלו."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "אין אפשרות להתחבר ל%s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "יש צורך לתקן את מתחם ה-NIS שלך. עבור שרת NIS יש צורך בשם מתחם NIS מתאים, "
+#~ "שלא שווה ל-localdomain או שלא חסר שם."
diff --git a/po/hi.po b/po/hi.po
index 087d2ebb..034d775c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-07 11:38+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -24,31 +24,31 @@ msgstr "संरचना विज़ार्ड"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "चेतावनी ।"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "त्रुटि ।"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "अभिनन्दन"
 
@@ -89,11 +89,11 @@ msgstr "यह जादूगरी आपकी एक नये ग्रा�
 msgid "(you don't need to type the domain after the name)"
 msgstr "(आपको नाम के बाद डोमेन को अंकित करने की आवश्यकता नहीं है)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "ग्राहक पहचान:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -101,7 +101,7 @@ msgstr ""
 "कृपया ध्यान रहे कि निर्दिष्ट किया हुआ आई०पी० पता और ग्राहक का नाम  नेटवर्क में अद्वितीय "
 "होना चाहिए ।"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -111,33 +111,33 @@ msgstr ""
 "मेंनेटवर्क पर, प्रत्येक मशीन के पास एक (अद्वितीय) आई०पी० पता सामान्य डौटेड वाक्य-विन्यास "
 "में होना चाहिए ।"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "मशीन का नाम:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "मशीन का आई०पी० पता:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "चेतावनी"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "आप डीएचसीपी में है, सर्वर इस संरचना के साथ हो सकता है कि कार्य ना करें ।"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "त्रुटि"
@@ -182,14 +182,36 @@ msgstr "ग्राहक आई०पी०:"
 msgid "The wizard successfully added the client."
 msgstr "जादूगरी ने ग्राहक को सफ़लतापूर्वक जोड़ा ।"
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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."
+msgstr ""
+"आपको अपने डोमेननाम को पुनः ठीक करने की आवश्यकता है। एक डीएनएस सर्वर के लिए आपको एक "
+"ठीक डोमेननाम की आवश्यकता है, जो कि स्थानीयडोमेन के समकक्ष नहीं होना चाहिए या कुछ भी "
+"नहीं हो। होस्टनाम को एक एफ़क्यूडीएन होना चाहिये: पूर्ण कुशल डोमेननाम । ठीक करने के लिए "
+"ड्रैककनेक्ट को आरम्भ करें ।"
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "दिया गया निर्देश अभी तक चल रहा है । क्या आप इस समाप्त करना चाहते है और विज़ार्ड से "
 "बाहर निकलना चाहते है?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "बन्द"
 
@@ -280,8 +302,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "निष्क्रिय"
@@ -290,8 +312,8 @@ msgstr "निष्क्रिय"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "सक्रिय"
@@ -304,53 +326,38 @@ msgstr "इन्टरफ़ेस:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "जादूगरी ने डीएचसीपी सेवाओं को सफ़लता-पूर्वक संरचित कर दिया है ।"
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "असफ़लता"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "ड्रैकविजार्ड को पुनः चलायें, और कुछ पैरामीटरों को परिवर्तित करने का प्रयास करें ।"
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "आपको अपने होस्ट के नाम को पुनः ठीक करने की आवश्यकता है।"
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"आपको अपने डोमेननाम को पुनः ठीक करने की आवश्यकता है। एक डीएनएस सर्वर के लिए आपको एक "
-"ठीक डोमेननाम की आवश्यकता है, जो कि स्थानीयडोमेन के समकक्ष नहीं होना चाहिए या कुछ भी "
-"नहीं हो। होस्टनाम को एक एफ़क्यूडीएन होना चाहिये: पूर्ण कुशल डोमेननाम । ठीक करने के लिए "
-"ड्रैककनेक्ट को आरम्भ करें ।"
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "स्वामी डीएनएस सर्वर"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "दास डीएनएस सर्वर"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "डीएनएस में होस्ट का जोड़ना"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "डीएनएस में होस्ट को हटाना"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -358,11 +365,11 @@ msgstr ""
 "डीएनएस (डोमेन नाम सर्वर) एक ऐसी सेवा है जो कि एक इन्टरनेट होस्ट नाम के साथ, एक मशीन "
 "केआई०पी० पते को मानचित्रित करती है ।"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "डीएनएस स्वामी संरचना जादूगरी"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -372,47 +379,47 @@ msgstr ""
 "स्थानीय संगणकों के नामों के लिए, अस्थानीय प्राथनाओं को एक बाह्य सर्वर को भेजते हुए, एक "
 "स्थानीय डीएनएस सेवा प्रदान करेगी।"
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "आप क्या करना चाहते है:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "डीएनएस सर्वर"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(आपको नाम के बाद डोमेन को जोड़ने की आवश्यकता नहीं है)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "सर्वर आईपी:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "एनआईएस डोमेन का नाम:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "उस होस्ट का चयन जिसे आप निम्नलिखित सूची में से हटाना चाहते है।"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "विद्यमान डीएनएस संरचना में एक होस्ट को हटायें।"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "होस्ट को हटाना"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "कम्प्यूटर का नाम:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -421,11 +428,11 @@ msgstr ""
 "एक दास नाम-सर्वर आपके मुख्य नाम-सर्वर का कुछ भार हल्का करेगा,और उस स्थिति में जब आपके "
 "मास्टर सर्वर तक पहुँच सम्भव ना हो, तब एक बैक-अप सर्वर की भांति भी कार्य करेगा ।"
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "स्वामी डीएनएस सर्वर के आईपी पते:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -433,11 +440,11 @@ msgstr ""
 "अग्रप्रेषण सिर्फ़ उन प्रश्नों के लिए होता है, जिनके लिए सर्वर प्राधिकारपूर्ण नहीं हैऔर उसके कैश "
 "में उत्तर नहीं है।"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "आपके अग्रप्रेषणकर्ता का आईपी"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -445,22 +452,22 @@ msgstr ""
 "तो यदि आपको इसकी आवश्यकता है और आप अपने अग्रप्रेषणकर्ता का आईपी जानते है,तो इसका आईपी "
 "पता बतायें, यदि आप नहीं जानते है तो खाली छोड़ दें"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "बाह्य डीएनएस:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "खोज डोमेन को जोड़ना"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 "इस सर्वर का डोमेननाम को स्वतः ही जोड़ा गया, और आपकोयहाँ जोड़ने की आवश्यकता नहीं है।"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -471,27 +478,27 @@ msgstr ""
 "होता है । डिफ़ाल्ट के तौर पर, इसमें सिर्फ़ स्थानीय डोमेननाम होता है । इच्छ्ति डोमेन खोज पथ "
 "कोऔर उसके बाद खोज-कुँजी-शब्दों को सूचीबद्व करके, इसे परिवर्तित किया जा सकता है"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "खोजने के लिए डिफ़ाल्ट डोमेन नाम:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "आपके आगे-भेजे-जाने-वाले-के-लिए, यह एक मान्य आई पता नहीं है...जारी रखने के लिए अगला बटन "
 "को दबायें"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "यह एक मान्य स्वामी डीएनएस आईपी पता नहीं है...जारी रखने के लिए अगला बटन को दबायें"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "यह एक मान्य आईपी पता नहीं है...जारी रखने के लिए अगला बटन को दबायें"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -499,18 +506,18 @@ msgstr ""
 "ऐसा लगता है कि होस्ट पहिले से ही आपके डीएनएस संरचना में है...अगला बटन को जारी रखने के "
 "लिए दबायें"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "त्रुटि:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 "ऐसा लगता है कि यह आपके डीएनएस संरचना में नहीं है...अगला बटन को जारी रखने के लिए दबायें"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -518,72 +525,72 @@ msgstr ""
 "ऐसा लगता है कि किसी भी डीएनएस सर्वर को विजार्ड द्वारा स्थापित किया गया है ।कॄपया "
 "डीएनएस विजार्ड को चलायें: Master DNS server (ंमास्टर डीएनएस सर्वर) ।"
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "ऐसा लगता है कि आपका सर्वर एक मास्टर डीएनएस सर्वर नहीं है, बल्कि सिर्फ़ एक दास-सर्वर है "
 "।अतैव मै होस्ट को जोड़/हटा नहीं सकता हूँ ।"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "विजार्ड अब आपकी डीएनएस स्लेव संरचना का निर्माण करेगा"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "इस संरचना के साथ:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "इस पहचान से साथ ग्राहक को आपके डीएनएस से जोड़ा जायेगा"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "कम्प्य़ूटर का नाम:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "कम्प्यूटर का आईपी पता:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "इस पहचान से साथ ग्राहक को आपके डीएनएस से हटाया जायेगा"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "निम्नलिखित संरचना के साथ, डीएनएस सर्वर अब संरचित होने ही जा रहा है"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "सर्वर होस्ट का नाम:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "डोमेन का नाम:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "विजार्ड ने होस्ट को सफ़लतापूर्वक आपके डीएनएस में जोड़ा ।"
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "विजार्ड ने होस्ट को आपके डीएनएस से सफ़लतापूर्वक हटा दिया है ।"
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "विजार्ड ने होस्ट को सफ़लतापूर्वक आपके सर्वर की डीएनएस सेवा को संरचित कर दिया है।"
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "कृपया ड्रैकविजार्ड को पुनः चलायें, और कुछ पैरामीटरों को परिवर्तित करने का प्रयास करें ।"
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "आपके तंत्र को एक स्वामी डीएनएस सर्वर की भांति संरचित किया जा रहा है ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "आपके तंत्र को एक दास डीएनएस सर्वर की भांति संरचित किया जा रहा है ..."
 
@@ -611,7 +618,7 @@ msgstr "विपत्र सर्वर"
 msgid "FTP server"
 msgstr "एफ़टीपी सर्वर"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "सॉबा सर्वर"
 
@@ -635,7 +642,7 @@ msgstr "एनआईएस सर्वर आटोएफ़एस मानचि
 msgid "Mandrakelinux Install server"
 msgstr "मैनड्रैकलिनक्स संसाधन सर्वर"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "कोलैब सर्वर"
 
@@ -660,7 +667,7 @@ msgstr ""
 "%s संसाधित नहीं है\n"
 "संसाधन के लिए \"अगला\" पर क्लिक करें या बाहर निकलने के लिए  \"निरस्त\" पर"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "संसाधन असफ़ल रहा"
 
@@ -902,15 +909,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "कोलैब संरचना जादूगरी"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"आपको अपने डोमेननाम को पुनः ठीक करने की आवश्यकता है, जो कि स्थानीयडोमेन ना हो या कुछ "
-"नहीं ना हो ।कृपया इसे ठीक करने के लिए ड्रैककनेक्ट को शुरू करें ।"
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -921,7 +920,7 @@ msgstr ""
 "एक में शामिल है: एक वेब प्रबंधन इन्टरफ़ेस, सम्पर्कों के सहित मेलबॉक्स उपयोगकर्ताओंके लिए तैयारी "
 "के साथ एक साझा पता-पुस्तिका और विपत्र पर एक पॉप३ व साथ-साथ आईमैप४(संशोधन१) पहुँच"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -931,39 +930,39 @@ msgstr ""
 "एलडीऐपी, साइप्रस,पोस्टफ़िक्स, आईमैप, एसऐएएलऑथ । इन सेवाओं के लिए विजार्ड आपकी सभी "
 "पूर्ववर्त्ती संरचना संचिकाओं काएक बैक-अप बनायेगा ।"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "कोलैब ग्रूपवेयर सर्वर संरचना जादूगरी में स्वागत ।"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "कोलैब सर्वर के प्रबंधक खाते के लिए एक कूटशब्द बतायें।"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "कूटशब्द बेमेल, या शून्य कूटशब्द, कृपया ठीक करें।"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "कूट-शब्द:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "कूट-शब्द पुनः बतायें:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "इन पैरामीटरों के साथ विजार्ड अब कोलैब सर्वर को संरचित करेगा"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "होस्टनाम:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "विपत्र डोमेन:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -971,47 +970,35 @@ msgstr ""
 "कोलैब सर्वर अब संरचित है और चल रहा है । https://127.0.0.1/kolab/admin/ पर आपके "
 "द्वारा बताये हुए कूट-शब्द को इन्टर करते हुए 'प्रबंधक' की भांति सत्र आरम्भ करें।"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "संसाधन हो रहा है"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "आपके तंत्र पर कोलैब सर्वर को संसाधित किया जा रहा है ..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "आपके तंत्र पर कोलैब सर्वर को संरचित किया जा रहा है ..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "सॉबा जादूगरी"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"आपको अपने डोमेननाम को पुनः ठीक करने की आवश्यकता है। एक डीएनएस सर्वर के लिए आपको एक "
-"ठीक डोमेननाम की आवश्यकता है, जो कि स्थानीयडोमेन के समकक्ष नहीं होना चाहिए या कुछ भी "
-"नहीं हो। होस्टनाम को एक एफ़क्यूडीएन होना चाहिये: पूर्ण कुशल डोमेननाम । ठीक करने के लिए "
-"ड्रैककनेक्ट को आरम्भ करें ।"
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "एलडीऐपी संरचना का प्रदर्शन"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "ओपेन एलडीऐपी सर्वर में उपयोगकर्ता को जोड़ना"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "एलडीऐपी संरचना को हटाना"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1019,192 +1006,190 @@ msgstr ""
 "यह एक लाइटवेट प्रोटोकॉल है, जिसका उपयोग निर्देशिका सेवाओं तक पहुँच पाने में किया जाता है, "
 "विशेषकर एक्स-५००-पर-आधारित निर्देशिका सेवाओं हेतु ।"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "एलडीऐपी का अर्थ है लाइटवेट डायरेक्टरी एक्सेस प्रोटोकॉल ।"
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "ओपेन एलडीऐपी संरचना विजार्ड"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "आपको एक ओपेन एलडीऐपी सर्वर को सबसे पहिले स्थापित करना चाहिये ।"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "आपकी पसन्द:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "संरचना को हटाएँ"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "/root/ldap-sav.ldiff में वर्तमन आधार को सुरक्षित किया जा रहा है"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "एलडीऐपी उपयोगकर्ता जोड़ा जा रहा है"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "उपयोगकर्ता का निर्माण में किया गया:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "उपयोगकर्ता का निर्माण में किया गया:%s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "प्रथम नाम:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "नाम:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "उपयोगकर्ता लॉग-इन:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "आपको एक वैध प्रथम-नाम बताना चाहिए।"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "आपको एक वैध नाम बताना चाहिए।"
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "आपको एक वैध उपयोगकर्ता-नाम बताना चाहिए।"
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "एलडीऐपी उपयोगकर्ता कूट-शब्द"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "कूट-शब्दों को एक जैसा होना चाहिए"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "कूट-शब्द (पुनः बतायें):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "एलडीऐपी हेतु आपको एक कूट-शब्द बताना चाहिए ।"
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "कूटशब्द आपस में नहीं मिलते है"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "प्रबंधक"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "प्रबंधक एक शक्तिशाली उपयोगकर्ता है जिसे एलडीऐपी डाटाबेस में अनुमति पहुँच प्राप्त होती है"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "प्रबंधक,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "एलडीऐपी सर्वर को संरचित किया जा रहा है"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "डोमेन का नाम: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "डोमेन का नाम: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "एलडीऐपी प्रबंधक"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "एलडीऐपी निर्देशिका वॄक्ष"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 "डीएनएस नामकरण का उपयोग एलडीऐपी निर्देशिका वॄक्ष को परिभाषित करने के लिए किया जाता है"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "एलडीऐपी निर्देशिका वॄक्ष:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "एलडीऐपी प्रबंधक:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "एलडीऐपी कूट-शब्द:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "एलडीऐपी कूट-शब्द (पुनः बतायें):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "आपको एक वैध एलडीऐपी निर्देशिका वॄक्ष बताना चाहिए।"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "निर्मित किये जाने वाले उपयोगकर्ता के लिए पुष्टि"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "प्रथमनाम:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "उपयोगकर्ता का नाम:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "में निर्मित:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "एलडीऐपी सर्वर को निर्माण करने हेतु सूचना हेतु पुष्टि"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "उपयोगकर्ताओं का पात्र:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "जादूगरी ने एलडीऐपी को सफ़लता-पूर्वक संरचित कर दिया है।"
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "उपयोगकर्ता को सफ़लता-पूर्वक जोड़ा गया"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "एलडीऐपी डाटाबेस में उपयोगकर्ता को जोड़ने के दौरान त्रुटि"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "सर्वर पहिले से संरचित है"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "आपने पहिले से ही अपने एलडीऐपी सर्वर को संरचित कर चुके है"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s असफ़ल रहा"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "त्रुटि!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "%s से जुड़ने में असमर्थ"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "समाचार जादूगरी"
@@ -1343,13 +1328,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "निर्देशिका:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "आपके द्वारा बताया हुआ पथ विधमान नहीं है।"
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "पहूँच नियंत्रण"
 
@@ -1403,30 +1388,21 @@ msgstr "नेटमास्क:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "जादूगरी ने आपके एनएफ़एस सर्वर को सफ़लता-पूर्वक संरचित कर दिया है"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"आपको अपने एनआईएस डोमेननाम को पुनः ठीक करने की आवश्यकता है। एक एनआईएस सर्वर के लिए "
-"आपको एक ठीक एनआईएस डोमेननाम की आवश्यकता है जो कि स्थानीय डोमेन के समान ना हो या कुछ "
-"भी नहीं हो ।"
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "आटोएफ़एस मानचित्र के साथ एनआईएस सर्वर"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "एनआईएस ग्राहक"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "एक एनआईएस सर्वर की आटोएफ़एस मानचित्र, आटो.होम व आटो.मास्टर संचिकाओं के साथ स्थापना ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1434,28 +1410,28 @@ msgstr ""
 "ग्राहक उनकी गॄह निर्देशिका को स्वचालित रूप से सर्वर से माउन्ट करते है,  जब वे एक एनआईएस "
 "ग्राहक कम्प्य़ूटर नेटवर्क पर संत्रारम्भ करते है ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "आप क्या करना चाहते है?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "कम्प्य़ूटर को एक एनआईएस ग्राहक बनने के लिए संरचित करना"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "आपको सिर्फ़ एनआईएसडोमेन व एनआईएससर्वर को रखना होगा ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "एनआईएस सर्वर:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "एनआईएस डोमेन:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1465,7 +1441,7 @@ msgstr ""
 "।विजार्ड आटोएफ़एस मानचित्र को भी बनाता है, जिससे एक एनआईएस ग्राहक कम्प्य़ूटर पर,एनआईएस "
 "उपयोगकर्ता को उनकी गृह निर्देशिका को आटोमाउन्ट करने के योग्य बनाता है।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1473,41 +1449,41 @@ msgstr ""
 "एनआईएस गृह-स्थल: उपयोगकर्ताओं के लिए एनआईएस सर्वर पर होम पर आधारित -निर्देशिका ।इस "
 "निर्देशिका को एनएफ़एस सर्वर के जरिये एक्सपोर्ट किया जायेगा ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "एनआईएस डोमेन:  उपयोगार्थ एनआईएस डोमेन (सामान्यता आपके डीएनएस डोमेननाम के जैसा) ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "एनआईएस सर्वर: आपके कम्प्य़ूटर का नाम ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "एनआईएस का गॄह:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "एनआईएस डोमेन का नाम:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "यह विजार्ड आपके एनआईएस सर्वर को आटोएफ़एस मानचित्र के साथ स्थापित करेगा"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "एनआईएस निर्देशिका:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "एनआईएस डोमेननाम: एनआईएस डोमेन का नाम ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "एनआईएस सर्वर: एनआईएस सर्वर का होस्टनाम ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1515,25 +1491,25 @@ msgstr ""
 "एनआईएस डोमेनों के लिए सर्वर को वाईपीबाइन्ड डैमॉन खोजता है और एनआईएस बंधनकारी सूचना का "
 "रख-रखाव करता है । "
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "त्रुटि, एक निर्देशिका होना चाहिए ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "त्रुटि एनआईएसडोमेननाम को 'कुछ-नहीं' या 'स्थानीयडोमेन' नहीं होना चाहिए"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "कृपया इसे ठीक करें ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "इस जादूगरी ने आपकी मशीन को एक एनआईएस ग्राहक बनने के लिए सफ़लता-पूर्वक संरचित कर दिया "
 "है।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1541,17 +1517,17 @@ msgstr ""
 "इस जादूगरी ने आपकी मशीन को आटोएफ़एस मानचित्र के साथ एक एनआईएस सर्वर बनने के लिए "
 "सफ़लता-पूर्वक संरचित कर दिया है।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 "आटोएफ़एस मानचित्र के साथ एक एनआईएस ग्राहक बनने के लिए आपकी मशीन को संरचित किया जा "
 "रहा ..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr " आटोएफ़एस मानचित्र के साथ एनआईएस"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "आपके तंत्र को एक एनआईएस ग्राहक की भांति संरचित किया जा रहा है ..."
 
@@ -1915,7 +1891,7 @@ msgstr ""
 "करने के लिए आवश्यक है।"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1947,6 +1923,14 @@ msgstr "एसक्वीड प्रोक्सी"
 msgid "PXE Wizard"
 msgstr "पीएक्सई विजार्ड"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 msgid "Set PXE server"
 msgstr "पीएक्सई सर्वर को स्थापित करें"
@@ -2302,24 +2286,24 @@ msgstr "आपके तंत्र पर पीएक्सई सर्व�
 msgid "PXE server"
 msgstr "पीएक्सई सर्वर"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "सॉबा जादूगरी"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s विद्यमान नहीं है।"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "सभी - किसी पहुँच का बंधन नहीं"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "मेरे नियम - मेरे से अनुमति-प्राप्त और निषेध होस्टों पूछें"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2327,55 +2311,55 @@ msgstr ""
 "सॉबा, उन कार्य-केंद्रों के लिए जो लिनक्सहीन प्रणालियों को चला रहे है,आपके सर्वर को एक "
 "संचिका और प्रिन्ट सर्वर की भांति आचरण की अनुमति प्रदान करता है।"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "सॉबा संरचना जादूगरी"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "यह जादूगरी आपके सर्वर की सॉबा सेवाओं को संरचित करने में सहायता करेगी।"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "सॉबा उस विण्डो कार्य-समूह के बारे में जानना चाहती है जिसकी उसे परिसेवा करनी है।"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "कार्यसमूह"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "कार्य-समूह:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "यह कार्यसमूह अनुचित है"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "सर्वर ध्वजा ।"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "ध्वजा एक तरीका है जिसके द्वारा इस सर्वर का विण्डो कार्य-केन्द्रों में वर्णन किया जायेगा ।"
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "ध्वजा:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "सर्वर ध्वजा अमान्य है"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "पहुँच स्तर:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2383,7 +2367,7 @@ msgstr ""
 "* उदाहरण १: १५०.२०३.*.* में सभी आई०पी० पतों को अनुमति दें; सिवाय एक के\n"
 "होस्ट अनुमति = १५०.२०३. सिवाय १५०.२०३.६.६६"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2391,7 +2375,7 @@ msgstr ""
 "* उदाहरण २: उन होस्टों को अनुमति जो निर्दिष्ट नेटवर्क/नेटमास्क से मेल रखते है\n"
 "होस्ट अनुमति = १५०.२०३.१५.०/२५५.२५५.२५५.०"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2399,7 +2383,7 @@ msgstr ""
 "* उदाहरण ३: एक होस्टों के समूहों को अनुमति दें\n"
 "होस्ट अनुमति = लैपलैंड, अरविद्सज़ौर"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2411,23 +2395,23 @@ msgstr ""
 "होस्ट अनुमति = @फ़ूनेट\n"
 "निषेध होस्ट = पाईरेट"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "ध्यान दें कि पहुँच को अभी भी उचित उपयोगकर्ता-स्तर कूट-शब्दों की आवश्यकता है।"
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "होस्टों को अनुमति:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "होस्टों के लिए निषेधाज्ञा:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "सॉबा सेवाओं को समर्थ करें"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2436,19 +2420,19 @@ msgstr ""
 "सॉबा आपके विण्डो कार्य-केंद्र के लिए एक सामूहिक संचिका सहभाजन क्षेत्र को प्रदान कर सकता है,"
 "और आपके सर्वर के साथ जुड़े हुए प्रिन्टरों के लिए, प्रिन्टर सहभाजन भी प्रदान कर सकता है "
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "संचिका सहभाजन क्षेत्र सक्रिय"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "सर्वर प्रिन्टर सहभाजन को समर्थ करें"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "गृह निर्देशिकाओं को उनके स्वामियों के लिए उपलब्ध करें"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2457,28 +2441,28 @@ msgstr ""
 "किया हैपरन्तु उसको/सभी को एक कूट-शब्द को स्थापित करने के लिए एसएमबीपॉसवर्ड का उपयोग "
 "करना चाहिए।"
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "सहभाजित निर्देशिका:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "उस निर्देशिका का पथ बतायें जिसे आप सहभाजित करना चाहते है।"
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "साझा निर्देशिका का निर्माण करें, यदि यह पहिले से विद्यमान ना हो"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "निर्देशिका का निर्माण करने में असफ़ल"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "संचिका अनुमतियां"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2488,60 +2472,60 @@ msgstr ""
 "होने चाहिए) जैसे कि:\n"
 "प्रत्येक प्रकार की अनुमति के लिए रूट, फ़्रेड, @उपयोगकर्ताओं, @व्हील ।"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "पाठन सूची:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "रूट, फ़्रेड, @उपयोगकर्ताओं, @व्हील"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "लेखन सूची:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "चयन करें उन प्रिन्टरों का जिन्हें आप ज्ञात उपयोगकर्ताओं के लिए प्रवेश के योग्य बनाना चाहते है"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "सभी प्रिन्टरों को सक्रिय करें"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "सॉबा को संरचित किया जा रहा है"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "इस जादूगरी ने सॉबा को संरचित करने हेतु निम्नलिखित मानकों को एकत्रित कर लिया है"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "सर्वर ध्वजा:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "संचिका सहभाजन:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "प्रिन्ट सर्वर:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "गॄह:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "प्रिन्टर्स:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "इस जादूगरी ने आपके सॉबा सर्वर को सफ़लता-पूर्वक संरचित कर दिया है।"
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "आपके सॉबा सर्वर को संरचित किया जा रहा है...."
 
@@ -2780,3 +2764,28 @@ msgstr "आपाचे सर्वर"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "आपके तंत्र को एक आपाचे सर्वर की भांति संरचित किया जा रहा है ..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "आपको अपने होस्ट के नाम को पुनः ठीक करने की आवश्यकता है।"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "आपको अपने डोमेननाम को पुनः ठीक करने की आवश्यकता है। एक डीएनएस सर्वर के लिए आपको "
+#~ "एक ठीक डोमेननाम की आवश्यकता है, जो कि स्थानीयडोमेन के समकक्ष नहीं होना चाहिए या "
+#~ "कुछ भी नहीं हो। होस्टनाम को एक एफ़क्यूडीएन होना चाहिये: पूर्ण कुशल डोमेननाम । ठीक "
+#~ "करने के लिए ड्रैककनेक्ट को आरम्भ करें ।"
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "%s से जुड़ने में असमर्थ"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "आपको अपने एनआईएस डोमेननाम को पुनः ठीक करने की आवश्यकता है। एक एनआईएस सर्वर के लिए "
+#~ "आपको एक ठीक एनआईएस डोमेननाम की आवश्यकता है जो कि स्थानीय डोमेन के समान ना हो या "
+#~ "कुछ भी नहीं हो ।"
diff --git a/po/hr.po b/po/hr.po
index 449fe363..ff6dc8b9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-08 21:56+0200\n"
 "Last-Translator: Matija Blagus <Matija.Blagus@public.srce.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -21,31 +21,31 @@ msgstr "Čarobnjak za podešavanje"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Upozorenje."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Greška."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Čestitamo"
 
@@ -85,50 +85,50 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Upozorenje"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Greška"
@@ -169,12 +169,25 @@ msgstr ""
 msgid "The wizard successfully added the client."
 msgstr ""
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Zatvori"
 
@@ -256,8 +269,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr ""
@@ -266,8 +279,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr ""
@@ -280,145 +293,134 @@ msgstr "Međusklop:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Međusklop:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -426,108 +428,108 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr ""
 
@@ -555,7 +557,7 @@ msgstr ""
 msgid "FTP server"
 msgstr ""
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr ""
 
@@ -579,7 +581,7 @@ msgstr ""
 msgid "Mandrakelinux Install server"
 msgstr ""
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr ""
 
@@ -602,7 +604,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
@@ -822,13 +824,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -836,276 +832,267 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Greška!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr ""
@@ -1226,13 +1213,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorij:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr ""
 
@@ -1281,135 +1268,129 @@ msgstr ""
 msgid "The wizard successfully configured your NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr ""
 
@@ -1724,7 +1705,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1754,6 +1735,12 @@ msgstr ""
 msgid "PXE Wizard"
 msgstr ""
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 msgid "Set PXE server"
 msgstr ""
@@ -2064,95 +2051,95 @@ msgstr ""
 msgid "PXE server"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Radna grupa"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2160,128 +2147,128 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 10666b41..f4594c48 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-05 23:10+0100\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -29,31 +29,31 @@ msgstr "beállításvarázsló"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Figyelmeztetés"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Hiba."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gratulálunk"
 
@@ -89,23 +89,25 @@ 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)"
 msgstr "(a tartománynevet nem szükséges megadni a név után)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "A kliens azonosítása:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "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:134
+#: ../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, "
@@ -115,21 +117,21 @@ msgstr ""
 "net. A hálózat összes gépének rendelkezni kell egy egyedi IP-címmel - a "
 "megszokott pontozásos formátumban."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "A gép neve:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "A gép IP-címe:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Jelenleg DHCP-módban van, ezért elképzelhető, hogy a kiszolgáló nem működik "
@@ -138,12 +140,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Hiba"
@@ -188,13 +190,36 @@ msgstr "A kliens IP-címe:"
 msgid "The wizard successfully added the client."
 msgstr "A varázsló felvette a klienst."
 
-#: ../common/Wizcommon.pm:86
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Módosítania kell a tartománynevet. DNS-kiszolgálóhoz érvényes tartománynév "
+"szükséges, amely nem \"localdomain\" és nem \"none\". Teljes tartománynevet "
+"kell megadni a gépnévnél. A beállításához használja a \"drakconnect\" "
+"programot."
+
+#: ../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."
+msgstr ""
+"Módosítania kell a tartománynevet. DNS-kiszolgálóhoz érvényes tartománynév "
+"szükséges, amely nem \"localdomain\" és nem \"none\". Teljes tartománynevet "
+"kell megadni a gépnévnél. A beállításához használja a \"drakconnect\" "
+"programot."
+
+#: ../common/Wizcommon.pm:98
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "A program még végrehajtás alatt áll. Szeretné leállítani azt, és kilépni a "
 "varázslóból?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Bezárás"
 
@@ -288,8 +313,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "kikapcsolva"
@@ -298,8 +323,8 @@ msgstr "kikapcsolva"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "bekapcsolva"
@@ -312,53 +337,39 @@ msgstr "Csatoló:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "A varázsló beállította a DHCP-szolgáltatásokat."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Sikertelen"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 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."
-
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Módosítania kell a gépnevet."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Módosítania kell a tartománynevet. DNS-kiszolgálóhoz érvényes tartománynév "
-"szükséges, amely nem \"localdomain\" és nem \"none\". Teljes tartománynevet "
-"kell megadni a gépnévnél. A beállításához használja a \"drakconnect\" "
-"programot."
+"Indítsa el újra a \"drakwizard\" programot, és módosítson néhány paramétert."
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Elsődleges DNS-kiszolgáló"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Másodlagos DNS-kiszolgáló"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Gép felvétele a DNS-be"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Gép eltávolítása a DNS-ből"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -366,11 +377,11 @@ msgstr ""
 "A DNS (Domain Name Server, azaz tartománynév-kiszolgáló) egy olyan "
 "szolgáltatás, amely a gépneveket összerendeli a megfelelő gépcímekkel."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Elsődleges DNS-beállítási varázsló"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -381,45 +392,45 @@ msgstr ""
 "számítógépnevekhez; a külső (nem helyi) kérések egy külső DNS-hez lesznek "
 "irányítva."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Mit szeretne tenni:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "DNS-kiszolgáló-felület"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(A tartománynevet nem szükséges megadni a név után)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Kiszolgáló:"
 
 # a kimenő emailekhez használandó domainnevet kell megadni az utána levő mezőben
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "DNS-tartománynév:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Válassza ki az eltávolítandó gépet a következő listából."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Gép eltávolítása meglevő DNS-beállításból."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Gép eltávolítása:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Számítógépnév:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -429,11 +440,11 @@ msgstr ""
 "továbbá tartalék kiszolgálóként is funkcionál - arra az esetre, ha az "
 "elsődleges nem lenne elérhető."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Az elsődleges DNS-kiszolgáló IP-címe:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -442,11 +453,11 @@ msgstr ""
 "nem feltétlenül tartalmazza a mindenkori mérvadó adatokat (vagyis nem "
 "\"authoritative\") és a gyorstárában sem szerepel az adott érték."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "A továbbító IP-címe"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -454,15 +465,15 @@ msgstr ""
 "Ha szüksége van rá, és tudja az IP-továbbító IP-címét, akkor adja azt meg. "
 "Ha nem tudja, akkor hagyja üresen a mezőt."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Külső DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Keresési tartomány felvétele"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -470,7 +481,7 @@ msgstr ""
 "Ezen kiszolgáló tartományneve automatikusan felvételre kerül, ezért azt nem "
 "kell itt megadni."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -482,27 +493,28 @@ msgstr ""
 "tartománynevet tartalmazza. Ez módosítható a kívánt tartomány-keresési "
 "útvonalnak a keresési kulcsszót követő megadásával."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Az alapértelmezésben keresendő tartománynév:"
 
-#: ../dns_wizard/Bind.pm:182
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+#: ../dns_wizard/Bind.pm:176
+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."
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Érvénytelen IP-cím az elsődleges DNS-kiszolgáló számára. A folytatáshoz "
 "nyomja le a \"Következő\" gombot."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Érvénytelen IP-cím. A folytatáshoz nyomja le a \"Következő\" gombot."
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -510,11 +522,11 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Hiba:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -522,7 +534,7 @@ msgstr ""
 "Úgy tűnik, ez nem szerepel a DNS beállításaiban. A folytatáshoz nyomja le a "
 "\"Következő\" gombot."
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -530,69 +542,72 @@ msgstr ""
 "Úgy tűnik, nem lett beállítva DNS-kiszolgáló a varázslóval. Futtassa a DNS-"
 "varázsló \"Elsődleges DNS-kiszolgáló\" funkcióját."
 
-#: ../dns_wizard/Bind.pm:217
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+#: ../dns_wizard/Bind.pm:211
+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."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "A varázsló elkészíti a másodlagos DNS beállítását"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "a következő beállítással:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Az itt megadott azonosítású kliens fel lesz véve a DNS-be"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Számítógépnév:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "A számítógép IP-címe:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 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:249
-msgid "The DNS server is about to be configured with the following configuration"
+#: ../dns_wizard/Bind.pm:243
+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:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "A kiszolgáló gépneve:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Tartománynév:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "A varázsló felvette a gépet a DNS-be."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "A varázsló eltávolította a gépet a DNS-ből."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "A varázsló beállította a kiszolgáló DNS-szolgáltatását."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 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:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "A rendszer beállítása elsődleges DNS-kiszolgálónak..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "A rendszer beállítása másodlagos DNS-kiszolgálónak..."
 
@@ -620,7 +635,7 @@ msgstr "Levelezőkiszolgáló"
 msgid "FTP server"
 msgstr "FTP-kiszolgáló"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba-kiszolgáló"
 
@@ -644,7 +659,7 @@ msgstr "NIS-kiszolgáló - Autofs-összerendelés"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux-telepítési kiszolgáló"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab-kiszolgáló"
 
@@ -669,7 +684,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:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "A telepítés nem sikerült"
 
@@ -719,7 +734,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
 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:88
 msgid "Chroot home user: users will only see their home directory."
@@ -838,11 +854,13 @@ msgstr "A varázsló beállította az intranetes/internetes FTP-kiszolgálót."
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
-msgstr "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:53
 msgid "Configure a Mandrakelinux install server (via NFS and http)"
-msgstr "Mandrakelinux-telepítési kiszolgáló beállítása (NFS-en és HTTP-n keresztül)"
+msgstr ""
+"Mandrakelinux-telepítési kiszolgáló beállítása (NFS-en és HTTP-n keresztül)"
 
 #: ../installsrv_wizard/Installsrv.pm:53
 msgid ""
@@ -917,15 +935,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab-beállításvarázsló"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Módosítania kell a tartománynevet egy olyan névre, amely nem \"localdomain\" "
-"és nem \"none\". A beállításához használja a \"drakconnect\" programot."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -937,7 +947,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:59
+#: ../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 "
@@ -947,39 +957,39 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 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:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Adja meg a Kolab-kiszolgáló rendszergazdai jelszavát."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Jelszó:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Jelszó (ismét):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Gépnév:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Levelezési tartomány:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -988,46 +998,35 @@ msgstr ""
 "jelentkezni 'manager' (rendszergazda) felhasználóként a \"https://127.0.0.1/"
 "kolab/admin/\" címen."
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "A telepítés folyamatban"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "A Kolab-kiszolgáló beállítása a rendszeren..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "LDAP-varázsló"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Módosítania kell a tartománynevet. LDAP-kiszolgálóhoz érvényes tartománynév "
-"szükséges, amely nem \"localdomain\" és nem \"none\". Teljes tartománynevet "
-"kell megadni a gépnévnél. A beállításához használja a \"drakconnect\" "
-"programot."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "LDAP-beállítás megjelenítése"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Felhasználó felvétele az LDAP-kiszolgálóba"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "LDAP-beállítás törlése"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1035,194 +1034,192 @@ msgstr ""
 "Ez egy könnyűsúlyú protokoll címtárszolgáltatások (főként X.500-alapúak) "
 "eléréséhez."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "Az LDAP jelentése: Lightweight Directory Access Protocol (könnyűsúlyú "
 "címtárelérési protokoll)."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "LDAP-beállításvarázsló"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Előbb be kell állítani egy LDAP-kiszolgálót."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Az Ön választása:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Beállítás törlése"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "A létező bázis mentése ide: /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP-felhasználó felvétele"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Felhasználó létrehozási helye: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Felhasználó létrehozási helye: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Keresztnév:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Név:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Felhasználói név:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Érvényes keresztnevet kell megadni."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Érvényes nevet kell megadni."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Érvényes felhasználónevet kell megadni."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Az LDAP-felhasználó jelszava"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "A jelszavaknak egyezniük kell"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Jelszó (ismét):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Meg kell adni egy jelszót az LDAP-hoz."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "A jelszavak nem egyeznek"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Adminisztrátor"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Az adminisztrátor egy többletjogokkal rendelkező felhasználó, akinek "
 "hozzáférése van az LDAP-adatbázishoz"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Adminisztrátor,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Az LDAP-kiszolgáló beállítása"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Tartománynév: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Tartománynév: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP-adminisztrátor"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP-címtárfa"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "A DNS-beli elnevezés van felhasználva az LDAP-címtárfadefinícióhoz"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP-címtárfa:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP-adminisztrátor:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP-jelszó:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP-jelszó (ismét):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Érvényes LDAP-címtárfát kell megadni."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "A felhasználólétrehozás megerősítése"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Keresztnév:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Felhasználónév:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Létrehozás itt:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Megerősítés az LDAP-kiszolgáló létrehozásához"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Felhasználói tárolóhely:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "A varázsló beállította az LDAP-t."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "A felhasználó fel lett véve"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Hiba a felhasználónak az LDAP-adatbázisba való felvételekor"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "A kiszolgáló már be lett állítva"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Az LDAP-kiszolgáló már be lett állítva"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "\"%s\" végrehajtása nem sikerült"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Hiba."
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Nem sikerült kapcsolódni ide: %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Hírvarázsló"
@@ -1325,7 +1322,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
@@ -1363,13 +1361,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Könyvtár:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "A megadott útvonal nem létezik."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Hozzáféréskezelés"
 
@@ -1424,30 +1422,22 @@ msgstr "Hálózati maszk:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "A varázsló beállította az NFS-kiszolgálót."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Módosítania kell a NIS-tartománynevet. NIS-kiszolgálóhoz érvényes NIS-"
-"tartománynév szükséges, amely nem \"localdomain\" és nem \"none\"."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS-kiszolgáló Autofs-összerendeléssel"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS-kliens"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "NIS-kiszolgáló beállítása Autofs-összerendeléssel és auto.home illetve auto."
 "master fájlokkal."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1455,28 +1445,28 @@ msgstr ""
 "A felhasználók saját könyvtárai automatikusan csatolásra kerülnek a "
 "kiszolgálóról, amikor egy NIS-hálózati kliensen bejelentkeznek."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Mit szeretne tenni?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "A számítógép beállítása NIS-kliensnek"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Meg kell adni a NIS-tartományt és a NIS-kiszolgálót."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS-kiszolgáló:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS-tartomány:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1487,7 +1477,7 @@ msgstr ""
 "lesz arra, hogy a NIS-felhasználók saját könyvtárai (home) automatikusan "
 "csatolásra kerüljenek egy NIS-kliensszámítógépen."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1496,44 +1486,44 @@ msgstr ""
 "kiszolgáló felhasználói számára. Ez a könyvtár exportálva lesz NFS-"
 "kiszolgálóval."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS-tartomány: a használandó NIS-tartomány (általában megegyezik a DNS-"
 "tartománynévvel)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS-kiszolgáló: a számítógép neve."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Saját könyvtárak, NIS:"
 
 # a kimenő emailekhez használandó domainnevet kell megadni az utána levő mezőben
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS-tartománynév:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "A varázsló beállítja a NIS-kiszolgálót Autofs-összerendeléssel"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS-könyvtár:"
 
 # a kimenő emailekhez használandó domainnevet kell megadni az utána levő mezőben
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS-tartománynév: a NIS-tartomány neve."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS-kiszolgáló: a NIS-kiszolgáló gépneve."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1541,23 +1531,23 @@ msgstr ""
 "A YPBIND szolgáltatás megkeresi a kiszolgálót a NIS-tartományok számára, "
 "továbbá karbantartja a NIS hozzárendelési (binding) információit."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Hiba - könyvtárt kell megadni."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Hiba - a NIS-tartománynév nem lehet \"none\" vagy \"localdomain\"."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Állítsa be."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "A varázsló beállította a számítógépet NIS-kliensnek."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1565,15 +1555,16 @@ msgstr ""
 "A varázsló beállította a számítógépet Autofs-összerendeléssel rendelkező NIS-"
 "kiszolgálónak."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 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:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS Autofs-összerendeléssel"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "A rendszer beállítása NIS-kliensnek..."
 
@@ -1639,7 +1630,8 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
-msgstr "A maszknak érvényes tartománynévnek kell lennie - például \"mydomain.com\"."
+msgstr ""
+"A maszknak érvényes tartománynévnek kell lennie - például \"mydomain.com\"."
 
 # a kimenő emailekhez használandó domainnevet kell megadni az utána levő mezőben
 #: ../postfix_wizard/Postfix.pm:93
@@ -1808,14 +1800,16 @@ msgid "Proxy port:"
 msgstr "Proxy-port:"
 
 #: ../proxy_wizard/Squid.pm:83
-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:83
 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:90
 msgid "Press back to change the value."
@@ -1826,7 +1820,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:94
-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ó."
@@ -1933,13 +1928,14 @@ msgid "Configuring the Proxy"
 msgstr "A proxy beállítása"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "A varázsló a következő, a proxy beállításához szükséges paramétereket "
 "gyűjtötte össze:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1971,6 +1967,14 @@ msgstr "Squid-proxy"
 msgid "PXE Wizard"
 msgstr "PXE-varázsló"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Módosítania kell a tartománynevet egy olyan névre, amely nem \"localdomain\" "
+"és nem \"none\". A beállításához használja a \"drakconnect\" programot."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXE-kiszolgáló beállítása"
@@ -2039,7 +2043,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 ""
@@ -2083,8 +2088,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"
@@ -2114,7 +2121,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
@@ -2126,7 +2134,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 Mandrakelinux install server directory"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr ""
 "Telepítési könyvtár: a Mandrakelinux-telepítési kiszolgáló könyvtárának "
 "teljes útvonala"
@@ -2164,7 +2173,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."
@@ -2228,7 +2238,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 ""
@@ -2249,10 +2260,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\" "
@@ -2290,7 +2303,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"
@@ -2328,24 +2342,24 @@ msgstr "A PXE-kiszolgáló beállítása a rendszeren..."
 msgid "PXE server"
 msgstr "PXE-kiszolgáló"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba-varázsló"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s nem létezik."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Minden - nincs elérési tiltás"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Az én szabályaim - kérdezzen rá az engedélyezett/letiltott gépekre"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2354,37 +2368,39 @@ msgstr ""
 "nyomtatókiszolgálóként viselkedjen a Linuxtól eltérő operációs rendszert "
 "futtató munkaállomások felé."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba-beállításvarázsló"
 
-#: ../samba_wizard/Samba.pm:72
-msgid "This wizard will help you configuring the Samba services of your server."
+#: ../samba_wizard/Samba.pm:76
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Ez a varázsló segítséget nyújt a kiszolgáló Samba-szolgáltatásainak "
 "beállításához."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 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:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Munkacsoport"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Munkacsoport:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "A munkacsoport helytelen"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "A kiszolgáló leírása."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2392,19 +2408,19 @@ msgstr ""
 "A leírás azt adja meg, hogy a kiszolgáló milyen leírással jelenik meg a "
 "windowsos munkaállomásokon."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Leírás:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "A kiszolgáló leírása helytelen"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Hozzáférési szint:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2413,7 +2429,7 @@ msgstr ""
 "kivétellel\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2422,7 +2438,7 @@ msgstr ""
 "engedélyezése\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2430,7 +2446,7 @@ msgstr ""
 "* 3. példa: néhány gép engedélyezése\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2442,25 +2458,25 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Megjegyzés: a hozzáféréshez szükség van megfelelő felhasználószintű "
 "jelszavakra."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Engedélyezett gépek:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Letiltott gépek:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Samba-szolgáltatások bekapcsolva"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2470,19 +2486,19 @@ msgstr ""
 "amelyhez hozzáférhetnek a windowsos munkaállomások. A kiszolgálóhoz "
 "csatlakozó nyomtatók is megoszthatók a Samba használatával."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "A fájlmegosztási terület bekapcsolása"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "A kiszolgáló nyomtatómegosztásának bekapcsolása"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "A saját könyvtárak elérhetők legyenek a tulajdonosaik számára"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2491,28 +2507,28 @@ msgstr ""
 "a Sambán keresztül történő elérését. Szükség van egy jelszó beállítására; ez "
 "elvégezhető az smbpasswd programmal."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Megosztott könyvtár:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Adja meg a megosztásra szánt könyvtár útvonalát."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "A megosztott könyvtár létrehozása, ha nem létezik"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Nem sikerült létrehozni a könyvtárt."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Fájlengedélyek"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2523,61 +2539,62 @@ msgstr ""
 "következőképpen:\n"
 "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Olvasási lista:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Írási lista:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 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/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Az összes nyomtató elérhető"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "A Samba beállítása"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "A varázsló a következő, a Samba beállításához szükséges paramétereket "
 "gyűjtötte össze:"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "A kiszolgáló leírása:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Fájlmegosztás:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Nyomtatókiszolgáló:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Saját könyvtár:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Nyomtatók:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "A varázsló beállította a Samba kiszolgálót."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "A Samba-kiszolgáló beállítása..."
 
@@ -2715,7 +2732,8 @@ msgstr "Webkiszolgáló-beállítási varázsló"
 
 #: ../web_wizard/Apache.pm:77
 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:77
 msgid "Select the kind of Web service you want to activate:"
@@ -2824,6 +2842,29 @@ msgstr "Apache-kiszolgáló"
 msgid "Configuring your system as Apache server ..."
 msgstr "A rendszer beállítása Apache-kiszolgálónak..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Módosítania kell a gépnevet."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Módosítania kell a tartománynevet. LDAP-kiszolgálóhoz érvényes "
+#~ "tartománynév szükséges, amely nem \"localdomain\" és nem \"none\". Teljes "
+#~ "tartománynevet kell megadni a gépnévnél. A beállításához használja a "
+#~ "\"drakconnect\" programot."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Nem sikerült kapcsolódni ide: %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Módosítania kell a NIS-tartománynevet. NIS-kiszolgálóhoz érvényes NIS-"
+#~ "tartománynév szükséges, amely nem \"localdomain\" és nem \"none\"."
+
 #~ msgid "Configure Ldap server"
 #~ msgstr "Ldap-kiszolgáló beállítása"
 
@@ -3757,4 +3798,3 @@ msgstr "A rendszer beállítása Apache-kiszolgálónak..."
 
 #~ msgid "No Samba service has been requested"
 #~ msgstr "Samba-szolgáltatásra nem volt kérés"
-
diff --git a/po/id.po b/po/id.po
index 6e5d908f..ac3a0477 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2003-03-13 17:14+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Nusantara - Bahasa Indonesia <id@li.org>\n"
@@ -21,33 +21,33 @@ msgstr "Dukun Konfigurasi"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "Peringatan"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 #, fuzzy
 msgid "Error."
 msgstr "Error Wizard."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Selamat"
 
@@ -88,18 +88,18 @@ msgstr "Dukun ini membantu Anda menambahkan klien baru di DNS lokal Anda."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(Anda tak perlu mengetik domain setelah nama)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identifikasi klien:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "Ingat bhw nomor IP dan nama klien harus unik di jaringan."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -108,22 +108,22 @@ msgstr ""
 "Klien di jaringan akan dikenal dg nama, seperti namaklien.perusahaan.net. "
 "Tiap mesin di jaringan harus punya nomor IP (unik) dalam format bertitik."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../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:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Nomor IP mesin:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Peringatan"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -132,12 +132,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
@@ -181,12 +181,25 @@ msgstr "IP Klien:"
 msgid "The wizard successfully added the client."
 msgstr "Sang dukun sukses menambah klien."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Tutup"
 
@@ -276,8 +289,8 @@ msgstr "Parameter konfigurasi layanan DHCP telah terkumpul:"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "non aktif"
@@ -286,8 +299,8 @@ msgstr "non aktif"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "aktif"
@@ -301,53 +314,42 @@ msgstr "Antarmuka:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Layanan DHCP server sukses dikonfigurasikan."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "aktif"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "Tolak host:"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -355,12 +357,12 @@ msgstr ""
 "DNS (Domain Name Server) adalah layanan korespondensi mesin dg nama host "
 "internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Dukun Konfigurasi DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -370,93 +372,93 @@ msgstr ""
 "memberikan layanan DNS lokal utk nama komputer lokal, dg permintaan non-"
 "lokal diteruskan ke DNS luar."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Anda tak perlu mengetik domain setelah nama)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Nama Server:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Nama domain terhitung"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "Tolak host:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nama domain terhitung"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurasi Server DNS"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "Gateway eksternal"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -464,120 +466,120 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Alamat tak berlaku... tekan Maju utk melanjutkan"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Alamat tak berlaku... tekan Maju utk melanjutkan"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Alamat tak berlaku... tekan Maju utk melanjutkan"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Error Wizard."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Konfigurator DNS"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 #, fuzzy
 msgid "Computer name:"
 msgstr "Nama domain terhitung"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Alamat IP Server:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Nama Server:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Sang dukun sukses menambah klien."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Sang dukun sukses menambah klien."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Layanan DNS server Anda sukses dikonfigurasikan."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurasi Server DNS"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurasi Server DNS"
@@ -610,7 +612,7 @@ msgstr "Nama Server Mail:"
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Server Database"
@@ -640,7 +642,7 @@ msgstr "Server Berita"
 msgid "Mandrakelinux Install server"
 msgstr "Nama Server Mail:"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Server Database"
@@ -667,7 +669,7 @@ msgstr ""
 "%s tak diinstal\n"
 "Klik \"Maju\" utk menginstal atau \"Batal\" utk keluar"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "Instalasi tema gagal!"
@@ -903,13 +905,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Konfigurator Samba"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -917,308 +913,297 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Konfigurator Server Web"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Katasandi:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Katasandi:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Layanan Mail Internet server Anda sukses dikonfigurasikan."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Nama Host"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Direktori pengguna:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Konfigurasi Server FTP"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurasi Server FTP"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Konfigurator Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Dukun Konfigurasi"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Dukun Konfigurasi"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Dukun Konfigurasi"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Server Database"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Konfigurasi server waktu telah disimpan"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Penambahan pengguna"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "Nama Host:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Nama pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Penambahan pengguna"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Katasandi:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Katasandi:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Katasandi tidak sama"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Konfigurasi Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Nama domain terhitung"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Nama domain terhitung%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Direktori pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Direktori pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Katasandi:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Katasandi:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Direktori pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Nama Host:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Nama pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurasi Server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Penambahan pengguna"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Server proksi Anda sukses dikonfigurasikan."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Server Samba sukses dikonfigurasikan."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "aktif"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Error Wizard."
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Konfigurator Berita"
@@ -1353,13 +1338,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktori:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Path yg Anda tuliskan tidak ada."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontrol akses"
 
@@ -1412,148 +1397,142 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Server NFS sukses dikonfigurasikan"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Server Berita"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "IP Klien:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "Server NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Rumah:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Nama domain terhitung"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Server Samba sukses dikonfigurasikan."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "Direktori pengguna:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nama domain terhitung"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Direktori yg di-share:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Server Samba sukses dikonfigurasikan."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Server Samba sukses dikonfigurasikan."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurasi Server DNS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Server Berita"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurasi Server DNS"
@@ -1917,7 +1896,7 @@ msgid ""
 msgstr "Parameter konfigurasi proksi telah terkumpul:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1953,6 +1932,12 @@ msgstr "Konfigurator squid"
 msgid "PXE Wizard"
 msgstr "Konfigurator FTP"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2277,25 +2262,25 @@ msgstr ""
 msgid "PXE server"
 msgstr "Server NFS"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Konfigurator Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Semua - Tanpa batasan akses"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Aturan saya - Tanyalah saya ttg host yg diizinkan/ditolak"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2303,54 +2288,54 @@ msgstr ""
 "Samba memungkinkan server Anda menjadi server file dan cetak utk "
 "stasiunkerja sistem non-Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Konfigurator Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Alat ini membantu konfigurasi layanan Samba server Anda."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba perlu tahu Grupkerja Mindows yg akan dilayani."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grupkerja"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grupkerja:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Grupkerja salah"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Banner Server."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "Banner adalah cara server ini digambarkan di stasiunkerja Mindows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Banner Server tak benar"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Tingkat Akses:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2359,7 +2344,7 @@ msgstr ""
 "* Contoh 1: izinkan semua IP di 150.203.*.*; kecuali satu\\nhosts allow = "
 "150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2368,14 +2353,14 @@ msgstr ""
 "* Contoh 2: izinkan host yg cocok dg jaringan/netmask yg diberikan\\nhosts "
 "allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr "* Contoh 3: izinkan beberapa host\\nhosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2386,23 +2371,23 @@ msgstr ""
 "* Contoh 4: izinkan hanya host di grupnet NIS \"foonet\", tapi tolak akses "
 "dari satu host tertentu\\nhosts allow = @foonet\\nhosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Ingat, akses tetap memerlukan katasandi tingkat-pengguna yg cocok."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Izinkan host:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Tolak host:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Layanan Samba Diaktifkan"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2412,19 +2397,19 @@ msgstr ""
 "dapat menyediakan printer guna bersama terhadap printer yg terhubung dg "
 "server Anda."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Aktifkan area sharing file"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Aktifkan Guna Bersama Printer Server"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Buat direktori home dapat dipakai oleh pemiliknya"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2432,28 +2417,28 @@ msgstr ""
 "Anda mengizinkan pengguna mengakses direktori rumah mereka via samba tapi "
 "Anda/mereka harus menggunakan smbpasswd utk mengeset katasandi."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Direktori yg di-share:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Tuliskan path direktori yg ingin di-share."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Izin file"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2463,60 +2448,60 @@ msgstr ""
 "Tuliskan pengguna atau grup dipisahkan oleh koma (grup harus diawali dg \\'@"
 "\\') seperti:\\nroot, fred, @users, @wheel utk tiap jenis izin."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "daftar baca:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "daftar tulis:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Pilih printer mana yg Anda ingin utk diakses oleh pengguna"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Aktifkan semua printer"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Konfigurasi Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Parameter konfigurasi Samba telah terkumpul."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Banner Server:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Pemakaian Bersama File:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Server Cetak:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Rumah:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Printer:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Server Samba sukses dikonfigurasikan."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Konfigurasi Server FTP"
@@ -2759,6 +2744,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurasi Server DNS"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Penambahan pengguna"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Konfigurasi Server DHCP"
 
diff --git a/po/is.po b/po/is.po
index 572b6518..11bf5598 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-is\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2003-09-13 21:31GMT\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -24,32 +24,32 @@ msgstr "Stillingarálfur"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "Aðvörun"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Villa."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Til hamingju"
 
@@ -85,50 +85,50 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Aðvörun"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
@@ -170,12 +170,25 @@ msgstr ""
 msgid "The wizard successfully added the client."
 msgstr ""
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Loka"
 
@@ -258,8 +271,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "óvirkt"
@@ -268,8 +281,8 @@ msgstr "óvirkt"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "virkt"
@@ -283,152 +296,141 @@ msgstr "Tengi:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Vefmiðlari"
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "virkt"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Vefmiðlari"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Vefmiðlari"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Stillingarálfur"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Vefmiðlari"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Vefmiðlari"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Notandanafn:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Vefmiðlari"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -436,112 +438,112 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Villa."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Stillingarálfur"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Notandanafn:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Vefmiðlari"
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr ""
 
@@ -575,7 +577,7 @@ msgstr "Vefmiðlari"
 msgid "FTP server"
 msgstr "Vefmiðlari"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Gagnagrunnsmiðlari"
@@ -605,7 +607,7 @@ msgstr "Vefmiðlari"
 msgid "Mandrakelinux Install server"
 msgstr "Vefmiðlari"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Gagnagrunnsmiðlari"
@@ -630,7 +632,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "Uppsetning þema mistókst!"
@@ -855,13 +857,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Stillingarálfur"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -869,305 +865,295 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Lykilorð:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Lykilorð:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Vefmiðlari"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Vélarheiti:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Mappa:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Vefmiðlari"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Vefmiðlari"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Stillingarálfur"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Stillingarálfur"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Stillingarálfur"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Gagnagrunnsmiðlari"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Stillingarálfur"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "Vélarheiti:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Lykilorð:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Lykilorð:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Mismunandi lykilorð"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Stilla"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Mappa:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Mappa:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Lykilorð:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Lykilorð:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Mappa:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Vélarheiti:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Stilla"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Notandanafn:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Vefmiðlari"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "virkt"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Villa."
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr ""
@@ -1288,13 +1274,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Mappa:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr ""
 
@@ -1343,140 +1329,134 @@ msgstr "Netsía:"
 msgid "The wizard successfully configured your NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Vefmiðlari"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "Vefmiðlari"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Vefmiðlari"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "Mappa:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Vefmiðlari"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Vefmiðlari"
@@ -1801,7 +1781,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1832,6 +1812,12 @@ msgstr ""
 msgid "PXE Wizard"
 msgstr ""
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2148,95 +2134,95 @@ msgstr ""
 msgid "PXE server"
 msgstr "Vefmiðlari"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Staðarnetshópur"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Vinnuhópur:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Borði:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2244,130 +2230,130 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 #, fuzzy
 msgid "Enable all printers"
 msgstr "Vefmiðlari"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 #, fuzzy
 msgid "Print server:"
 msgstr "Vefmiðlari"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr ""
 
@@ -2589,6 +2575,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Vefmiðlari"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Notandanafn:"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Stilla"
 
diff --git a/po/it.po b/po/it.po
index c1b49099..eac17ac7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-03-09 01:38+0100\n"
 "Last-Translator: Stefano K. Lee <stefanok_lee@yahoo.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -23,31 +23,31 @@ msgstr "assistente di configurazione"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Attenzione."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Errore."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Congratulazioni"
 
@@ -90,11 +90,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(Non è necessario digitare il dominio dopo il nome.)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identificazione client"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -102,7 +102,7 @@ msgstr ""
 "Nota bene: l'indirizzo IP e il nome del client dovrebbero essere unici "
 "all'interno della rete."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,21 +112,21 @@ msgstr ""
 "it. Ogni macchina della rete deve avere un indirizzo IP (unico), espresso "
 "nella classica forma di quattro numeri separati da punti."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nome del computer:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Indirizzo IP del computer:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Attenzione"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Stai utilizzando il DHCP, il server potrebbe non funzionare con questa "
@@ -135,12 +135,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Errore"
@@ -185,12 +185,33 @@ msgstr "Indirizzo del client:"
 msgid "The wizard successfully added the client."
 msgstr "L'assistente ha aggiunto con successo il client."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"È necessario modificare il nome di dominio. Per un server DNS è necessario "
+"un nome di dominio corretto, diverso da \"localdomain\" o da un valore "
+"nullo. Esegui drakconnect per apportare le necessarie correzioni."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+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 ""
+"È necessario modificare il nome di dominio. Per un server DNS è necessario "
+"un nome di dominio corretto, diverso da \"localdomain\" o da un valore "
+"nullo. Esegui drakconnect per apportare le necessarie correzioni."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Chiudi"
 
@@ -283,8 +304,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "inattivo"
@@ -293,8 +314,8 @@ msgstr "inattivo"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "attivo"
@@ -308,53 +329,38 @@ msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 "L'assistente ha completato con successo la configurazione dei servizi DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Fallito"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Riavvia drakwizard e cerca di modificare alcuni parametri"
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "È necessario modificare il nome della macchina"
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"È necessario modificare il nome di dominio. Per un server DNS è necessario "
-"un nome di dominio corretto, diverso da \"localdomain\" o da un valore "
-"nullo. Esegui drakconnect per apportare le necessarie correzioni."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Server DNS primario"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Server DNS secondario"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Aggiungi un host nel DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Rimuovi un nome macchina dal DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -362,11 +368,11 @@ msgstr ""
 "DNS (Domain Name Server) è il servizio che fa corrispondere l'indirizzo IP "
 "di una macchina ad un nome, nella forma utilizzata su Internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Assistente alla configurazione di un server DNS primario"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -377,47 +383,47 @@ msgstr ""
 "mentre le richieste di indirizzi esterni saranno reindirizzate ad un "
 "servizio DNS esterno."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Cosa intendi fare:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Server DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Non è necessario aggiungere il dominio dopo il nome.)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP del Server:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Nome dominio NIS"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Scegli dalla lista seguente l'host che intendi rimuovere"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Rimuovi un host da una configurazione DNS esistente"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Rimuovi nome macchina:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Nome computer:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -427,11 +433,11 @@ msgstr ""
 "primario, oltre a svolgere una funzione di backup nel caso in cui il server "
 "primario non sia raggiungibile."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Indirizzo IP del server DNS primario"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -439,11 +445,11 @@ msgstr ""
 "La redirezione avviene solo per le richieste per cui il server non è "
 "competente e non ha la risposta nella sua cache."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Indirizzo IP per la redirezione"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -451,15 +457,15 @@ msgstr ""
 "Se ne hai bisogno e conosci l'indirizzo IP del server verso cui redirigere "
 "le richieste, inseriscilo, altrimenti puoi lasciare in bianco."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Server DNS esterno"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Aggiungi un dominio di ricerca"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -467,7 +473,7 @@ msgstr ""
 "Il nome di dominio per questo server è aggiunto in automatico, non sarà "
 "necessario inserirlo qui."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -479,27 +485,27 @@ msgstr ""
 "modificarlo inserendo il percorso di ricerca desiderato dopo la chiave di "
 "ricerca"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Nome di dominio predefinito per la ricerca:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Questo non è un indirizzo valido per la redirezione... fai clic su \"Avanti\""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Questo non è un indirizzo valido di server DNS primario... fai clic su "
 "\"Avanti\""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Questo non è un indirizzo valido... fai clic su \"Avanti\""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -507,11 +513,11 @@ msgstr ""
 "Sembra che l'host sia già presente nella configurazione del DNS... fai clic "
 "su \"Continua\" per andare avanti"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Errore:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -519,7 +525,7 @@ msgstr ""
 "Sembra che non sia presente nella configurazione del DNS... Fai clic su "
 "\"Continua\""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -527,72 +533,72 @@ msgstr ""
 "Sembra che non ci siano server DNS configurati. Per favore esegui la "
 "configurazione del DNS: Server DNS primario."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Sembra che il server DNS sia secondario e non primario. Per questo motivo "
 "non è possibile aggiungere o rimuovere host."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Verrà ora eseguita la configurazione del server DNS secondario"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "Con questa configurazione:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Un client con questo identificativo sarà aggiunto al server DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Nome computer:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Indirizzo IP del computer:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Il client con questo identificativo sarà rimosso dal server DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Il server DNS sarà configurato con i seguenti parametri"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Nome del Server:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Nome di dominio:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "L'assistente ha aggiunto con successo il client."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "L'assistente ha rimosso con successo il client."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione dei servizi DNS."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Per favore riavvia drakwizard e cerca di modificare alcuni parametri"
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurazione del server DNS primario"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurazione del server DNS secondario"
 
@@ -620,7 +626,7 @@ msgstr "Server di posta"
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Server Samba"
 
@@ -645,7 +651,7 @@ msgstr "Mappatura autofs del server NIS "
 msgid "Mandrakelinux Install server"
 msgstr "Server di installazione Mandrake"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Server Kolab"
 
@@ -671,7 +677,7 @@ msgstr ""
 "%s non è installato.\n"
 "Premi \"Avanti\" per installarlo o \"Annulla\" per uscire."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Installazione non riuscita"
 
@@ -918,15 +924,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Assistente di configurazione di Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"È necessario correggere il nome di dominio, in modo che sia diverso da nullo "
-"o da \"localdomain\". Per favore esegui drakconnect e cambialo."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -934,319 +932,305 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Assistente di configurazione del server web"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "L'assistente ha completato con successo la configurazione del servizio di "
 "posta elettronica per Internet sul server."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Nome del server (host name)"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Directory di installazione:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Configurazione del server FTP"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurazione del server FTP"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Configurazione Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"È necessario modificare il nome di dominio. Per un server LDAP è necessario "
-"un nome di dominio corretto, diverso da \"localdomain\" o da un valore "
-"nullo. Esegui drakconnect per apportare le necessarie correzioni."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Assistente di configurazione LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "Aggiungi - inserisci una voce nel server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Assistente di configurazione LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Assistente di configurazione LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Imposta un server PXE"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Configurazione del server d'installazione."
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Aggiungi un utente"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Nome:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Nome utente:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Contenitore:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 #, fuzzy
 msgid "You must enter a valid First Name."
 msgstr "Devi indicare un indirizzo IP corretto."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 #, fuzzy
 msgid "You must enter a valid Name."
 msgstr "Devi indicare un indirizzo IP corretto."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 #, fuzzy
 msgid "You must enter a valid User Name."
 msgstr "Devi indicare un indirizzo IP corretto."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Le password non corrispondono"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Configurazione del server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Nome di dominio: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Nome di dominio: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Directory TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Directory TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Directory TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Nome:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Nome utente:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 #, fuzzy
 msgid "Create in:"
 msgstr "Lista di lettura:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Configurazione del server DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Contenitore:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Aggiungi dati "
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Aggiungi - inserisci una voce nel server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server NFS"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Fallito"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Errore"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Configurazione news"
@@ -1386,13 +1370,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Il percorso inserito non esiste."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Controllo dell'accesso"
 
@@ -1447,60 +1431,51 @@ msgid "The wizard successfully configured your NFS server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"È necessario modificare il nome di dominio NIS. Per poter utilizzare in "
-"server NIS è necessario un nome di dominio corretto, diverso da localdomain "
-"e non nullo."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Server NIS con mappatura autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "Indirizzo del client:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Coinfigura un server NIS con mappatura autofs e con i file auto.home e auto."
 "master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Che cosa intendi fare?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Configura il computer come client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 "È necessaro inserire solo il nome di dominio nis e il nome del server nis."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Server NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid ""
 "A NIS server is useful to create user, hostname database. The wizard builds "
@@ -1512,7 +1487,7 @@ msgstr ""
 "agli utenti NIS la possibilità di montare le loro home directory su di un "
 "client NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1520,70 +1495,70 @@ msgstr ""
 "Home NIS: directory home fondamentale per gli utenti sul server NIS. Questa "
 "directory sarà esportata tramite un server NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Dominio NIS: nome del dominio NIS da utilizzare (coincide normalmente con il "
 "nome di dominio DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Serve NIS: nome del computer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Nome dominio NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "L'assistente configurerà il server NIS con mappatura autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Directory NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nome dominio NIS: nome del dominio NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Server NIS: nome macchina del serve NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Directory condivisa:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 #, fuzzy
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 "Errore: il nome di dominio NIS non dovrebbe mai essere 'nessuno' o "
 "'locadomain'"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Si prega di correggere."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del computer come "
 "client NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1591,16 +1566,16 @@ msgstr ""
 "L'assistente ha completato con successo la configurazione del server NIS con "
 "mappatura autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Configurazione del server NIS con mappatura autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Server news"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Configurazione del server DNS"
@@ -1982,7 +1957,7 @@ msgstr ""
 "proxy."
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2015,6 +1990,14 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Assistente 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."
+msgstr ""
+"È necessario correggere il nome di dominio, in modo che sia diverso da nullo "
+"o da \"localdomain\". Per favore esegui drakconnect e cambialo."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Imposta il Server PXE"
@@ -2382,24 +2365,24 @@ msgstr "Configuro il server PXE nel sistema..."
 msgid "PXE server"
 msgstr "Server PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Configurazione Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s non esiste."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Tutti - nessuna restrizione di accesso"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Personalizzato - seleziona host autorizzati e rifiutati"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2407,38 +2390,38 @@ msgstr ""
 "Samba permette al server di agire come server di file e di stampa per "
 "macchine che non utilizzano un sistema Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Assistente di configurazione di Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Questo assistente ti aiuterà a configurare i servizi Samba sul server."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 "È necessario indicare il gruppo di lavoro Windows nel quale Samba sarà "
 "utilizzato."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Gruppo di lavoro"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Gruppo di lavoro:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Il gruppo di lavoro non è corretto"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Descrizione del server"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2446,19 +2429,19 @@ msgstr ""
 "La descrizione è il modo in cui il server sarà reso noto alle postazioni "
 "Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Descrizione:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "La descrizione del server non è corretta"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Livello di accesso:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2467,7 +2450,7 @@ msgstr ""
 "*, tranne uno:\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2476,7 +2459,7 @@ msgstr ""
 "rete/netmask indicata:\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2484,7 +2467,7 @@ msgstr ""
 "* Esempio 3 - permetti l'accesso a due host:\n"
 "hosts allow = segreteria, amministrazione"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2496,23 +2479,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirata"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Nota: l'accesso richiede comunque le password utente appropriate."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "hosts allow:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "hosts deny:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Servizi Samba attivati"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2522,19 +2505,19 @@ msgstr ""
 "condivisione file; consente inoltre la condivisione delle stampanti "
 "collegate al server."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Attiva l'area di condivisione dei file"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Attiva condivisione delle stampanti"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Rendi le directory home disponibili ai rispettivi proprietari"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2542,29 +2525,29 @@ msgstr ""
 "È necessario che ogni utente definisca una password con smbpasswd per poter "
 "accedere alla propria directory home tramite Samba."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Directory condivisa:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Inserisci il percorso della directory che vuoi condividere."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 #, fuzzy
 msgid "Failed to create directory."
 msgstr "Dovrebbe essere una directory."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permessi dei file"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2574,61 +2557,61 @@ msgstr ""
 "preceduti dal simbolo \"@\") separati da virgole, in questo modo:\n"
 "root, mario, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Lista di lettura:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, mario, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Lista di scrittura:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Seleziona le stampanti da rendere accessibili agli utenti autorizzati"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Abilita tutte le stampanti"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Configurazione di Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione di Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Descrizione server:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Condivisione dei file:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Server di stampa:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Home:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Stampanti:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Configurazione del server Samba..."
 
@@ -2873,6 +2856,32 @@ msgstr "Server web Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurazione del server Apache..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "È necessario modificare il nome della macchina"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "È necessario modificare il nome di dominio. Per un server LDAP è "
+#~ "necessario un nome di dominio corretto, diverso da \"localdomain\" o da "
+#~ "un valore nullo. Esegui drakconnect per apportare le necessarie "
+#~ "correzioni."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Aggiungi un utente"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "È necessario modificare il nome di dominio NIS. Per poter utilizzare in "
+#~ "server NIS è necessario un nome di dominio corretto, diverso da "
+#~ "localdomain e non nullo."
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Configurazione del server DHCP"
diff --git a/po/ja.po b/po/ja.po
index d1f40422..60c443f4 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-09 22:15+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -23,31 +23,31 @@ msgstr "設定ウィザード"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "警告"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "エラー"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "おめでとうございます"
 
@@ -76,8 +76,8 @@ 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 ""
-"サーバはここで入力された情報を使って、ネットワークの他のマシンからこの"
-"クライアントを利用できるようにします。"
+"サーバはここで入力された情報を使って、ネットワークの他のマシンからこのクライ"
+"アントを利用できるようにします。"
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
@@ -87,17 +87,17 @@ msgstr "このウィザードではローカルDNSに新規クライアントを
 msgid "(you don't need to type the domain after the name)"
 msgstr "(名前の後のドメインは不要です)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "クライアントのID:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "注意: IPアドレスとクライアント名は固有のものでなければいけません。"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -107,21 +107,21 @@ msgstr ""
 "(例: clientname.company.net)\n"
 "また、それぞれのマシンには固有のIPアドレスが必要です。"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "マシンの名前:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "マシンのIPアドレス:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "警告"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "現在DHCPを使われています。お使いの設定ではサーバが動かないかもしれません。"
@@ -129,12 +129,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "エラー"
@@ -176,13 +176,32 @@ msgstr "クライアントのIP:"
 msgid "The wizard successfully added the client."
 msgstr "クライアントを追加しました。"
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
 msgid ""
-"The command is still running. Do you want to kill it and quit the Wizard?"
+"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 ""
-"コマンドを実行中です。中止してウィザードを終了しますか？"
+"ドメイン名を修正する必要があります。DNSサーバには正しいドメイン名が必要です。"
+"ローカルドメインや「なし」は使えません。また、ホストネームはFQDN(完全修飾ドメ"
+"イン名)でなければいけません。drakconnectを起動して修正してください。"
+
+#: ../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."
+msgstr ""
+"ドメイン名を修正する必要があります。DNSサーバには正しいドメイン名が必要です。"
+"ローカルドメインや「なし」は使えません。また、ホストネームはFQDN(完全修飾ドメ"
+"イン名)でなければいけません。drakconnectを起動して修正してください。"
+
+#: ../common/Wizcommon.pm:98
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
+msgstr "コマンドを実行中です。中止してウィザードを終了しますか？"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "閉じる"
 
@@ -195,7 +214,8 @@ msgid ""
 "DHCP is a service that automatically assigns networking addresses to your "
 "workstations."
 msgstr ""
-"DHCPはワークステーションにネットワークアドレスを自動的に割り当てるサービスです。"
+"DHCPはワークステーションにネットワークアドレスを自動的に割り当てるサービスで"
+"す。"
 
 #: ../dhcp_wizard/Dhcp.pm:53
 msgid "This wizard will help you configuring the DHCP services of your server."
@@ -212,7 +232,8 @@ msgid ""
 "network)."
 msgstr ""
 "DHCPサーバでPXEを有効にする場合はチェックを入れてください。\n"
-"Pre-boot eXecution Environmentはネットワークブートを可能にするプロトコルです。"
+"Pre-boot eXecution Environmentはネットワークブートを可能にするプロトコルで"
+"す。"
 
 #: ../dhcp_wizard/Dhcp.pm:72
 msgid "Range of addresses used by DHCP"
@@ -224,8 +245,8 @@ msgid ""
 "service; unless you have special needs, you can safely accept the proposed "
 "values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
-"DHCPサービスがワークステーションに割り当てるアドレスの範囲を指定してください。"
-"特別な必要がなければ、既定値のままで問題ありません。(例: 192.168.100.20 "
+"DHCPサービスがワークステーションに割り当てるアドレスの範囲を指定してくださ"
+"い。特別な必要がなければ、既定値のままで問題ありません。(例: 192.168.100.20 "
 "192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:82 ../dhcp_wizard/Dhcp.pm:115
@@ -264,15 +285,14 @@ msgstr "DHCPサーバを設定"
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
-msgstr ""
-"DHCPサービスの設定に必要な以下の情報を集めました:"
+msgstr "DHCPサービスの設定に必要な以下の情報を集めました:"
 
 #: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "無効"
@@ -281,8 +301,8 @@ msgstr "無効"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "有効"
@@ -295,137 +315,122 @@ msgstr "インタフェース:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "DHCPサービスの設定が完了しました。"
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "失敗しました。"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizardを再起動して設定を変更してみてください。"
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "ホスト名を修正する必要があります。"
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"ドメイン名を修正する必要があります。DNSサーバには正しいドメイン名が必要です。"
-"ローカルドメインや「なし」は使えません。また、ホストネームはFQDN"
-"(完全修飾ドメイン名)でなければいけません。drakconnectを起動して修正してください。"
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "マスターDNSサーバ"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "スレーブDNSサーバ"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "DNSにホストを追加"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "DNSのホストを削除"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
-"DNS(Domain Name Server)は、マシンのIPアドレスとインターネットのホスト名を"
-"関連づけるサービスです。"
+"DNS(Domain Name Server)は、マシンのIPアドレスとインターネットのホスト名を関連"
+"づけるサービスです。"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "マスターDNSの設定ウィザード"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
-"このウィザードではサーバのDNSサービスを設定します。このサービスは、"
-"ローカルマシン名にローカルDNSサービスを提供し、それ以外の問い合わせについては"
-"外部DNSへ転送します。"
+"このウィザードではサーバのDNSサービスを設定します。このサービスは、ローカルマ"
+"シン名にローカルDNSサービスを提供し、それ以外の問い合わせについては外部DNSへ"
+"転送します。"
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "何をしますか:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "DNSサーバのインターフェース"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(名前の後のドメインは不要です)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "サーバ:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "DNSドメイン名:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "以下のリストから削除するホストを選んでください。"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "既存のDNSの設定からホストを削除"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "ホストを削除:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "コンピュータの名前:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
-msgstr"" 
-"スレーブネームサーバはプライマリネームサーバの負荷を分散すると同時に、マスター"
-"サーバが利用できない非常時にバックアップサーバの働きをします。"
+msgstr ""
+"スレーブネームサーバはプライマリネームサーバの負荷を分散すると同時に、マス"
+"ターサーバが利用できない非常時にバックアップサーバの働きをします。"
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "マスターDNSサーバのIPアドレス:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
-"転送は、サーバが対応できない、またはキャッシュに答えが残っていない"
-"問い合わせについてのみ行なわれます。"
+"転送は、サーバが対応できない、またはキャッシュに答えが残っていない問い合わせ"
+"についてのみ行なわれます。"
 
-
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "forwarderのIP"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -433,21 +438,21 @@ msgstr ""
 "forwarderのIPが必要でアドレスがわかっている場合はIPアドレスを入力してくださ"
 "い。わからない場合は空白のままにしておいてください。"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "外部DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "検索ドメインを追加"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr "ドメイン名は自動的に追加されます。ここで追加する必要はありません。"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -455,112 +460,112 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "検索用のデフォルトドメイン名:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "forwarderには無効のIPアドレスです。[次へ]を押すと設定を続けます。"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "マスターDNSのIPアドレスが無効です。[次へ]を押すと設定を続けます。"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "無効なIPアドレスです。[次へ]を押すと設定を続けます。"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr "ホストがすでにDNS設定にあるようです。[次へ]を押すと設定を続けます。"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "エラー:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr "これはDNS設定に無いようです。[次へ]を押すと設定を続けます。"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
-"DNSサーバが設定されていないようです。DNSウィザードでマスターDNSサーバの設定"
-"を行なってください。"
+"DNSサーバが設定されていないようです。DNSウィザードでマスターDNSサーバの設定を"
+"行なってください。"
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "マスターDNSサーバではなくスレーブサーバのようです。ホストの追加/削除はできま"
 "せん。"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "以下の内容でDNSスレーブを設定します:"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "-"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "このIDのクライアントをDNSに追加します。"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "コンピュータの名前:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "コンピュータのIPアドレス:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "このIDのクライアントをDNSから削除します。"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "以下の内容でDNSサーバを設定します。"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "サーバのホスト名:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "ドメイン名:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "DNSのホストを追加しました。"
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "DNSからホストを削除しました。"
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "DNSサービスの設定が完了しました。"
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "drakwizardを再起動して設定を変更してみてください。"
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "システムをマスターDNSサーバとして設定.."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "システムをスレーブDNSサーバとして設定.."
 
@@ -588,7 +593,7 @@ msgstr "メールサーバ"
 msgid "FTP server"
 msgstr "FTPサーバ"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Sambaサーバ"
 
@@ -612,7 +617,7 @@ msgstr "NISサーバ autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinuxインストールサーバ"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolabサーバ"
 
@@ -638,7 +643,7 @@ msgstr ""
 "[次へ]を押すとインストールを開始します。\n"
 "中止する場合は[キャンセル]を押してください。"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "インストールに失敗しました。"
 
@@ -663,8 +668,8 @@ msgid ""
 "Your server can act as an FTP server toward your internal network (intranet) "
 "and as an FTP server for the Internet."
 msgstr ""
-"このサーバはイントラネット(内部ネットワーク)とインターネットのFTPサーバ"
-"として使えます。"
+"このサーバはイントラネット(内部ネットワーク)とインターネットのFTPサーバとして"
+"使えます。"
 
 #: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP server for the intranet"
@@ -688,7 +693,8 @@ msgstr "FXPを許可: 他のFTP経由のファイル転送を許可する"
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "Chroot home user: users will only see their home directory."
-msgstr "Chrootホームユーザ: ユーザにホームディレクトリより上の階層の閲覧を禁止する"
+msgstr ""
+"Chrootホームユーザ: ユーザにホームディレクトリより上の階層の閲覧を禁止する"
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "FTP Proftpd server options"
@@ -728,8 +734,8 @@ msgid ""
 "Please choose whether to allow a connection to FTP server from internal or "
 "external hosts."
 msgstr ""
-"FTPサーバへの接続を内部ホストに制限するか、外部ホストに許可するかを選んで"
-"ください。"
+"FTPサーバへの接続を内部ホストに制限するか、外部ホストに許可するかを選んでくだ"
+"さい。"
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
@@ -755,8 +761,7 @@ msgstr "FTPサーバの設定に必要な以下の情報を集めました:"
 msgid ""
 "To accept those values, and configure your server, click the next button or "
 "use the back button to correct them"
-msgstr ""
-"内容に間違いがなければ[次へ]、修正する場合は[戻る]を押してください。"
+msgstr "内容に間違いがなければ[次へ]、修正する場合は[戻る]を押してください。"
 
 #: ../ftp_wizard/Proftpd.pm:136
 msgid "Intranet FTP server:"
@@ -864,23 +869,15 @@ msgid ""
 "configure a DHCP server with PXE support, and a PXE server. So it will be "
 "very easy to install Mandrakelinux through a network."
 msgstr ""
-"おめでとうございます。Mandrakelinuxインストールサーバの準備ができました。"
-"DHCPサーバのPXEサポートを有効にし、PXEサーバを設定してください。これによって"
-"ネットワーク経由で簡単にMandrakelinuxのインストールができるようになります。"
+"おめでとうございます。Mandrakelinuxインストールサーバの準備ができました。DHCP"
+"サーバのPXEサポートを有効にし、PXEサーバを設定してください。これによってネッ"
+"トワーク経由で簡単にMandrakelinuxのインストールができるようになります。"
 
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
 msgstr "Kolabの設定ウィザード"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"ドメイン名を修正する必要があります。ローカルドメインや「なし」は使えません。"
-"drakconnectを起動して修正してください。"
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -888,286 +885,275 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 "警告: Kolabを使用するためには次のサービスを設定する必要があります: Proftpd, "
-"LDAP, Cyrus, Postfix, Imap, Saslauth。このウィザードはこれらのサービスの"
-"既存の設定ファイルのバックアップを作成します。"
+"LDAP, Cyrus, Postfix, Imap, Saslauth。このウィザードはこれらのサービスの既存"
+"の設定ファイルのバックアップを作成します。"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Kolabグループウェアサーバの設定ウィザードへようこそ"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Kolabサーバの管理者のパスワードを入力してください。"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "パスワードが一致していません。修正してください。"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "パスワード確認:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "以下の内容でKolabサーバを設定します。"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "ホスト名:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "メールドメイン:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
-"Kolabサーバの設定が完了しました。次のアドレスに'manager'でログインしてください。\n"
+"Kolabサーバの設定が完了しました。次のアドレスに'manager'でログインしてくださ"
+"い。\n"
 "https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "インストール中"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Kolabサーバをインストールしています..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "システムのKolabサーバを設定..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "LDAPウィザード"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"ドメイン名を修正する必要があります。LDAPサーバには正しいドメイン名が必要です。"
-"ローカルドメインや「なし」は使えません。また、ホストネームはFQDN"
-"(完全修飾ドメイン名)でなければいけません。drakconnectを起動して修正してください。"
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "LDAPの設定を表示"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "LDAPサーバにユーザを追加"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "LDAPの設定を削除"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
-"LDAPはディレクトリサービス(特にX.500ベースのディレクトリサービス)に"
-"アクセスするための軽量プロトコルです。"
+"LDAPはディレクトリサービス(特にX.500ベースのディレクトリサービス)にアクセスす"
+"るための軽量プロトコルです。"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAPは'Lightweight Directory Access Protocol'の略です。"
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "LDAP設定ウィザード"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "まずLDAPサーバを設定してください。"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "選択:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "設定を削除"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "既存のbaseを/root/ldap-sav.ldiffに保存"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP: ユーザを追加"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "ユーザを次に作成:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "ユーザを次に作成: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "下の名前:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "名前:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "ユーザログイン:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "有効な下の名前を入れてください。"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "有効な名前を入れてください。"
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "有効なユーザ名を入れてください。"
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAPユーザパスワード"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "パスワードを一致させてください。"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "パスワード確認:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "LDAPのパスワードを入力してください。"
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "パスワードが一致しません。"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "管理者"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "管理者はLDAPデータベースへのアクセス権限を持ったスーパーユーザです。"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "管理者,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "LDAPサーバの設定"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "ドメイン名: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "ドメイン名: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP管理者"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAPディレクトリツリー:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNSのネーミングはLDAPディレクトリツリーの定義に使います。"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAPディレクトリツリー:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP管理者"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAPパスワード:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAPパスワード確認:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "有効なLDAPディレクトリツリーを入れてください。"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "作成するユーザの確認"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "下の名前:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "ユーザ名:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "次に作成:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "LDAPサーバを作成するための情報を確認"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Usersコンテナ:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "LDAPの設定が完了しました。"
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "ユーザを追加しました。"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "LDAPデータベースにユーザを追加中にエラーが発生しました。"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "サーバはすでに設定されています。"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "LDAPサーバはすでに設定されています。"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s 失敗"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "エラー"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "%s に接続できません。"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "ニュースウィザード"
@@ -1188,17 +1174,17 @@ msgid ""
 "example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
-"インターネットホスト名は\"host.domain.domaintype\"のようになります。"
-"例えばお使いのプロバイダが\"provider.com\"のときは、インターネット"
-"ニュースサーバは通常\"news.provider.com\"のようになります。"
+"インターネットホスト名は\"host.domain.domaintype\"のようになります。例えばお"
+"使いのプロバイダが\"provider.com\"のときは、インターネットニュースサーバは通"
+"常\"news.provider.com\"のようになります。"
 
 #: ../news_wizard/Inn.pm:49
 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 ""
-"ニュースサーバ名は、ネットワークにインターネットニュースを提供するホストの"
-"名前です。たいていお使いのプロバイダが提供しています。"
+"ニュースサーバ名は、ネットワークにインターネットニュースを提供するホストの名"
+"前です。たいていお使いのプロバイダが提供しています。"
 
 #: ../news_wizard/Inn.pm:54
 msgid "News server name:"
@@ -1209,7 +1195,8 @@ msgid ""
 "Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
-"お使いのインターネット接続にもよりますが、ポーリング間隔は6〜24時間が適当です。"
+"お使いのインターネット接続にもよりますが、ポーリング間隔は6〜24時間が適当で"
+"す。"
 
 #: ../news_wizard/Inn.pm:60
 msgid "Polling period"
@@ -1250,8 +1237,7 @@ msgstr "インターネットニュースサービスの設定に必要な以下
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
-msgstr ""
-"内容に間違いがなければ[次へ]、修正する場合は[戻る]を押してください。"
+msgstr "内容に間違いがなければ[次へ]、修正する場合は[戻る]を押してください。"
 
 #: ../news_wizard/Inn.pm:88
 msgid "News server:"
@@ -1299,13 +1285,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "ディレクトリ:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "入力されたパスはありません。"
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "アクセス制限"
 
@@ -1315,8 +1301,8 @@ msgid ""
 "level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
-"必要に適したものを選んでください。わからない場合はローカルネットワークを"
-"選んでください。'全て'はセキュリティ上問題があります。"
+"必要に適したものを選んでください。わからない場合はローカルネットワークを選ん"
+"でください。'全て'はセキュリティ上問題があります。"
 
 #: ../nfs_wizard/NFS.pm:69
 msgid "NFS can be restricted to a certain ip class"
@@ -1327,8 +1313,8 @@ 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 ""
-"ネットワーク上のホストにアクセスを許可します。現在のローカルネットワークの"
-"情報は次のとおりです。必要な場合は変更してください。"
+"ネットワーク上のホストにアクセスを許可します。現在のローカルネットワークの情"
+"報は次のとおりです。必要な場合は変更してください。"
 
 #: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:119
 msgid "Grant access on local network"
@@ -1358,145 +1344,137 @@ msgstr "ネットマスク: "
 msgid "The wizard successfully configured your NFS server."
 msgstr "NFSサーバの設定が完了しました。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"NISドメイン名を修正する必要があります。NISサーバには正しいドメイン名が必要です。"
-"ローカルドメインや「なし」は使えません。"
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "autofs mapのNISサーバ"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NISクライアント"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "NISサーバをautofs map, auto.home, auto.masterファイルで設定"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
-"ユーザはNISクライアントネットワークにログオンした時にサーバからホーム"
-"ディレクトリを自動的にマウントします。"
+"ユーザはNISクライアントネットワークにログオンした時にサーバからホームディレク"
+"トリを自動的にマウントします。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "何をしますか？"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "コンピュータをNISクライアントとして設定"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "NISドメインとNISサーバを入れてください。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NISサーバ:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NISドメイン:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 ""
 "NISサーバはユーザ/ホスト名/データベースを作成するのに有用です。ウィザードは"
-"autofs mapを作成し、これによってNISユーザはNISクライアントマシンでホーム"
-"ディレクトリをオートマウントできるようになります。"
+"autofs mapを作成し、これによってNISユーザはNISクライアントマシンでホームディ"
+"レクトリをオートマウントできるようになります。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
-"ホームNIS: NISサーバのユーザのホームベースディレクトリ。このディレクトリは"
-"NFSサーバ経由でエクスポートされます。"
+"ホームNIS: NISサーバのユーザのホームベースディレクトリ。このディレクトリはNFS"
+"サーバ経由でエクスポートされます。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "NISドメイン: 使用するNISドメイン(一般的にはDNSドメイン名と同じ)"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NISサーバ: コンピュータの名前"
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "ホームNIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NISドメイン名:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "このウィザードではautofs mapのNISサーバを設定します。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NISディレクトリ:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NISドメイン名: NISドメインの名前"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NISサーバ: NISサーバのホスト名"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 "YPBINDデーモンはNISドメインのサーバを検索し、バインド情報を管理します。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "エラー:ディレクトリにしてください。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "エラー:NISドメイン名に「なし」やローカルドメインは使えません。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "修正してください。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "マシンをNISクライアントとして設定しました。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "マシンをautofs mapのNISサーバとして設定しました。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "システムをautofs mapのNISサーバとして設定.."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "autofs mapのNIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "システムをNISクライアントとして設定.."
 
@@ -1509,8 +1487,8 @@ msgid ""
 "Error, can't find your hostname in /etc/hosts. Exiting. Please launch "
 "drakconnect and choose static IP address."
 msgstr ""
-"エラー:ホスト名が/etc/hostsにありません。終了します。drakconnectを"
-"起動して固定IPアドレスを選んでください。"
+"エラー:ホスト名が/etc/hostsにありません。終了します。drakconnectを起動して固"
+"定IPアドレスを選んでください。"
 
 #: ../postfix_wizard/Postfix.pm:59
 msgid "External mail server"
@@ -1529,8 +1507,8 @@ msgid ""
 "This wizard will help you configure an internal mail server for your "
 "network, or configure an external mail server."
 msgstr ""
-"このウィザードではネットワーク用の内部メールサーバまたは外部メールサーバ"
-"を設定します。"
+"このウィザードではネットワーク用の内部メールサーバまたは外部メールサーバを設"
+"定します。"
 
 #: ../postfix_wizard/Postfix.pm:82
 msgid ""
@@ -1538,9 +1516,9 @@ msgid ""
 "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:82
 msgid "Outgoing mail address"
@@ -1557,7 +1535,8 @@ msgid ""
 "You can select the kind of address that outgoing mail will show in the "
 "\"From:\" and \"Reply-to\" field."
 msgstr ""
-"送信メールの\"From:\"と\"Reply-to\"欄に表示されるアドレスを選ぶことができます。"
+"送信メールの\"From:\"と\"Reply-to\"欄に表示されるアドレスを選ぶことができま"
+"す。"
 
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
@@ -1580,16 +1559,16 @@ msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"この設定では、ローカルネットワーク外にメールを送信することはできません。"
-"[次へ]を押すと設定を続けます。修正する場合は[戻る]を押してください。"
+"この設定では、ローカルネットワーク外にメールを送信することはできません。[次"
+"へ]を押すと設定を続けます。修正する場合は[戻る]を押してください。"
 
 #: ../postfix_wizard/Postfix.pm:102
 msgid ""
 "Error, sendmail is installed. Please remove it before installing or "
 "configuring Postfix"
 msgstr ""
-"エラー:sendmailがインストールされています。Postfixをインストール/設定"
-"する前に削除してください。"
+"エラー:sendmailがインストールされています。Postfixをインストール/設定する前に"
+"削除してください。"
 
 #: ../postfix_wizard/Postfix.pm:108
 msgid ""
@@ -1625,7 +1604,8 @@ msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from."
 msgstr ""
-"myoriginパラメータは送信メールにの@マーク以後に表示されるドメイン名を指定します。"
+"myoriginパラメータは送信メールにの@マーク以後に表示されるドメイン名を指定しま"
+"す。"
 
 #: ../postfix_wizard/Postfix.pm:124 ../postfix_wizard/Postfix.pm:137
 msgid "myorigin:"
@@ -1711,9 +1691,9 @@ msgid ""
 "requests. Default is 3128, other common value can be 8080, the port value "
 "needs to be greater than 1024."
 msgstr ""
-"プロクシポートには、httpリクエストに対してプロクシサーバが参照するポート"
-"番号を設定します。デフォルトは3128です。8080もよく使われます。ポート番号は"
-"1025以上を指定してください。"
+"プロクシポートには、httpリクエストに対してプロクシサーバが参照するポート番号"
+"を設定します。デフォルトは3128です。8080もよく使われます。ポート番号は1025以"
+"上を指定してください。"
 
 #: ../proxy_wizard/Squid.pm:78
 msgid "Proxy port:"
@@ -1750,8 +1730,8 @@ 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 ""
-"メモリキャッシュは、メモリ操作をキャッシュするのに使うRAMの量です。"
-"(注意: squidプロセスで実際に使用するメモリ量のほうが大きくなります)"
+"メモリキャッシュは、メモリ操作をキャッシュするのに使うRAMの量です。(注意: "
+"squidプロセスで実際に使用するメモリ量のほうが大きくなります)"
 
 #: ../proxy_wizard/Squid.pm:94
 msgid "Proxy Cache Size"
@@ -1777,8 +1757,8 @@ msgid ""
 "level is usually the most appropriate. Beware that the All level may be not "
 "secure."
 msgstr ""
-"必要に適したものを選んでください。わからない場合はローカルネットワークを"
-"選んでください。'全て'はセキュリティ上問題があります。"
+"必要に適したものを選んでください。わからない場合はローカルネットワークを選ん"
+"でください。'全て'はセキュリティ上問題があります。"
 
 #: ../proxy_wizard/Squid.pm:106
 msgid "The proxy can be configured to use different access control levels"
@@ -1805,8 +1785,8 @@ 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 ""
-"オプションで、squidはプロクシを階層的に設定することができます。ホスト名と"
-"ポートを指定して上位プロクシを追加できます。"
+"オプションで、squidはプロクシを階層的に設定することができます。ホスト名とポー"
+"トを指定して上位プロクシを追加できます。"
 
 #: ../proxy_wizard/Squid.pm:129 ../proxy_wizard/Squid.pm:142
 msgid "Cache hierarchy"
@@ -1843,7 +1823,7 @@ msgid ""
 msgstr "プロキシの設定に必要な以下の情報を集めました:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1873,6 +1853,14 @@ msgstr "Squidプロクシ"
 msgid "PXE Wizard"
 msgstr "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."
+msgstr ""
+"ドメイン名を修正する必要があります。ローカルドメインや「なし」は使えません。"
+"drakconnectを起動して修正してください。"
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXEサーバを設定"
@@ -1910,11 +1898,12 @@ msgid ""
 "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サーバの設定とPXEブートイメージの管理を行ないます。"
-"PXE(Pre-boot eXecution Environment)はIntelが開発したプロトコルでネットワーク"
-"ブートを可能にします。PXEは新世代のネットワークカードのROMに保存されます。"
-"コンピュータを起動するとBIOSがメモリーからPXE ROMをロードし実行します。メニューに"
-"ブートイメージが表示され、ネットワーク経由で起動するOSを選択することができます。"
+"このウィザードではPXEサーバの設定とPXEブートイメージの管理を行ないます。PXE"
+"(Pre-boot eXecution Environment)はIntelが開発したプロトコルでネットワークブー"
+"トを可能にします。PXEは新世代のネットワークカードのROMに保存されます。コン"
+"ピュータを起動するとBIOSがメモリーからPXE ROMをロードし実行します。メニューに"
+"ブートイメージが表示され、ネットワーク経由で起動するOSを選択することができま"
+"す。"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid "Add a boot image"
@@ -1925,15 +1914,14 @@ msgid ""
 "PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
-"PXEの説明はブートイメージの役割を説明するのに使います。例: Mandrakelinux "
-"10 image, Mandrakelinux cooker image.."
+"PXEの説明はブートイメージの役割を説明するのに使います。例: Mandrakelinux 10 "
+"image, Mandrakelinux cooker image.."
 
 #: ../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の名前: PXEメニューに表示する名前(空白を含まないASCII文字か数字)"
+msgstr "PXEの名前: PXEメニューに表示する名前(空白を含まないASCII文字か数字)"
 
 #: ../pxe_wizard/Pxe.pm:132
 msgid "Path to image: provide the full path to the network boot image"
@@ -2032,8 +2020,8 @@ msgid ""
 "Server IP: IP address of the server, which contains installation directory. "
 "You can create one with Mandrakelinux install server wizard."
 msgstr ""
-"サーバのIP: インストールディレクトリがあるサーバのIPアドレス。Mandrakelinux"
-"インストールサーバウィザードで作成できます。"
+"サーバのIP: インストールディレクトリがあるサーバのIPアドレス。Mandrakelinuxイ"
+"ンストールサーバウィザードで作成できます。"
 
 #: ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
 msgid "Server IP:"
@@ -2056,8 +2044,8 @@ msgid ""
 "Network client interface: the network interface used for the installation "
 "process."
 msgstr ""
-"ネットワーククライアントインタフェース: インストールに使用するクライアント"
-"インターフェース"
+"ネットワーククライアントインタフェース: インストールに使用するクライアントイ"
+"ンターフェース"
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "Ramsize: adjust the ramsize parameter on boot image."
@@ -2096,8 +2084,8 @@ 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 ""
@@ -2114,8 +2102,8 @@ msgid ""
 "Please provide a bootable image. To boot through a network, network "
 "computers need a boot image."
 msgstr ""
-"ブータブルイメージを指定してください。ネットワークブートを行なうためには"
-"ブートイメージが必要です。"
+"ブータブルイメージを指定してください。ネットワークブートを行なうためにはブー"
+"トイメージが必要です。"
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
@@ -2158,7 +2146,8 @@ msgstr "別のものを指定してください。"
 
 #: ../pxe_wizard/Pxe.pm:237
 msgid "The wizard will now prepare all default files to set your PXE server"
-msgstr "このウィザードではPXEサーバの設定に必要なデフォルトファイルを準備します。"
+msgstr ""
+"このウィザードではPXEサーバの設定に必要なデフォルトファイルを準備します。"
 
 #: ../pxe_wizard/Pxe.pm:239
 msgid "TFTP directory:"
@@ -2216,81 +2205,81 @@ msgstr "システムのPXEサーバを設定.."
 msgid "PXE server"
 msgstr "PXEサーバ"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Sambaウィザード"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s はありません"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "全て - アクセス制限なし"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "手動指定 - 許可/拒否するホストを尋ねる"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
-"Sambaは、Linux以外のワークステーションにファイル/プリンタ共有サービスを"
-"提供することを可能にします。"
+"Sambaは、Linux以外のワークステーションにファイル/プリンタ共有サービスを提供す"
+"ることを可能にします。"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Sambaの設定ウィザード"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "このウィザードではサーバのSambaサービスを設定します。"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Sambaには送信先のウィンドウズワークグループの情報が必要です。"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "ワークグループ"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "ワークグループ:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "ワークグループが不正です。"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "サーバのバナー"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
-"バナーは、このサーバをウィンドウズのワークステーションでどのように認識"
-"させるかを指定します。"
+"バナーは、このサーバをウィンドウズのワークステーションでどのように認識させる"
+"かを指定します。"
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "バナー:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "サーバのバナーが不正です。"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "アクセスレベル: "
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2298,7 +2287,7 @@ msgstr ""
 "* 例１: 150.203.*.* の全IPを許可するが１つだけ除外\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2306,7 +2295,7 @@ msgstr ""
 "* 例２: 指定したネットワーク/ネットマスクのホストのみ許可\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2314,7 +2303,7 @@ msgstr ""
 "* 例３: 複数のホストを許可\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2326,73 +2315,73 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "注意: アクセスにはユーザパスワードが必要です。"
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "許可ホスト:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "拒否ホスト:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Sambaサービスを有効にする"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
-"Sambaはウィンドウズワークステーションにファイル共有エリアを提供し、サーバ"
-"に接続しているプリンタを利用できるようにします。"
+"Sambaはウィンドウズワークステーションにファイル共有エリアを提供し、サーバに接"
+"続しているプリンタを利用できるようにします。"
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "ファイル共有エリアを有効にする"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "サーバのプリンタ共有を有効にする"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "所有者にホームディレクトリへのアクセスを許可する"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
-"Sambaを利用してユーザがホームディレクトリへアクセスできるようにしました。"
-"ただし、smbpasswdを使ってパスワードを設定する必要があります。"
+"Sambaを利用してユーザがホームディレクトリへアクセスできるようにしました。ただ"
+"し、smbpasswdを使ってパスワードを設定する必要があります。"
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "共有ディレクトリ:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "共有するディレクトリのパスを入力してください。"
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "共有ディレクトリが存在しなければ作成してください。"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "ディレクトリの作成に失敗しました。"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "ファイルの権限"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2402,59 +2391,59 @@ msgstr ""
 "(グループの頭には'@'を付ける)。\n"
 "例えば権限ごとに root, hiroshi, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "読み取り:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, hiroshi, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "書き込み:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "利用可能にするプリンタを選んでください。"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "全てのプリンタを有効にする"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Sambaを設定"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Sambaの設定に必要な以下の情報を集めました:"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "サーバのバナー:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "ファイル共有:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "印刷サーバ:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "ホーム:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "プリンタ:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Sambaサーバの設定が完了しました。"
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Sambaサーバを設定.."
 
@@ -2474,13 +2463,13 @@ msgstr "このまま保存"
 msgid ""
 "This wizard will help you to set the time of your server synchronized with "
 "an external time server."
-msgstr ""
-"このウィザードでは外部タイムサーバとこのサーバの時刻を同期させます。"
+msgstr "このウィザードでは外部タイムサーバとこのサーバの時刻を同期させます。"
 
 #: ../time_wizard/Ntp.pm:82
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
-"そうすることによって、このサーバはネットワークのローカルタイムサーバになります。"
+"そうすることによって、このサーバはネットワークのローカルタイムサーバになりま"
+"す。"
 
 #: ../time_wizard/Ntp.pm:82
 msgid "press next to begin, or cancel to leave this wizard"
@@ -2527,8 +2516,8 @@ msgid ""
 "If the time server is not immediately available (network or other reason), "
 "there will be about a 30 second delay."
 msgstr ""
-"タイムサーバがネットワークその他の理由ですぐに応答しない場合は、約30秒の"
-"間隔をおきます。"
+"タイムサーバがネットワークその他の理由ですぐに応答しない場合は、約30秒の間隔"
+"をおきます。"
 
 #: ../time_wizard/Ntp.pm:124
 msgid "Press next to start the time servers test."
@@ -2601,8 +2590,8 @@ msgid ""
 "Your server can act as a Web server toward your internal network (intranet) "
 "and as a Web server for the Internet."
 msgstr ""
-"このサーバはイントラネット(内部ネットワーク)とインターネットのウェブサーバ"
-"として使えます。"
+"このサーバはイントラネット(内部ネットワーク)とインターネットのウェブサーバと"
+"して使えます。"
 
 #: ../web_wizard/Apache.pm:79
 msgid "Enable the Web server for the intranet"
@@ -2618,9 +2607,9 @@ msgid ""
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
-"注: ユーザモジュールはユーザがHTTPサーバのホームディレクトリにサブディレクトリ"
-"を所有し、http://www.yourserver.com/~user から利用できるようにします。"
-"サブディレクトリの名前は後で設定します。"
+"注: ユーザモジュールはユーザがHTTPサーバのホームディレクトリにサブディレクト"
+"リを所有し、http://www.yourserver.com/~user から利用できるようにします。サブ"
+"ディレクトリの名前は後で設定します。"
 
 #: ../web_wizard/Apache.pm:90
 msgid "Modules:"
@@ -2688,6 +2677,29 @@ msgstr "Apacheサーバ"
 msgid "Configuring your system as Apache server ..."
 msgstr "システムをApacheサーバとして設定.."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "ホスト名を修正する必要があります。"
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "ドメイン名を修正する必要があります。LDAPサーバには正しいドメイン名が必要で"
+#~ "す。ローカルドメインや「なし」は使えません。また、ホストネームはFQDN(完全"
+#~ "修飾ドメイン名)でなければいけません。drakconnectを起動して修正してくださ"
+#~ "い。"
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "%s に接続できません。"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "NISドメイン名を修正する必要があります。NISサーバには正しいドメイン名が必要"
+#~ "です。ローカルドメインや「なし」は使えません。"
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "DHCPサーバを設定"
diff --git a/po/ko.po b/po/ko.po
index d7fa0685..721dee00 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2002-09-09 08:06+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hanafos.com>\n"
@@ -26,31 +26,31 @@ msgstr "설정 마법사"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "경고."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "오류."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "축하합니다."
 
@@ -91,18 +91,18 @@ msgstr "이 마법사는 지역 DNS에 새 클라이언트의 추가를 도울 �
 msgid "(you don't need to type the domain after the name)"
 msgstr "(이른 뒤에 도메인을 적을 필요는 없습니다.)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "클라이언트 신원:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "주의: IP와 클라이언트 이름은 네트웍에서 유일한 것이어야 합니다."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,22 +112,22 @@ msgstr ""
 "다. 네트웍상의 각 컴퓨터는 점으로 구분된 형식의 (유일한) IP 주소가 할당되어 "
 "있어야 합니다."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "컴퓨터 이름"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "컴퓨터 IP:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "경고"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -137,12 +137,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "오류"
@@ -186,12 +186,25 @@ msgstr "클라이언트 IP:"
 msgid "The wizard successfully added the client."
 msgstr "새 클라이언트가 추가되었습니다."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "닫기"
 
@@ -280,8 +293,8 @@ msgstr "마법사가 DHCP 서버 설정을 위해 계산한 값은 다음과 같
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "금지"
@@ -290,8 +303,8 @@ msgstr "금지"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "허용"
@@ -305,52 +318,41 @@ msgstr "인터페이스:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "마법사가 성공적으로 DHCP 서버를 설정하였습니다."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "허용"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS 서버"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS 서버"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -358,12 +360,12 @@ msgstr ""
 "DNS(도메인 이름 서비스)는 인터넷 호스트명으로 특정 컴퓨터와 교신할 수 있게 하"
 "는 서비스입니다."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "DNS 설정 마법사"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the DNS services of your server. This "
@@ -374,92 +376,92 @@ msgstr ""
 "에 대한 지역 DNS 서비스를 가능하게 합니다. 외부 컴퓨터에 대한 요청은 외부 DNS"
 "로 전달됩니다."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "NFS 서버"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(이른 뒤에 도메인을 적을 필요는 없습니다.)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "서버 이름:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "계산된 도메인 이름"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "계산된 도메인 이름"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNS 서버 설정 중"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "외부 게이트웨이"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -467,119 +469,119 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "올바른 주소가 아닙니다... 계속하려면 [다음]을 누르세요."
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "올바른 주소가 아닙니다... 계속하려면 [다음]을 누르세요."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "올바른 주소가 아닙니다... 계속하려면 [다음]을 누르세요."
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "오류:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS 설정 마법사"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 #, fuzzy
 msgid "Computer name:"
 msgstr "계산된 도메인 이름"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "서버 IP 주소:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "서버 이름:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "새 클라이언트가 추가되었습니다."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "새 클라이언트가 추가되었습니다."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "마법사가 성공적으로 DNS 서버를 설정하였습니다."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "DNS 서버 설정 중"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "DNS 서버 설정 중"
@@ -612,7 +614,7 @@ msgstr "메일 서버 이름:"
 msgid "FTP server"
 msgstr "FTP 서버"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "데이터베이스 서버"
@@ -642,7 +644,7 @@ msgstr "뉴스 서버"
 msgid "Mandrakelinux Install server"
 msgstr "메일 서버 이름:"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "데이터베이스 서버"
@@ -669,7 +671,7 @@ msgstr ""
 "[%s]가 설치되어 있지 않습니다.\n"
 "지금 설치하려면, [다음]을, 그냥 종료하려면, [취소]를 누르세요."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "테마 설치 실패!"
@@ -905,13 +907,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "삼바 설정 마법사"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -919,307 +915,296 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "웹 서버 설정 마법사"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "암호:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "암호:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "마법사가 성공적으로 인터넷 메일 서버를 설정하였습니다."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "호스트 이름"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "디렉토리:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "FTP 서버 설정 중"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP 서버 설정 중"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "삼바 마법사"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "설정 마법사"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "설정 마법사"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "설정 마법사"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "데이터베이스 서버"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "시간 서버 설정 저장 완료"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "사용자 추가"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "호스트 이름:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "사용자명:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "사용자 추가"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "암호:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "암호:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "암호가 일치하지 않습니다."
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "삼바 설정 중"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "계산된 도메인 이름"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "계산된 도메인 이름%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "디렉토리:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "디렉토리:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "암호:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "암호:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "디렉토리:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "호스트 이름:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "사용자명:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP 서버 설정 중"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "사용자 추가"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "마법사가 성공적으로 프락시 서버를 설정하였습니다."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "마법사가 성공적으로 삼바 서버를 설정하였습니다."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "허용"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "오류!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "뉴스 마법사"
@@ -1355,13 +1340,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "디렉토리:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid "Access control"
 msgstr "액세스 제어"
@@ -1417,147 +1402,141 @@ msgstr ""
 msgid "The wizard successfully configured your NFS server."
 msgstr "마법사가 성공적으로 NFS 서버를 설정하였습니다."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "뉴스 서버"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "클라이언트 IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS 서버"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "홈:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "계산된 도메인 이름"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "마법사가 성공적으로 삼바 서버를 설정하였습니다."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "디렉토리:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "계산된 도메인 이름"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "마법사가 성공적으로 삼바 서버를 설정하였습니다."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "마법사가 성공적으로 삼바 서버를 설정하였습니다."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "DNS 서버 설정 중"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "뉴스 서버"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "DNS 서버 설정 중"
@@ -1914,7 +1893,7 @@ msgid ""
 msgstr "마법사가 프락시 서버 설정을 위해 계산한 값은 다음과 같습니다:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1950,6 +1929,12 @@ msgstr "스퀴드 마법사"
 msgid "PXE Wizard"
 msgstr "FTP 마법사"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2274,25 +2259,25 @@ msgstr ""
 msgid "PXE server"
 msgstr "NFS 서버"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "삼바 마법사"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "모두 - 액세스 제한 없음"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2300,74 +2285,74 @@ msgstr ""
 "삼바는 리눅스가 아닌 컴퓨터들에게 이 서버가 마치 파일/프린트 서버인 것처럼 작"
 "동하게 합니다."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "삼바 설정 마법사"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "이 마법사는 삼바 서버 설정을 도울 것입니다."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "삼바는 서비스할 윈도우즈 작업그룹을 알아야 합니다."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "작업 그룹"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "작업 그룹:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "잘못된 워크그룹입니다."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "서버 배너."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "배너는 윈도우즈 컴퓨터들에게 보여지는 이 서버에 대한 설명입니다."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "배너:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "서버 배너가 올바르지 않습니다."
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid "Access level:"
 msgstr "액세스 제어:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2375,133 +2360,133 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "삼바 서비스 허용"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 #, fuzzy
 msgid "Enable file sharing area"
 msgstr "[/home/samba/public] 공유 영역 허용"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "서버 프린터 공유 허용"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 #, fuzzy
 msgid "Make home directories available for their owners"
 msgstr "홈 디렉토리를 소유자가 사용할 수 있게 합니다."
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 #, fuzzy
 msgid "Enable all printers"
 msgstr "삼바 서비스 허용"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "삼바 설정 중"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "마법사가 삼바 서버 설정을 위해 계산한 값은 다음과 같습니다."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "서버 배너:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "파일 공유:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "프린트 서버:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "홈:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 #, fuzzy
 msgid "Printers:"
 msgstr "프린트 서버:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "마법사가 성공적으로 삼바 서버를 설정하였습니다."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "FTP 서버 설정 중"
@@ -2742,6 +2727,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "DNS 서버 설정 중"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "사용자 추가"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "DHCP 서버 설정 중"
 
diff --git a/po/ku.po b/po/ku.po
index bcc7eed7..3852c1e4 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-05-22 20:15+0100\n"
 "Last-Translator: Kader DILSIZ, Amed çiya <kader@kaderland.net, "
 "amedcj@hotmail.com>\n"
@@ -21,31 +21,31 @@ msgstr "sêrbaza avakirinê"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Hişyar 'be."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Xeletî."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Pîroz be"
 
@@ -88,18 +88,18 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(ne hewce ye ku hûn li paş nêv navê qadê binivîsin)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Salixa daxwazkarê:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Ji bîr nekin ku divê navnîşana IP'ê û navê daxwazkarê di torê de yekane be."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -108,21 +108,21 @@ msgstr ""
 "Daxwazkara di tora we de wekî di navecomputere.pardari.netê de dê bi nêv bê "
 "naskirin. Dive her komputereke di torê de xwediyê naveke xwe yê IP'ê be."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Navê komputerê:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Navnîşana IP'a komputerê:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Hişyar 'be"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Hûn DHCP'ê bi kar tînin, dibe ku pêşkêşkara we bi vê avakirinê nexebite."
@@ -130,12 +130,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Xeletî"
@@ -180,12 +180,33 @@ msgstr "IP'a daxwazkarê:"
 msgid "The wizard successfully added the client."
 msgstr "Sêrbazê, daxwazkar bi awayekî biserketî lê 'kir."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Divê hûn navê qada xwe ji nû ve rast bikin. Ji bo pêşkêşkareke DNS'ê divê "
+"hûn navekî rast a qadê hilbijêrin û divê ev ne localdomain an jî none be. Ji "
+"bo mîhengkirinê drakconnectê bixebitînin."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+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 ""
+"Divê hûn navê qada xwe ji nû ve rast bikin. Ji bo pêşkêşkareke DNS'ê divê "
+"hûn navekî rast a qadê hilbijêrin û divê ev ne localdomain an jî none be. Ji "
+"bo mîhengkirinê drakconnectê bixebitînin."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Bigire"
 
@@ -277,8 +298,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "Pasîf"
@@ -287,8 +308,8 @@ msgstr "Pasîf"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "çalak bû"
@@ -303,54 +324,39 @@ msgstr ""
 "Sêrbazê ji bo pêşkêşkara we, servîsên we yên DHCP'ê bi awayekî biserketî ava "
 "kirin."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Bi ser neket"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Drakwizardê dadin û vekin û guherandina hinek parametreyan biceribînin."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Divê hûn navê makîneya xwe ji nû ve rast bikin."
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"Divê hûn navê qada xwe ji nû ve rast bikin. Ji bo pêşkêşkareke DNS'ê divê "
-"hûn navekî rast a qadê hilbijêrin û divê ev ne localdomain an jî none be. Ji "
-"bo mîhengkirinê drakconnectê bixebitînin."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Pêşkêşkara DNS'ê ya bingehîn"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Pêşkêşkara DNS'ê ya duyemîn"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Navê makîneyê li DNS'ê 'ke"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Navê makîneyê ji DNS'ê rake"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -358,11 +364,11 @@ msgstr ""
 "DNS(Domain Name Server=Pêşkêşkara Navê Qadê)  servîsa ku di navbera navê "
 "komputerê ya înternetê û makînê de pêwendî datîne."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Sêrbaza avakirina bingehîn a DNS'ê"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -372,47 +378,47 @@ msgstr ""
 "re bibe alîkar. Ev avakirin dê ji bo daxwazên ne hundirîn berê we bide "
 "DNS'yeke derve û ji bo komputera hundirîn xizmeteke DNS'ê peyda bike."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Hûn dixwazin çi bikin:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Pêşkêşkara DNS'ê"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Ne hewce ye ku hûn li paş nêv, qadê binivîsin.)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP'a pêşkêşkar:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Navê qada NIS'ê:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Ji lîsteya jêr navê makîneya ku hûn dixwazin rakin hilbijêrin."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Ji avakirina DNS'ê ya heyî, navê makîneyekê rake."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Navê makîneyê rake:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Navê Komputerê:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -422,11 +428,11 @@ msgstr ""
 "stûrbartir be û di heman demê de dema ku pêşkêşkara we ya bingehîn pir dûr "
 "be dê wekî pêşkêşkareke cîgir bixebite."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Navnîşana IP'a pêşkêşkara DNS'a bingehîn:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -434,11 +440,11 @@ msgstr ""
 "Berîdan tenê di lêpirsînên ku pêşkêşkar ne rayedar e û tunebûna bersivê ya "
 "di bîra veşartî de tê holê."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP'a pêşenga we"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -446,15 +452,15 @@ msgstr ""
 "Nexwe heke hewcedariya we he be û pêşenga IP'a xwe zanibin navnîşana IP'ê "
 "bikevinê, heke nizanibin vala berdin"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS'a derve:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Arama alanı ekleQada lêgerînê lê 'ke"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -462,7 +468,7 @@ msgstr ""
 "Navê qadê yê vê pêşkêşkarê ji xwe ve hate lêkirin, ji ber vê yekê ne hewce "
 "ye ku hûn navê qadê li vê 'kin."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -477,27 +483,27 @@ msgstr ""
 "tê diyarkirin, ji bo nirxa ku wekî heye tê pejirandin tenê nevê qadê yê "
 "hundirîn dihewîne. Ev nirx peyva kilît ya lêgerînê??????????????????????"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Navê qadê yê pêşravebûyî yê ku dê lê bê gerîn:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Ev ji bo pêşenga we ne navnîşaneke rast a IP'ê ye... ji bo domkirinê pêl "
 "Pêşê bikin"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Ev ne navnîşaneke bingehîn a DNS IP'ê ye.. ji bo domkirinê pêl Pêşê bikin"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Ev ne navnîşaneke IP'ê ya rast e... ji bo domkirinê pêl Pêşê bikin"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -505,17 +511,17 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Xeletî:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr "Ev di avakirina DNS'a we de nîn e... Ji bo domkirinê pêş Pêşê bikin"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -523,73 +529,73 @@ msgstr ""
 "Bi navçîtiya sêrbazê tu pêşkêşkarên DNS'ê nehatine mîhengkirin. Ji kerema "
 "xwe re sêrbaza DNS'ê bixebitînin: Pêşkêşkara DNS'ê ya Bingehîn."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Xuya ye ku hûn ne pêşkêşkareke bingehîn a DNS'ê ne. Ji ber vê yekê nikarim "
 "kirariya navê makîneyê lê 'ke/jê 'ke pêk bînim."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Temam, niha avakirina DNS'a duyemîn çêdibe"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "bi vê avakirinê:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Daxwazkara bi vê nasnameyê dê li DNS'a we bê kirin"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Navê komputerê:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Navnîşana IP'ê ya komputerê:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Daxwazkara bi vê nasnameyê dê ji DNS'a we bê derxistin"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Pêşkêşkara DNS'ê dê bi avakirina li jêr bê avakirin"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Navê Makîneya Pêşkêşkar:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Navê qadê:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Sêrbazê, navê makîneyê bi awayekî biserketî li DNS'a we kir."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Sêrbazê makîneyê bi awayekî biserketî ji DNS'a we bir."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Sêrbazê servîsên DNS'ê yên pêşkêşkara we bi awayekî biserketî ava kir."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Ji kerema xwe re Drakwizardê dadin û vekin û guherandna hin parametreyan "
 "biceribînin."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Pergala we wekî Pêşkêşkara DNS'ê ya bingehîn tê avakirin..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Pergala we wekî Pêşkêşkara DNS'ê ya duyemîn tê avakirin..."
 
@@ -617,7 +623,7 @@ msgstr "Pêşkêşkara posteyê"
 msgid "FTP server"
 msgstr "Pêşkêşkara FTP'ê"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Pêşkêşkara Sambayê"
 
@@ -642,7 +648,7 @@ msgstr "Nexşeya autofsê ya pêşkêşkara NIS'ê"
 msgid "Mandrakelinux Install server"
 msgstr "Pêşkêşkara sazkirina Mandrake"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Pêşkêşkara Kolabê"
 
@@ -669,7 +675,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:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Saz kirin bi ser neket."
 
@@ -926,16 +932,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Sêrbaza avakirinê ya Kolabê"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Divê ku hûn navê qada xwe ji nû ve sererast bikin. Ev nirx vala an jî "
-"localdomain nabe. Ji kerema xwe re Drakconnectê bixebitînin û nav3e qadê "
-"rast bikin."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -943,305 +940,290 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Sêrbaza Avakirinê ya Pêşkêşkara Webê"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Passporta xwe ji bo hesabe managere yen servere Kolab bide"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Şîfre:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Dîsa şîfre:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Navê komputerê:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Qada NIS'ê:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Rêzika avakirinê"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Pêşkêşkara PXE'yê di pergala we de tê vakirin..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Sêrbaza Ldapyê"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Divê hûn navê qada xwe ji nû ve rast bikin. Ji bo pêşkêşkareke LDAP'ê divê "
-"hûn navekî rast a qadê hilbijêrin û divê ev ne localdomain an jî none be. Ji "
-"bo mîhengkirinê drakconnectê bixebitînin."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Sêrbaza avakirina LDAP'ê"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "Lê 'ke - dane li pêşkêşkara LDAP'ê 'ke"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Sêrbaza avakirina LDAP'ê"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Sêrbaza avakirina LDAP'ê"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Pêşkêşkara PXE'yê saz bike."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Avakirina pêşkêşkara sazkirinê"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Navê Bikarhênerê/î:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Nav:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Navê Bikarhênerê/î:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Kontaner:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Şîfre"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Dîsa şîfre:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Samba tê avakirin"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Navê qadê:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Navê qadê:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Rêzika FTTP'ê:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Rêzika FTTP'ê:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Şîfre:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Dîsa şîfre:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Rêzika FTTP'ê:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Nav:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Navê Bikarhênerê/î:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Pêşkêşkara DHCP'ê ava dibe"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Kontaner:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Sêrbazê Pêşkêşkara we ya LDAP'ê bi awayekî biserketî ava kir."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Lêkirina daneyan bi ser ket"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Lê 'ke - dane li pêşkêşkara LDAP'ê 'ke"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Sêrbazê pêşkêşkara Samba bi awayekî biserkekî ava kir."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Bi ser neket"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Xeletî"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Sêrbaza Nûçeyan"
@@ -1381,13 +1363,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Rêzik:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Riaya ku hû ketinê nîn e."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Venêrîna têketinê"
 
@@ -1442,31 +1424,22 @@ msgstr "Rûpûşa torê:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Sêrbazê, pêşkêşkara we ya NSF'ê bi awayekî biserketî ava kir."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Divê hûn navê qadê yê NIS'ê ji nû ve sererast bikin. Ji bo pêşkêşkareke "
-"NIS'ê divê hûn naveke rast a qada NIS'ê diyar bikin û divê ev ne localdomain "
-"û none be."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Pêşkêşkareke NIS'ê ku nexşeya autofsê dihewîne"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Daxwazkara NIS'ê"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Pêşkêşkareke NIS'ê ku nexşeya autofsê dihewîne saz bike, dosyeyên xweber yên "
 "karger û malê."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1474,35 +1447,35 @@ msgstr ""
 "Dema ku bikarhêneran têketin tora daxwazkara NIS'ê, rêzikên malê ji ber xwe "
 "ve bi pêşkêşkarê ve tên girêdan."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Hûn dixwazin çi bikin?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Komputerê wekî kiryareke NIS'ê ava bike."
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Tenê divê hûn  navê qadê yê nisê û pêşkêşkara nisê lê 'kin."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Pêşkêşkara NIS'ê:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Qada NIS'ê:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1510,65 +1483,65 @@ msgstr ""
 "Rêzika NIS'ê ya malê: Rêzika malê ya bikarhênerên pêşkêşkara NIS'ê. Ev rêzik "
 "dê ji ser pêşkêşkara NFS'ê bê ragihandin."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Qada NIS'ê: Navê qada NIS'ê yê ku dê bê bikaranîn (bi gelemperî wekî navê "
 "qada we ye)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Pêşkêşkara NIS'ê: Navê komputera we."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Rêzika NIS'ê ya malê:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Navê qada NIS'ê:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Sêrbaz pêşkêşkara we ya NIS'ê dê bi nexşeya autofsê re ava bike"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Rêzika NIS'ê."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Navê qada NIS'ê: navê qada NIS'ê."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Pêşkêşkara NIS'ê: navê pêşkêşkara NIS'ê."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Xeletî: divê hûn rêzikekê diyar bikin."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Xeletî: navê qadê, nis divê ne 'localdomain' an jî ne 'vala' be."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Ji kerema xwe re rast bikin."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "Sêrbazê makîneya we, bi awayekî biserketî, wekî kiryareke NIS'ê ava kir."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1576,16 +1549,16 @@ msgstr ""
 "Sêrbaz makîneya we bi awayekî biserketî, wekî pêşkêşkara NIS'ê ya ku destek "
 "dide nexşeya autofsê, ava kir."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 "Pergala we wekî pêşkêşkareke NIS'ê ya bi desteka Autofsê ye tê avakirin..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS'a bi nexşeya Autofsê"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Pergala we wekî daxwazkara NIS'ê tê avakirin..."
 
@@ -1943,7 +1916,7 @@ msgstr ""
 "daxuyand:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1975,6 +1948,15 @@ msgstr "Pêşkêşkara cîgir a Squidê"
 msgid "PXE Wizard"
 msgstr "Sêrbaza PXE'yê"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Divê ku hûn navê qada xwe ji nû ve sererast bikin. Ev nirx vala an jî "
+"localdomain nabe. Ji kerema xwe re Drakconnectê bixebitînin û nav3e qadê "
+"rast bikin."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Pêşkêşkara PXE'yê saz bike"
@@ -2335,24 +2317,24 @@ msgstr "Pêşkêşkara PXE'yê di pergala we de tê avakirin..."
 msgid "PXE server"
 msgstr "Pêşkêşkara PXE'yê"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Sêrbaza Sambayê"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s nîn e."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Tev - Li ber têketinê astengî nîn e"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Rista min - bidestûrbûn an jî qedexebûna makîneyan ji min bipirse"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2360,38 +2342,38 @@ msgstr ""
 "Samba, di stasyonên ku Linuxê naxebitînin de, rê dide pêşkêşkara we ku wekî "
 "pêşkêşkarên demê û moşenên nivîsandinê bixebite."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Sêrbaza avakirina Sambayê"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Ev sêrbaz dema ku hûn xizmeta Sambayê ya pêşkêşkara xwe ava bikin dê ji we "
 "re bibe alîkar."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Divê Samba, Koma xebatê ya Windowsa ku dê jê re pêşkêşî bike zanibe."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Koma xebatê"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Koma xebatê:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Koma xebatê çewt e"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Sernivîsa pêşkêşkarê."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2399,40 +2381,40 @@ msgstr ""
 "Sernivîs, nişandide ka pêşkêşkar dê li stasyonên karê yên Windowsê çawa bê "
 "naskirin."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Sernivîs:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Sernivîsa pêşkêşkarê ne rast e."
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Radeya rê:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr "= allow 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr "arvids jaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2442,23 +2424,23 @@ msgstr ""
 "lê ji bo qedexekirina makîneyekê tenê \\nhosts allow= @foonet\\nhosts deny = "
 "cerdewan"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Nîşe: Hê jî pêdiviya vê riyê bi şîfreya bikarhêner-radeyê heye."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Makîneyên nas:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Makîneyên nenas:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Servîsên Sambayê yên Çalak"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2468,19 +2450,19 @@ msgstr ""
 "û ji bo moşenên nivîsandinê yên pêşkêşkara we jî parvekirina moşenên "
 "nivîsandinê berpêş bike."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Qada parvekirina dosyeyan çalak bike"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Hevpariya Moşena Nivîsandinê çalak bike"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Bila xwedî dikaribin bigihin rêzikên malê"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2488,28 +2470,28 @@ msgstr ""
 "We diyar kir ku bikarhêner bi riya Sambayê dikarin bigihin rêzikên malê, lê "
 "divê hûn/ew bi smbpasswordê şîfreyekê diyar bikin."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Rêzika parvebûyî:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Riya rêzika ku hûn dixwazin bidin parvekirin, bikevinê."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Mafên dosyeyan"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2518,63 +2500,63 @@ msgstr ""
 "Bikarhêner û koman bi bêhnokê ji hev veqetînin û bikevinê (divê kom bi \\'@"
 "\\' ê dest pê bikin) mînak Ji bo hemû destûran:\\nroot, amed, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Lîsteya xwendinê:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Lîsteya nivîsandinê"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Moşenên nivîsandinê yên ku hûn dixwazin bikarhênerên diyar bigihinê "
 "hilbijêrin"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Hemû moşenên nivîsandinê ava bike"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Samba tê avakirin"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Sêrbazê, parametreyên ku ji bo avakirina Sambayê divên bi vî awayê diyar "
 "kirin:"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Sernivîsa pêşkêşkarê:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Hevpariya dosyeyan:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Pêşkêşkara Moşena Nîvîsandinê"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Mal:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Moşenên nivîsandinê:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Sêrbazê pêşkêşkara Samba bi awayekî biserkekî ava kir."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Pêşkêşkara Samba tê avakirin..."
 
@@ -2822,6 +2804,31 @@ 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 "You need to readjust your hostname."
+#~ msgstr "Divê hûn navê makîneya xwe ji nû ve rast bikin."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Divê hûn navê qada xwe ji nû ve rast bikin. Ji bo pêşkêşkareke LDAP'ê "
+#~ "divê hûn navekî rast a qadê hilbijêrin û divê ev ne localdomain an jî "
+#~ "none be. Ji bo mîhengkirinê drakconnectê bixebitînin."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Navê Bikarhênerê/î:"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Divê hûn navê qadê yê NIS'ê ji nû ve sererast bikin. Ji bo pêşkêşkareke "
+#~ "NIS'ê divê hûn naveke rast a qada NIS'ê diyar bikin û divê ev ne "
+#~ "localdomain û none be."
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Pêşkêşkara DHCP'ê ava dibe"
diff --git a/po/ky.po b/po/ky.po
new file mode 100644
index 00000000..231e3f76
--- /dev/null
+++ b/po/ky.po
@@ -0,0 +1,2536 @@
+# translation of drakwizard-ky.po to kyrgyz
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Ilyas Bakirov <just_ilyas@yahoo.com>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: drakwizard-ky\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
+"PO-Revision-Date: 2004-12-09 14:17+0500\n"
+"Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
+"Language-Team: kyrgyz\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#: ../Wiztemplate.pm:31
+msgid "configuration wizard"
+msgstr "ырастоо устасы"
+
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
+#: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
+#: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
+#: ../web_wizard/Apache.pm:85
+msgid "Warning."
+msgstr "Эскертүү."
+
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
+#: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
+#: ../web_wizard/Apache.pm:125
+msgid "Error."
+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:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
+#: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
+#: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
+msgid "Congratulations"
+msgstr "Куттуктайбыз"
+
+#: ../client_wizard/Bind_client.pm:38 ../client_wizard/Bind_client.pm:55
+msgid "DNS Client Wizard"
+msgstr "DNS Клиент Устасы"
+
+#: ../client_wizard/Bind_client.pm:47
+msgid "You must first run the DNS server wizard"
+msgstr "Сиз биринчиден 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 ""
+"Клиент болуп сиздин локалдык тармакка кошулган өз аты жана IP адрреси бар "
+"машина эсептелет."
+
+#: ../client_wizard/Bind_client.pm:55
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr ""
+"Бул устанын ишин баштоо үчүн Кийинки'ни же устадан чыгуу үчүн Калтыруу'ну "
+"басыңыз."
+
+#: ../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 ""
+"Сервер сиздин тармактагы башка машиналарга, клиенттин аты көрүнүш үчүн сиз "
+"бул жерде киргизген информацияны колдонот."
+
+#: ../client_wizard/Bind_client.pm:55
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr "Бул уста локалдык DNS'ке жаңы клиентти кошуу үчүн жардам берет."
+
+#: ../client_wizard/Bind_client.pm:61
+msgid "(you don't need to type the domain after the name)"
+msgstr "(ат койгондон кийин домен киргизүүнүн кереги жок)"
+
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
+msgid "Client identification:"
+msgstr "Клиентты идентификациялоо:"
+
+#: ../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 "IP адрес жана клиенттин аты тармакта уникалдуу болуш керек."
+
+#: ../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 ""
+"Сиздин клиент тармактта клиент_аты.компания.net аты менен идентификациялан. "
+"Тармактагы ар бир машина, (уникалдуу) IP-адрестин жалпы чекитүү синтаксиси "
+"менен болушу керек."
+
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
+msgid "Name of the machine:"
+msgstr "Машинанын аты:"
+
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
+msgid "IP address of the machine:"
+msgstr "Машинанын IP адреси:"
+
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
+msgid "Warning"
+msgstr "Эскертүү"
+
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
+msgid "You are in dhcp, server may not work with your configuration."
+msgstr ""
+"Сиз dhcp колдонуп жатасыз, сервер сиздин ырастоолоруңуз менен иштебей калышы "
+"мүмкүн."
+
+#: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
+#: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:88
+msgid "Error"
+msgstr "Ката"
+
+#: ../client_wizard/Bind_client.pm:78
+msgid "System error, no configuration done"
+msgstr "Системдик ката, эч кандай ырастоолор ишке ашкан жок."
+
+#: ../client_wizard/Bind_client.pm:83
+msgid "This is not a valid address... press next to continue"
+msgstr "Бул адрес жарактуу эмес... улантуу үчүн Кийинки'ни басыңыз"
+
+#: ../client_wizard/Bind_client.pm:88
+msgid "Adding a new client to your network"
+msgstr "Сиздин тармагыңызга жаңы клиентти кошуу"
+
+#: ../client_wizard/Bind_client.pm:88
+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 ""
+"Бул маанилерди алуу жана клиентти кошуу үчүн Кийинки'ни, же Аркага баскычын "
+"аларды өзгөртүү үчүн басыңыз."
+
+#: ../client_wizard/Bind_client.pm:90
+msgid "Client name"
+msgstr "Клиенттин аты"
+
+#: ../client_wizard/Bind_client.pm:91
+msgid "Client IP:"
+msgstr "Клиенттин IP адреси:"
+
+#: ../client_wizard/Bind_client.pm:97
+msgid "The wizard successfully added the client."
+msgstr "Уста клиентти ийгиликтүү кошту."
+
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Домеңиздин атын өзгөртүшүңүз керек. DNS сервери үчүн, сиз доменидин атын "
+"localdomain же бош мааниден башка атка өзгөртүшүңүз керек. Хосттун аты толук "
+"домендик ат менен аныкталышы керек (FQDN, Fully Qualified Domain Name). Аны "
+"өзгөртүү үчүн drakconnect'ти ишке ашырыңыз."
+
+#: ../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."
+msgstr ""
+"Домеңиздин атын өзгөртүшүңүз керек. DNS сервери үчүн, сиз доменидин атын "
+"localdomain же бош мааниден башка атка өзгөртүшүңүз керек. Хосттун аты толук "
+"домендик ат менен аныкталышы керек (FQDN, Fully Qualified Domain Name). Аны "
+"өзгөртүү үчүн drakconnect'ти ишке ашырыңыз."
+
+#: ../common/Wizcommon.pm:98
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
+msgstr ""
+"Буйрук иштеп жатат. Сиз аны өлтүрүү же устанын аяктоосун калап жатасыз?"
+
+#: ../common/Wizcommon.pm:115
+msgid "Close"
+msgstr "Жабуу"
+
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:53
+msgid "DHCP Wizard"
+msgstr "DHCP Устасы"
+
+#: ../dhcp_wizard/Dhcp.pm:53
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
+msgstr ""
+"DHCP - кызматы сиздин иштөө станцияларыңызга автоматтык түрдө тармак "
+"адрестерин менчиктейт."
+
+#: ../dhcp_wizard/Dhcp.pm:53
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "Бул уста сиздин DHCP сервер кызматын орнотууга жардам берет."
+
+#: ../dhcp_wizard/Dhcp.pm:58
+msgid "Interface the dhcp server must listen to"
+msgstr "DHCP сервердин уга турган интерфейс"
+
+#: ../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)."
+msgstr ""
+"Эгерде сиз DHCP сервериңизде PXE'ни активдештирүүнү каласаңыз, анда "
+"\"кутучаны\" тандаңыз. (Pre-boot eXecution Environment, машиналардын "
+"тармактан жүктөлүшүн уруксат берген протокол)."
+
+#: ../dhcp_wizard/Dhcp.pm:72
+msgid "Range of addresses used by DHCP"
+msgstr "DHCP колдонгон адрестер аралыгы"
+
+#: ../dhcp_wizard/Dhcp.pm:72
+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 ""
+"DCHP кызматы менен иштөө стацияларына береле турган адрестер аралыгын "
+"тандаңыз; эгерде сизге өзгөчө адрестер кереги жок болсо, анда сунуш кылынган "
+"адрес маанилерин тандаңыз (мисалы., 192.168.100.20 192.168.100.40)."
+
+#: ../dhcp_wizard/Dhcp.pm:82 ../dhcp_wizard/Dhcp.pm:115
+msgid "Lowest IP address:"
+msgstr "Астынкы IP-адрес:"
+
+#: ../dhcp_wizard/Dhcp.pm:83 ../dhcp_wizard/Dhcp.pm:116
+msgid "Highest IP address:"
+msgstr "Жогорку IP-адрес:"
+
+#: ../dhcp_wizard/Dhcp.pm:84 ../dhcp_wizard/Dhcp.pm:117
+msgid "Gateway IP address:"
+msgstr "Шлюздун IP-адреси:"
+
+#: ../dhcp_wizard/Dhcp.pm:85 ../dhcp_wizard/Dhcp.pm:119
+msgid "Enable PXE:"
+msgstr "PXE'ни жандыруу:"
+
+#: ../dhcp_wizard/Dhcp.pm:95
+msgid "The IP range specified is not correct."
+msgstr "Көрсөтүлгөн IP-адрестердин аралыгы туура эмес."
+
+#: ../dhcp_wizard/Dhcp.pm:100
+msgid "The IP range specified is not in server address range."
+msgstr ""
+"Көрөтүлгөн IP-адрестердин аралыгы сервердеги адрестер аралыгына кирбейт."
+
+#: ../dhcp_wizard/Dhcp.pm:105
+msgid "The IP of the server must not be in range."
+msgstr "Сервердин IP-адреси, аралыктын тышында болушу керек."
+
+#: ../dhcp_wizard/Dhcp.pm:110
+msgid "Configuring the DHCP server"
+msgstr "DHCP Серверин ырастоо"
+
+#: ../dhcp_wizard/Dhcp.pm:110
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr "Уста сиздин DHCP кызматын ырастоо үчүн керектүү параметрлерди топтоду:"
+
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
+#: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
+#: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
+#: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
+msgid "disabled"
+msgstr "өчүк"
+
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
+#: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
+#: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
+#: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
+msgid "enabled"
+msgstr "жанык"
+
+#: ../dhcp_wizard/Dhcp.pm:118
+msgid "Interface:"
+msgstr "Интерфейс:"
+
+#: ../dhcp_wizard/Dhcp.pm:125
+msgid "The wizard successfully configured the DHCP services."
+msgstr "Уста DHCP кызматын ийгиликтүү орнотту."
+
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
+#: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
+#: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
+msgid "Failed"
+msgstr "Игиликсиз аяктады"
+
+#: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
+msgid "Relaunch drakwizard, and try to change some parameters."
+msgstr "drakwizard'ты кайра иштетиңиз , жана кээ бир параметрлерди өзгөртүңүз."
+
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
+msgid "Master DNS server"
+msgstr "Негизги DNS сервер"
+
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
+msgid "Slave DNS server"
+msgstr "Жардамчы DNS сервер"
+
+#: ../dns_wizard/Bind.pm:79
+msgid "Add host in DNS"
+msgstr "DNS'ке хост кошуу"
+
+#: ../dns_wizard/Bind.pm:80
+msgid "Remove host in DNS"
+msgstr "DNS'тен хостту алып салуу"
+
+#: ../dns_wizard/Bind.pm:99
+msgid ""
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
+msgstr ""
+"DNS (домендик аттар сервери) - бул кызмат, машинанын IP адресин Интернеттеги "
+"хосттун аты менен салыштырат."
+
+#: ../dns_wizard/Bind.pm:99
+msgid "DNS Master configuration wizard"
+msgstr "Негизги DNS серверин ырастоо устасы"
+
+#: ../dns_wizard/Bind.pm:99
+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 ""
+"Бул уста сизге DNS сервер кызматын орнотууга жардам берет. Бул ырастоо, "
+"локалдык DNS кызматын локалдык эмес суроолорду локалдык компьютер аттары "
+"үчүн тышкы DNS'терге багыттоо мүмкүнчүлүгүн берет."
+
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:126
+msgid "What do you want to do:"
+msgstr "Эмнени кылышты калайсыз:"
+
+#: ../dns_wizard/Bind.pm:120
+msgid "DNS server Interface"
+msgstr "DNS сервер"
+
+#: ../dns_wizard/Bind.pm:128
+msgid "(You don't need to add the domain after the name)"
+msgstr "(аттан кийин доменди киришти кереги жок)"
+
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
+msgid "Server:"
+msgstr "Сервердин IP'си:"
+
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
+msgid "DNS Domainname:"
+msgstr "DNS'тин домендик аты:"
+
+#: ../dns_wizard/Bind.pm:139
+msgid "Choose the host you want to remove in the following list."
+msgstr "Берилген тизмеден өчүрүлүчү хостту тандаңыз."
+
+#: ../dns_wizard/Bind.pm:139
+msgid "Remove a host in existing DNS configuration."
+msgstr "Бар болгон DNS ырастоосундагы хостту өчүрүү."
+
+#: ../dns_wizard/Bind.pm:139
+msgid "Remove host:"
+msgstr "Хостту өчүрүү:"
+
+#: ../dns_wizard/Bind.pm:141
+msgid "Computer Name:"
+msgstr "Компьютердин аты:"
+
+#: ../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."
+msgstr ""
+
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
+msgid "IP Address of the master DNS server:"
+msgstr "Негизги DNS сервердин IP-адреси:"
+
+#: ../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."
+msgstr ""
+
+#: ../dns_wizard/Bind.pm:156
+msgid "IP of your forwarder"
+msgstr "Форвардердин IP адреси"
+
+#: ../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"
+msgstr ""
+"Эгерде сизге керек болсо же форвардериңиздин IP адресин билсеңиз анда анын "
+"IP адресин кириңиз. Эгерде билбесеңиз анда аны бош калтырыңыз"
+
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
+msgid "External DNS:"
+msgstr "Тышкы DNS"
+
+#: ../dns_wizard/Bind.pm:168
+msgid "Add search domain"
+msgstr "Издөө доменини кошуу"
+
+#: ../dns_wizard/Bind.pm:168
+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"
+msgstr ""
+
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
+msgid "Default domain name to search:"
+msgstr "Издөө үчүн алдынала домендик ат:"
+
+#: ../dns_wizard/Bind.pm:176
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
+msgstr ""
+"Бул форвардериңиздин IP адреси жараксыз... Улантуу үчүн Кийинки'ни басыңыз"
+
+#: ../dns_wizard/Bind.pm:181
+msgid "This is not a valid Master DNS IP address... press next to continue"
+msgstr ""
+"Бул негизги DNS сервердин IP адреси жараксыз... Улантуу үчүн Кийинки'ни "
+"басыңыз"
+
+#: ../dns_wizard/Bind.pm:186
+msgid "This is not a valid IP address... press next to continue"
+msgstr "Бул жарасыз IP адрес... Улантуу үчүн Кийинки'ни басыңыз"
+
+#: ../dns_wizard/Bind.pm:196
+msgid ""
+"It seems that host is already in your DNS configuration... press next to "
+"continue"
+msgstr ""
+"Бул хост DNS ырастоолорунда барга окшош...Улантуу үчүн Кийинки'ни басыңыз"
+
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
+msgid "Error:"
+msgstr "Ката:"
+
+#: ../dns_wizard/Bind.pm:201
+msgid ""
+"It seems that this is not present in your DNS configuration... press next to "
+"continue"
+msgstr "Бул DNS ырастоолорунда жокко окшош...Улантуу үчүн Кийинки'ни басыңыз"
+
+#: ../dns_wizard/Bind.pm:206
+msgid ""
+"It seems that no DNS server has been set through wizard. Please run DNS "
+"wizard: Master DNS server."
+msgstr ""
+"DNS сервери уста менен орнотулбаганына окшойт, DNS устысын ишке ашырыңыз: "
+"Негизги DNS сервер"
+
+#: ../dns_wizard/Bind.pm:211
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
+msgstr ""
+"Сиз негизги DNS серверге окшобойсуз, ошондуктан хостту кошуу/өчүрүү болбойт."
+
+#: ../dns_wizard/Bind.pm:216
+msgid "Wizard will Now build your DNS slave configuration"
+msgstr "Азыр уста сиздин жардамчы DNS сервриңиздин ырастоолорун куруп берет"
+
+#: ../dns_wizard/Bind.pm:216
+msgid "with this configuration:"
+msgstr "бул ырастоолор менен:"
+
+#: ../dns_wizard/Bind.pm:224
+msgid "Client with this identification will be added to your DNS"
+msgstr "Бул идентификация менен клиент сиздин DNS'ке кошулат"
+
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
+msgid "Computer name:"
+msgstr "Компьютер аты:"
+
+#: ../dns_wizard/Bind.pm:229
+msgid "Computer IP address:"
+msgstr "Компьютердин IP-адреси:"
+
+#: ../dns_wizard/Bind.pm:235
+msgid "Client with this identification will be removed from your DNS"
+msgstr "Бул идентификация менен клиент сиздин DNS'тен өчүрүлөт"
+
+#: ../dns_wizard/Bind.pm:243
+msgid ""
+"The DNS server is about to be configured with the following configuration"
+msgstr "DNS сервери берилген ырастоолор менен орнотулат"
+
+#: ../dns_wizard/Bind.pm:245
+msgid "Server Hostname:"
+msgstr "Хосттун аты:"
+
+#: ../dns_wizard/Bind.pm:246
+msgid "Domainname:"
+msgstr "Домендик аты:"
+
+#: ../dns_wizard/Bind.pm:255
+msgid "The wizard successfully added the host in your DNS."
+msgstr "Уста хостту сиздин DNS'ке ийгиликтүү кошту."
+
+#: ../dns_wizard/Bind.pm:261
+msgid "The wizard successfully removed the host from your DNS."
+msgstr "Уста хостту сиздин DNS'тен ийгиликтүү өчүрдү."
+
+#: ../dns_wizard/Bind.pm:268
+msgid "The wizard successfully configured the DNS service of your server."
+msgstr "Уста сиздин DNS сервериңизди ийгиликтүү орнотту."
+
+#: ../dns_wizard/Bind.pm:275
+msgid "Please Relaunch drakwizard, and try to change some parameters."
+msgstr ""
+
+#: ../dns_wizard/Bind.pm:712
+msgid "Configuring your system as Master DNS server ..."
+msgstr ""
+
+#: ../dns_wizard/Bind.pm:726
+msgid "Configuring your system as Slave DNS server ..."
+msgstr ""
+
+#: ../drakwizard.pl:41
+msgid "DHCP server"
+msgstr ""
+
+#: ../drakwizard.pl:42
+msgid "DNS server"
+msgstr ""
+
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
+msgid "News server"
+msgstr ""
+
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
+msgid "NFS server"
+msgstr ""
+
+#: ../drakwizard.pl:45
+msgid "Mail server"
+msgstr ""
+
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
+msgid "FTP server"
+msgstr ""
+
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
+msgid "Samba server"
+msgstr ""
+
+#: ../drakwizard.pl:48
+msgid "Proxy"
+msgstr ""
+
+#: ../drakwizard.pl:49
+msgid "Time server"
+msgstr ""
+
+#: ../drakwizard.pl:50
+msgid "Apache2 web server"
+msgstr ""
+
+#: ../drakwizard.pl:51
+msgid "NIS server autofs map"
+msgstr ""
+
+#: ../drakwizard.pl:52
+msgid "Mandrakelinux Install server"
+msgstr ""
+
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
+msgid "Kolab server"
+msgstr ""
+
+#: ../drakwizard.pl:54
+msgid "ldap server"
+msgstr ""
+
+#: ../drakwizard.pl:68
+msgid "Drakwizard wizard selection"
+msgstr ""
+
+#: ../drakwizard.pl:69
+msgid "Please select a wizard"
+msgstr ""
+
+#: ../drakwizard.pl:157
+#, perl-format
+msgid ""
+"%s is not installed\n"
+"Click \"Next\" to install or \"Cancel\" to quit"
+msgstr ""
+
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
+msgid "Installation failed"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:34
+msgid "FTP wizard"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:73
+msgid "FTP server configuration wizard"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:73
+msgid "This wizard will help you configuring an FTP server for your network."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:79
+msgid "Select the kind of FTP service you want to activate:"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:79
+msgid ""
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:81
+msgid "Enable the FTP server for the intranet"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:82
+msgid "Enable the FTP server for the Internet"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin email: email address of the FTP administrator."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via another FTP."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot home user: users will only see their home directory."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root login:"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot home user:"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:106
+msgid "You are in DHCP, server may not work with your configuration."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid ""
+"Please choose whether to allow a connection to FTP server from internal or "
+"external hosts."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+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:121
+msgid "Sorry, you must be root to do this..."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:126
+msgid "Configuring the FTP server"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:126
+msgid ""
+"The wizard collected the following parameters needed to configure your FTP "
+"server"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:126
+msgid ""
+"To accept those values, and configure your server, click the next button or "
+"use the back button to correct them"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:136
+msgid "Intranet FTP server:"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:137
+msgid "Internet FTP server:"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:138
+msgid "Admin email"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:140
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:148
+msgid "The wizard successfully configured your intranet/Internet FTP server"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
+#: ../pxe_wizard/Pxe.pm:332
+msgid "Please relaunch drakwizard, and try to change some parameters."
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:53
+msgid "Configure a Mandrakelinux install server (via NFS and http)"
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:53
+msgid ""
+"Easily configure a Mandrakelinux server installation directory, with NFS and "
+"HTTP access."
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:58
+msgid "Destination directory: copy file in which directory?"
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:58
+msgid "Install server configuration"
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:58
+msgid ""
+"Path to data: specify your source directory, should be base of a "
+"Mandrakelinux installation."
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:73
+msgid "The destination directory could not be '/var/install/'"
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:73
+msgid "ie use: /var/install/mdk-release"
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:77
+msgid ""
+"Error, the source path must be a directory with full Mandrakelinux "
+"installation directory."
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:81
+msgid "The destination directory is already in use. Please choose another one."
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:85
+msgid "Your install server will be configured with these parameters"
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:93
+msgid "Enable NFS install server:"
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:94
+msgid "Enable HTTP install server:"
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:100
+msgid "Configuring your system, please wait..."
+msgstr ""
+
+#: ../installsrv_wizard/Installsrv.pm:104
+msgid ""
+"Congratulations, Mandrakelinux 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 Mandrakelinux through a network."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:40
+msgid "Kolab configuration wizard"
+msgstr ""
+
+#: ../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"
+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."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:56
+msgid "Welcome to the Kolab Groupware server configuration Wizard."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:70
+msgid "Enter pasword for the manager account of Kolab server."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:73
+msgid "Password mismatch, or null password, please correct."
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
+msgid "Password:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:81
+msgid "Password again:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:86
+msgid "The wizard will now configure Kolab server with these parameters"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:89
+msgid "Hostname:"
+msgstr ""
+
+#: ../kolab_wizard/Kolab.pm:91
+msgid "Mail domain:"
+msgstr ""
+
+#: ../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/"
+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
+msgid "Configuring Kolab server on your system..."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:31
+msgid "Ldap wizard"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:91
+msgid "Show Ldap configuration"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:92
+msgid "Add user in Ldap server"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:93
+msgid "Delete Ldap configuration"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:98
+msgid ""
+"It is a lightweight protocol for accessing directory services, specifically "
+"X.500-based directory services."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:98
+msgid "LDAP stands for Lightweight Directory Access Protocol."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
+msgid "Ldap configuration wizard"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
+msgid "You must setup an Ldap server first."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:126
+msgid "Your choice:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:131
+msgid "Delete configuration"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:131
+msgid "Saving existing base in /root/ldap-sav.ldiff"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:136
+msgid "LDAP Adding User"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:141
+msgid "First Name:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
+msgid "Name:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:143
+msgid "User Login:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:147
+msgid "You must enter a valid First Name."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:151
+msgid "You must enter a valid Name."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:155
+msgid "You must enter a valid User Name."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:162
+msgid "LDAP User Password"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
+msgid "passwords must match"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:166
+msgid "Password (again):"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
+msgid "You must enter a password for LDAP."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
+msgid "The passwords do not match"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:181
+msgid "Administrator is a power user with grant access on LDAP database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:181
+msgid "Configuring LDAP Server"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Домендик аты:"
+
+#: ../ldap_wizard/Ldap.pm:181
+msgid "LDAP Administrator"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:181
+msgid "LDAP directory tree"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:181
+msgid "The DNS naming is used for LDAP directory tree definition"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
+msgid "LDAP directory tree:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
+msgid "LDAP Administrator:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:186
+msgid "LDAP Password:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:187
+msgid "LDAP Password (again):"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:194
+msgid "You must enter a valid LDAP directory tree."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:210
+msgid "Confirmation of the user to create"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:214
+msgid "First name:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:215
+msgid "User Name:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:216
+msgid "Create in:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:222
+msgid "Confirmation Information for create an LDAP server"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
+msgid "Users Container:"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:238
+msgid "The wizard successfully configured the LDAP."
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:244
+msgid "Successfully added User"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:253
+msgid "Error when adding user in Ldap database"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:262
+msgid "Server already configured"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:262
+msgid "You have already configured your Ldap Server"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:421
+#, perl-format
+msgid "%s Failed"
+msgstr ""
+
+#: ../ldap_wizard/Ldap.pm:421
+msgid "Error!"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:33
+msgid "News Wizard"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:44
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+
+#: ../news_wizard/Inn.pm:44
+msgid "Welcome to the News Wizard"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:49
+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 ""
+
+#: ../news_wizard/Inn.pm:49
+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 ""
+
+#: ../news_wizard/Inn.pm:54
+msgid "News server name:"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:60
+msgid ""
+"Depending on the kind of Internet connection you have, an appropriate "
+"polling period can change between 6 and 24 hours."
+msgstr ""
+
+#: ../news_wizard/Inn.pm:60
+msgid "Polling period"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:60
+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 ""
+
+#: ../news_wizard/Inn.pm:65
+msgid "Polling period (hours):"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:76
+msgid "The news server name is not correct"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:81
+msgid "The polling period is not correct"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:86
+msgid "Configuring the Internet News"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:86
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:133
+msgid ""
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
+msgstr ""
+
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
+msgstr ""
+
+#: ../news_wizard/Inn.pm:95
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:34
+msgid "NFS Wizard"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:39
+msgid "All - No access restriction"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:46 ../proxy_wizard/Squid.pm:40
+msgid "Local Network - access for local network (recommended)"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:51
+msgid "NFS Server Configuration Wizard"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:51
+msgid "This wizard will help you configuring the NFS server for your network."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:58
+msgid "Directory:"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
+#: ../web_wizard/Apache.pm:119
+msgid "The path you entered does not exist."
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
+msgid "Access control"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:69
+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 ""
+
+#: ../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:119
+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 ""
+
+#: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:119
+msgid "Grant access on local network"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:82 ../proxy_wizard/Squid.pm:124
+msgid "Authorized network:"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:88
+msgid "The wizard collected the following parameters."
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:94
+msgid "Exported dir:"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:95
+msgid "Access:"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:96
+msgid "Netmask:"
+msgstr ""
+
+#: ../nfs_wizard/NFS.pm:102
+msgid "The wizard successfully configured your NFS server."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
+msgid "NIS server with autofs map"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
+msgid "NIS client"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:74
+msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:74
+msgid ""
+"Users automatically mount their home directory from server, when they log on "
+"a NIS client computer network."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:82
+msgid "What do you want to do?"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:87
+msgid "Configure computer to be a NIS client"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:87
+msgid "You just have to put nisdomain and nisserver."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
+msgid "NIS server:"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:90
+msgid "NIS domain:"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:95
+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:95
+msgid ""
+"Home NIS: home base directory for users on NIS server. This directory will "
+"be exported through NFS server."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:95
+msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:95
+msgid "NIS server: name of your computer."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
+msgid "Home NIS:"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
+msgid "NIS domainname:"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:105
+msgid "The wizard will set your NIS server with autofs map"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:110
+msgid "NIS directory:"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:120
+msgid "NIS domainname: name of NIS domain."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:120
+msgid "NIS server: hostname of the NIS server."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:120
+msgid ""
+"The YPBIND daemon finds the server for NIS domains and maintains the NIS "
+"binding information."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:129
+msgid "Error: should be a directory."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:133
+msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:133
+msgid "Please adjust it."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:139
+msgid "The wizard successfully configured your machine to be a NIS client."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:146
+msgid ""
+"The wizard successfully configured your machine to be a NIS server with "
+"autofs map."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:307
+msgid "Configuring your system to be a NIS server with Autofs map..."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:307
+msgid "NIS with Autofs map"
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:336
+msgid "Configuring your system as NIS client ..."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:39
+msgid "Postfix wizard"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:49
+msgid ""
+"Error, can't find your hostname in /etc/hosts. Exiting. Please launch "
+"drakconnect and choose static IP address."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+msgid "External mail server"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:60
+msgid "Internal mail server"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:66
+msgid "Internet mail configuration wizard"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:66
+msgid ""
+"This wizard will help you configure an internal mail server for your "
+"network, or configure an external mail server."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:82
+msgid ""
+"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:82
+msgid "Outgoing mail address"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:82
+msgid ""
+"This should be chosen consistently with the address you use for incoming "
+"mail."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:82
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\"From:\" and \"Reply-to\" field."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:88
+msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:93
+msgid "Masquerade domain name:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:98
+msgid "Warning:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:98
+msgid "You entered an empty address for the mail gateway."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:98
+msgid ""
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:102
+msgid ""
+"Error, sendmail is installed. Please remove it before installing or "
+"configuring Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Internet host names must be in the form \"host.domain.domaintype\"; for "
+"example, if your provider is \"provider.com\", the Internet mail server is "
+"usually \"smtp.provider.com\"."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:108
+msgid "Internet mail gateway"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114
+msgid "Mail server name:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:119
+msgid "The default is to append myhostname which is fine for small sites."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:119
+msgid ""
+"The myorigin parameter specifies the domain that locally-posted mail appears "
+"to come from."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:124 ../postfix_wizard/Postfix.pm:137
+msgid "myorigin:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:133
+msgid "Configuring the external mail server"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:133
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"external mail server:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:135
+msgid "Internet mail gateway:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:136
+msgid "Form of the address:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:143
+msgid "The wizard will now configure an internal mail server."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:148
+msgid "The wizard successfully configured your external mail server."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
+#: ../postfix_wizard/Postfix.pm:265
+msgid "Postfix Server"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:170
+msgid "removing Sendmail to avoid conflict...."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:265
+msgid "Configuring your Postfix server....."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:41
+msgid "Localhost - access restricted to this server only"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:44
+msgid "No upper level proxy (recommended)"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:45
+msgid "Define an upper level proxy"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:49
+msgid "Squid wizard"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:67
+msgid "Proxy Configuration Wizard"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:67
+msgid ""
+"Squid is a web caching proxy server, it allows faster web access for your "
+"local network."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:67
+msgid "This wizard will help you in configuring your proxy server."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:72
+msgid "Proxy Port"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:72
+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 ""
+
+#: ../proxy_wizard/Squid.pm:78
+msgid "Proxy port:"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:83
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:83
+msgid "You have entered a port that may be useful for this service:"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:90
+msgid "Press back to change the value."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:90
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:94
+msgid ""
+"Disk Cache is the amount of disk space that can be used for caching on disk."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:94
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:94
+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 ""
+
+#: ../proxy_wizard/Squid.pm:94
+msgid "Proxy Cache Size"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:100 ../proxy_wizard/Squid.pm:153
+#: ../proxy_wizard/Squid.pm:166
+msgid "Memory cache (MB):"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:101 ../proxy_wizard/Squid.pm:154
+#: ../proxy_wizard/Squid.pm:167
+msgid "Disk space (MB):"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:106
+msgid "Access Control"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:106
+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 ""
+
+#: ../proxy_wizard/Squid.pm:106
+msgid "The proxy can be configured to use different access control levels"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:119
+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:124
+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:129
+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 ""
+
+#: ../proxy_wizard/Squid.pm:129 ../proxy_wizard/Squid.pm:142
+msgid "Cache hierarchy"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:129
+msgid ""
+"You can safely select \"No upper level proxy\" if you don't need this "
+"feature."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:142
+msgid ""
+"Enter the qualified hostname (like \"cache.domain.net\") and the port of the "
+"proxy to use."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:144 ../proxy_wizard/Squid.pm:156
+msgid "Upper level proxy hostname:"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:145 ../proxy_wizard/Squid.pm:157
+msgid "Upper level proxy port:"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
+msgid "Configuring the Proxy"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:152 ../proxy_wizard/Squid.pm:165
+msgid "Port:"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:155 ../proxy_wizard/Squid.pm:168
+msgid "Access Control:"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:174
+msgid "The wizard has successfully configured your proxy server."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:227
+msgid "Configuring your system as a Proxy server..."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:227
+msgid "Squid proxy"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:60
+msgid "PXE Wizard"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:78
+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
+msgid "Set PXE server"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:86
+msgid "Add boot image (Mandrakelinux release < 9.2)"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:87
+msgid "Remove boot image in PXE"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:88
+msgid "Modify boot image in PXE"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:89
+msgid "Add all.rdz image (Mandrakelinux release > 10.0)"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:111
+msgid "PXE wizard"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:111
+msgid "Set a PXE server."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:132
+msgid "Add a boot image"
+msgstr ""
+
+#: ../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.: "
+"Mandrakelinux 10 image, Mandrakelinux 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)"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:132
+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."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:142
+msgid "Add all.rdz boot image"
+msgstr ""
+
+#: ../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)."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:142
+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."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:153
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:153
+msgid "Remove a boot image"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:153
+msgid "The PXE boot image, and the related entry in PXE menu will be deleted."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:155
+msgid "Boot image to remove:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:161
+msgid "Add options to boot image"
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:161
+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
+msgid "Boot image to modify:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:170
+msgid "Add option to the PXE boot image"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:170
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:170
+msgid "Installation method: choose NFS or HTTP."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:170
+msgid ""
+"Server IP: IP address of the server, which contains installation directory. "
+"You can create one with Mandrakelinux install server wizard."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
+msgid "Server IP:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:174 ../pxe_wizard/Pxe.pm:252
+msgid "Install directory:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:175 ../pxe_wizard/Pxe.pm:253
+msgid "Installation method:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:180
+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."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:180
+msgid "Ramsize: adjust the ramsize parameter on boot image."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:180
+msgid "VGA option: if you encounter any problem with VGA, please adjust. "
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:182 ../pxe_wizard/Pxe.pm:254
+msgid "Network client interface:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:183 ../pxe_wizard/Pxe.pm:255
+msgid "Ramsize:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:184 ../pxe_wizard/Pxe.pm:256
+msgid "VGA option:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:185 ../pxe_wizard/Pxe.pm:257
+msgid "ACPI option:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:186 ../pxe_wizard/Pxe.pm:258
+msgid "APIC option:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:187 ../pxe_wizard/Pxe.pm:259
+msgid "Custom option:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:192
+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."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:196
+msgid ""
+"Please provide a bootable image. To boot through a network, network "
+"computers need a boot image."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:200
+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 Mandrakelinux distribution, in the /isolinux/"
+"alt0/ directory."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:224
+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
+msgid "A similar name is already used in PXE menu"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:229 ../pxe_wizard/Pxe.pm:233
+msgid "Please provide another one."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:237
+msgid "The wizard will now prepare all default files to set your PXE server"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:239
+msgid "TFTP directory:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:240
+msgid "Boot image path:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:241
+msgid "PXE 'default' file:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:242
+msgid "PXE 'help' file:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:248
+msgid "The wizard will now modify boot options with those parameters:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:265
+msgid "The wizard will now remove this PXE boot image"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:267
+msgid "PXE entry to remove:"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:274 ../pxe_wizard/Pxe.pm:284
+msgid "The wizard will now add this PXE boot image"
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:296
+msgid "The wizard successfully added the PXE boot image."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:308
+msgid "The wizard successfully removed the PXE boot image."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:320
+msgid "The wizard successfully modified the boot option."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:325
+msgid "The wizard successfully configured your PXE server."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:624
+msgid "Configuring PXE server on your system..."
+msgstr ""
+
+#: ../pxe_wizard/Pxe.pm:624
+msgid "PXE server"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:38
+msgid "Samba wizard"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
+#, perl-format
+msgid "%s does not exist."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:70
+msgid "All - no access restriction"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:71
+msgid "My rules - ask me allowed and denied hosts"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:76
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:76
+msgid "Samba configuration wizard"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:76
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:81
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:81
+msgid "Workgroup"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
+msgid "Workgroup:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:92
+msgid "The Workgroup is wrong"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:97
+msgid "Server banner."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:97
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:103
+msgid "Banner:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:108
+msgid "The server banner is incorrect"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:119
+msgid "Access level:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:124
+msgid ""
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
+"hosts allow = 150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:124
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\n"
+"hosts allow = 150.203.15.0/255.255.255.0"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:124
+msgid ""
+"* Example 3: allow a couple of hosts\n"
+"hosts allow = lapland, arvidsjaur"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:124
+msgid ""
+"* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
+"from one particular host\n"
+"hosts allow = @foonet\n"
+"hosts deny = pirate"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:124
+msgid "Note that access still requires suitable user-level passwords."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:131
+msgid "Allow hosts:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:132
+msgid "Deny hosts:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:137
+msgid "Enabled Samba services"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:137
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:145
+msgid "Enable file sharing area"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:146
+msgid "Enable server Printer Sharing"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:147
+msgid "Make home directories available for their owners"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:152
+msgid ""
+"You have selected to allow user access their home directories via samba but "
+"you/they must use smbpasswd to set a password."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
+msgid "Shared directory:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:158
+msgid "Type the path of the directory you want being shared."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:165
+msgid "Create shared directory if it doesn't exist"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:170
+msgid "Failed to create directory."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:180
+msgid "File permissions"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:180
+msgid ""
+"Type users or groups separated by a comma (groups must be preceded by a '@') "
+"like this:\n"
+"root, fred, @users, @wheel for each kind of permission."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:187
+msgid "Read list:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
+msgid "root, fred, @users, @wheel"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:188
+msgid "Write list:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:198
+msgid "Select which printers you want to be accessible from known users"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:205
+msgid "Enable all printers"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:223
+msgid "Configuring Samba"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:223
+msgid "The wizard collected the following parameters to configure Samba."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:232
+msgid "Server banner:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:233
+msgid "File sharing:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:235
+msgid "Print server:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:236
+msgid "Home:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:237
+msgid "Printers:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:243
+msgid "The wizard successfully configured your Samba server."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:525
+msgid "Configuring your Samba server..."
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:34
+msgid "Time wizard"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:60
+msgid "Try again"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:61
+msgid "Save config without test"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:82
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:82
+msgid "Thus your server will be the local time server for your network."
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:82
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:87
+msgid ""
+"(we recommend using the server pool.ntp.org twice as this server randomly "
+"points to available time servers)"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:87
+msgid "Select a primary and secondary server from the list."
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:87
+msgid "Time servers"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
+msgid "Primary time server:"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
+msgid "Secondary time server:"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
+msgid "Choose a timezone"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:106
+msgid "Choose a region:"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:119
+msgid "Choose a city:"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:124
+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:124
+msgid "Press next to start the time servers test."
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:124
+msgid "Testing the time servers availability"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:132
+msgid "Time zone:"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:145
+msgid "The time servers are not responding. The causes could be:"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:146
+msgid "- non existent time servers"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:147
+msgid "- no outside network"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:148
+msgid "- other reasons..."
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:149
+msgid ""
+"- You can try again to contact time servers, or save configuration without "
+"actually setting time."
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:165
+msgid "Time server configuration saved"
+msgstr ""
+
+#: ../time_wizard/Ntp.pm:165
+msgid "Your server can now act as a time server for your local network."
+msgstr ""
+
+#: ../web_wizard/Apache.pm:39
+msgid "Web wizard"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:71
+msgid "This wizard will help you configuring the Web server for your network."
+msgstr ""
+
+#: ../web_wizard/Apache.pm:71
+msgid "Web server configuration wizard"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:77
+msgid "Don't check any box if you don't want to activate your Web server."
+msgstr ""
+
+#: ../web_wizard/Apache.pm:77
+msgid "Select the kind of Web service you want to activate:"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:77
+msgid "Web server"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:77
+msgid ""
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
+msgstr ""
+
+#: ../web_wizard/Apache.pm:79
+msgid "Enable the Web server for the intranet"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:80
+msgid "Enable the Web server for the Internet"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:90
+msgid ""
+"* User module: allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
+msgstr ""
+
+#: ../web_wizard/Apache.pm:90
+msgid "Modules:"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:93
+msgid ""
+"Allows users to get a directory in their home directories \n"
+"available on your http server via http://www.yourserver.com/~user."
+msgstr ""
+
+#: ../web_wizard/Apache.pm:100 ../web_wizard/Apache.pm:103
+msgid ""
+"Type the name of the directory users should create in their homes (without "
+"~/) to get it available via http://www.yourserver.com/~user"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:103
+msgid "user http sub-directory: ~/"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:108
+msgid "Type the path of the directory you want being the document root."
+msgstr ""
+
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:131
+msgid "Configuring the Web server"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:131
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"server"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:137
+msgid "Intranet web server:"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:138
+msgid "Internet web server:"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:140
+msgid "User directory:"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:147
+msgid "The wizard successfully configured your intranet/Internet Web server"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:236
+msgid "Apache server"
+msgstr ""
+
+#: ../web_wizard/Apache.pm:236
+msgid "Configuring your system as Apache server ..."
+msgstr ""
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Сизге, хостуңуздун атын өзгөртүү керек."
diff --git a/po/lv.po b/po/lv.po
index 0f115738..2ef6f7ec 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2002-09-18 22:09+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -21,33 +21,33 @@ msgstr "Konfigurācijas meistars"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "Brīdinājums"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 #, fuzzy
 msgid "Error."
 msgstr "Meistara kļūda."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Apsveicam"
 
@@ -88,11 +88,11 @@ msgstr "Šis meistars Jums palīdzēs pievienot jaunu klientu lokālajā DNS."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(nav nepieciešams norādīt domēnu pēc vārda)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Klienta identifikācija:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -101,7 +101,7 @@ msgstr ""
 "Ņemiet vērā, ka dotajai IP adresei un klienta nosaukumam jābūt unikāliem "
 "tīklā."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Your client on the network will be identified by name, as in clientname."
@@ -112,22 +112,22 @@ msgstr ""
 "net. Katram datoram tīklā ir jābūt ar (unikālu) IP adresi, parastajā "
 "punktētajā sintaksē."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Datora vārds:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Datora IP adrese:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Brīdinājums"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -136,12 +136,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
@@ -185,12 +185,25 @@ msgstr "Klienta IP:"
 msgid "The wizard successfully added the client."
 msgstr "Meistars veiksmīgi pievienoja klientu."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Aizvērt"
 
@@ -281,8 +294,8 @@ msgstr "Meistars apkopoja sekojošus parametrus, lai konfigurētu DHCP serveri"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "aizliegts"
@@ -291,8 +304,8 @@ msgstr "aizliegts"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "atļauts"
@@ -307,154 +320,143 @@ msgstr "Interfeiss:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Meistars veiksmīgi nokonfigurēja DHCP servisu priekš Jūsu servera."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "atļauts"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS serveris"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS serveris"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "DNS konfigurēšanas meistars"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "NFS serveris"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(nav nepieciešams norādīt domēnu pēc vārda)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Servera nosaukums:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Lietotāja vārds:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Tiek konfigurēts DNS serveris"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "Ārējā vārteja"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -462,116 +464,116 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Meistara kļūda."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS konfigurēšanas meistars"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Servera IP adrese:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Servera nosaukums:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Meistars veiksmīgi pievienoja klientu."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Meistars veiksmīgi pievienoja klientu."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Meistars veiksmīgi nokonfigurēja DNS servisu priekš Jūsu servera."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Tiek konfigurēts DNS serveris"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Tiek konfigurēts DNS serveris"
@@ -603,7 +605,7 @@ msgstr "Pasta servera nosaukums:"
 msgid "FTP server"
 msgstr "FTP serveris"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Datubāzu serveris"
@@ -633,7 +635,7 @@ msgstr "News serveris"
 msgid "Mandrakelinux Install server"
 msgstr "Pasta servera nosaukums:"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Datubāzu serveris"
@@ -660,7 +662,7 @@ msgstr ""
 "%s nav instalēts\n"
 "Klikšķiniet \"Nākamis\", lai instalētu, vai \"Atlikt\" lai beigtu"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "Tēmas instalēšana neizdevās!"
@@ -894,13 +896,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Samba konfigurēšanas meistars"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -908,306 +904,296 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Web servera konfigurēšanas meistars"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Parole:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Parole:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, 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:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Servera nosaukums:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Direktorijs:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Tiek konfigurēts FTP serveris"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Tiek konfigurēts FTP serveris"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap meistars"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Konfigurācijas meistars"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Konfigurācijas meistars"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Konfigurācijas meistars"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Datubāzu serveris"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Laika servera konfigurācija saglabāta"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Lietotāja pievienošana"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Vārds:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Lietotāja vārds:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Lietotāja pievienošana"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Parole:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Parole:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Paroles nesakrīt"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Tiek konfigurēta Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Direktorijs:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Direktorijs:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Parole:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Parole:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Direktorijs:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Vārds:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Lietotāja vārds:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Tiek konfigurēts DHCP serveris"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Lietotāja pievienošana"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Meistars veiksmīgi nokonfigurēja proxy serveri."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Meistars veiksmīgi nokonfigurēja Samba serveri"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "atļauts"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Meistara kļūda."
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 #, fuzzy
 msgid "News Wizard"
@@ -1339,13 +1325,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorijs:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid "Access control"
 msgstr "Pieejas kontrole"
@@ -1397,144 +1383,138 @@ msgstr ""
 msgid "The wizard successfully configured your NFS server."
 msgstr "Meistars veiksmīgi nokonfigurēja NFS serveri"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "News serveris"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "Klienta IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS serveris"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Meistars veiksmīgi nokonfigurēja Samba serveri"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "Direktorijs:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Meistars veiksmīgi nokonfigurēja Samba serveri"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Meistars veiksmīgi nokonfigurēja Samba serveri"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Tiek konfigurēts DNS serveris"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "News serveris"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Tiek konfigurēts DNS serveris"
@@ -1887,7 +1867,7 @@ msgid ""
 msgstr "Meistars apkopoja sekojošus parametrus, lai konfigurētu Proxy"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1923,6 +1903,12 @@ msgstr "Squid meistars"
 msgid "PXE Wizard"
 msgstr "FTP meistars"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2247,97 +2233,97 @@ msgstr ""
 msgid "PXE server"
 msgstr "NFS serveris"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba meistars"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba konfigurēšanas meistars"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Šis meistars palīdzēs Jums nokonfigurēt Jūsu servera Samba servisus."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Darba grupa"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid "Access level:"
 msgstr "Piekļuves kontrole:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2345,133 +2331,133 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Atļaut Samba servisus"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 #, fuzzy
 msgid "Enable file sharing area"
 msgstr "Atļaut /home/samba/public dalīšanās apgabalu"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 #, fuzzy
 msgid "Enable server Printer Sharing"
 msgstr "Atļaut /home/samba/public dalīšanās apgabalu"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 #, fuzzy
 msgid "Enable all printers"
 msgstr "Atļaut Samba servisus"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Tiek konfigurēta Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Meistars apkopoja sekojošus parametrus, lai konfigurētu Samba:"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 #, fuzzy
 msgid "Print server:"
 msgstr "News serveris:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Meistars veiksmīgi nokonfigurēja Samba serveri"
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Tiek konfigurēts FTP serveris"
@@ -2716,6 +2702,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Tiek konfigurēts DNS serveris"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Lietotāja pievienošana"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Tiek konfigurēts DHCP serveris"
 
diff --git a/po/mk.po b/po/mk.po
index 48a3c42f..379781c7 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: 2004-11-05 12:34+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-05 14:41+0100\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -23,31 +23,31 @@ msgstr "конфигурационен волшебник"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Предупредување."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Грешка."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Честитки"
 
@@ -90,11 +90,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(не мора да го пишувате доменот по името)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Идентификација на клиентот:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -102,7 +102,7 @@ msgstr ""
 "Забележете дека дадената IP адреса и името на клиентот треба да бидат "
 "единствени во мрежата."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,21 +112,21 @@ msgstr ""
 "kompanija.net. Секоја машина на мрежата мора да има (единствена) IP адреса "
 "во вообичаената синтакса на броеви одвоени со точки."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Име на машината:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP адреса на машината:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Предупредување"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Вие сте во dhcp, можеби серверот нема да работи со вашата конфигурација."
@@ -134,12 +134,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Грешка"
@@ -185,14 +185,36 @@ msgstr "IP на клиентот:"
 msgid "The wizard successfully added the client."
 msgstr "Волшебникот успешно го додаде клиентот."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Треба повторно да го прилагодите името на вашиот домен. За DNS сервер "
+"потребно е исправно име на домен, да не како локалниот домен или било каков. "
+"Името на компјутерот треба да е целосно квалификациско име на домен. "
+"Вклучете го drakconnect за да го прилагодите."
+
+#: ../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."
+msgstr ""
+"Треба повторно да го прилагодите името на вашиот домен. За DNS сервер "
+"потребно е исправно име на домен, да не како локалниот домен или било каков. "
+"Името на компјутерот треба да е целосно квалификациско име на домен. "
+"Вклучете го drakconnect за да го прилагодите."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "Командата сеуште работи. Дали сакате да ја убиете и да го напуштите "
 "Волшебникот?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Затвори"
 
@@ -286,8 +308,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "оневозможено"
@@ -296,8 +318,8 @@ msgstr "оневозможено"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "овозможено"
@@ -310,54 +332,39 @@ msgstr "Интерфејс:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Волшебникот успешно ги конфигурира DHCP сервисите."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Неуспешно"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Повторно вклучете го drakwizard, и обидте се да сменете некои параметри."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Треба повторно да го прилагодите името на вашиот компјутер."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Треба повторно да го прилагодите името на вашиот домен. За DNS сервер "
-"потребно е исправно име на домен, да не како локалниот домен или било каков. "
-"Името на компјутерот треба да е целосно квалификациско име на домен. "
-"Вклучете го drakconnect за да го прилагодите."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Главен DNS сервер"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Секундарен DNS сервер"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Додади компјутер во DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Отстрани компјутер од DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -365,11 +372,11 @@ msgstr ""
 "DNS (Domain Name Server) е сервис кој мапира IP адреса на машина со интернет "
 "име на компјутерот."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Волшебник за конфигурација на главен DNS сервер"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -379,47 +386,47 @@ msgstr ""
 "сервер. Оваа конфигурација ќе нуди локален DNS сервис за локалните имиња на "
 "компјутери, а нелокалните барања ќе бидат проследени до надворешен DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Што сакате да направите:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "NFS сервер"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(не мора да го додавате доменот по името)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Серверско име:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Пресметано име на домен"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Изберете го компјутерот кој сакате да го отстраните во следнава листа."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Отстрани компјутер во постоечка DNS конфигурација."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Отстрани компјутер:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Име на компјутерот:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -429,21 +436,21 @@ msgstr ""
 "сервер, и исто така ќе работи како зашитетен сервер, во случај вашиот главен "
 "сервер да е недостапен."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP адреса на главниот DNS сервер:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP на вашиот препраќач"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -451,15 +458,15 @@ msgstr ""
 "Ако ви е потребно и ја знаете IP адресата на вашиот препраќач, внесете IP "
 "адреса за него. Доколку не е така, оставете го празно"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Надворешен DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Додади домен за барање"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -467,7 +474,7 @@ msgstr ""
 "Името на доменот на овој сервер автоматски е додадено, и не мора да го "
 "додавате овде."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -475,28 +482,28 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Ова не е валидна адреса за вашиот пренасочувач... притиснете „следно“ за да "
 "продолжите"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Ова не е валидна IP адреса на главниот DNS... притиснете „следно“ за да "
 "продолжите"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Ова не е валидна IP адреса... притиснете „следно“ за да продолжите"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -504,11 +511,11 @@ msgstr ""
 "Изгледа дека компјутерот веќе се наоѓа во конфигурацијата на DNS-от... "
 "притиснете „следно“ за да продолжите"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -516,7 +523,7 @@ msgstr ""
 "Изгледа дека ова не се наоѓа во вашата DNS конфигурација... притиснете "
 "„следно“ за да продолжите"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -524,74 +531,74 @@ msgstr ""
 "Изгледа дека не е подесен DNS преку волшебник. Ве молиме вклучете DNS "
 "волшебник: Главен DNS сервер."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Изгледа дека ова не е главниот DNS сервер, затоа не можам да додавам/"
 "остранувам компјутери."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 "Волшебникот сега ќе ја направи вашата конфигурација за секундарниот DNS"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "со оваа конфигурација:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Клиент со оваа идентификација ќе биде додаден на вашиот DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Име на компјутерот:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP адреса на компјутерот:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Клиент со оваа идентификација ќе биде отстранет од вашиот DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS серверот ќе се конфигурира со следнава конфигурација"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Име на серверот:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Име на доменот:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Волшебникот успешно додаде компјутер во вашиот DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Волшебникот успешно го отстрани компјутерот од вашиот DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Волшебникот успешно го конфигурира DNS сервисот на Вашиот сервер."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Ве молиме повторно вклучете го drakwizard, и обидете се да сменете некои "
 "параметри."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Го конфигурирам вашиот систем како главен DNS сервер ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Го конфигурирам вашиот систем како секундарен DNS сервер ..."
 
@@ -619,7 +626,7 @@ msgstr "Сервер за пошта"
 msgid "FTP server"
 msgstr "FTP сервер"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba сервер"
 
@@ -643,7 +650,7 @@ msgstr "NIS сервер autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux Инсталационен сервер"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab сервер"
 
@@ -668,7 +675,7 @@ msgstr ""
 "%s не е инсталиран\n"
 "За да инсталирате притиснете \"Наредно\" или \"Откажи\""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Инсталацијата не успеа"
 
@@ -919,15 +926,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Волшебник за конфигурирање на Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Треба повторно да го пролагодите името на доменот, да не е како локалниот "
-"домен или било каков. Ве молиме вклучете го drakconnect и прилагодете го."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -935,280 +934,271 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Веб сервер конфигурациска самовила"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Лозинките не се совпаѓаат, или нема лозинка, ве молиме поправете."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Лозинка повторно:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Волшебникот сега ќе конфигурира Kolab сервер со следниве параметри"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Име на компјутерот:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Инсталирањето е во тек"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Инсталирање на Kolab сервер на вашиот систем..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Конфигурирање на Kolab сервер на вашиот систем..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap волшебник"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Прикажи Ldap конфигурација"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Додај корисник во Ldap серверот"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Отстрани Ldap конфигурација"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Волшебник за конфигурирање на LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Најпрво треба да подесите LDAP сервер."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ваш избор:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Отстрани конфигурација"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Зачувување на постоечката база во /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP Додавање корисник"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Корисник креиран во: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Корисник креиран во: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Име:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Име:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Најава на корисник:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Мора да внесете валидно име."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Мора да внесете валидно име."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Мора да внесете валидно корисничко име."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Лозинка на LDAP корисник"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "лозинките мора да се совпаѓаат"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Лозинка (повторно):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Мора да внесете лозинка за LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Лозинките не се совпаѓаат"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Администратор"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Администратор е моќен корисник на кој му е дозволен пристап до базата на "
 "податоци на LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Администратор,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Конфигурирање на LDAP сервер"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Име на доменот: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Име на доменот: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP Администратор"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Дрво на директориуми на LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Дрво на директориуми на LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP Администратор:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP лозинка (повторно):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Мора да внесете валидно дрво на директориуми на LDAP."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Потврда за креирање на корисникот"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Име:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Корисничко име:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Креирај во:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Потврдна информација за создавање на LDAP сервер"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Додавање корисник"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Волшебникот успешно го конфигурираше LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Успешно е додаден корисник"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Грешка при додавање на корисник во базата на податоци на Ldap"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Серверот е веќе конфигуриран"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Веќе сте го конфигурирале вашиот Ldap сервер"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Неуспa"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Грешка!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Не можам да се поврзам на %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News волшебник"
@@ -1353,13 +1343,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Директориум:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Патот што го наведовте не постои."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Контрола на пристап"
 
@@ -1413,29 +1403,20 @@ msgstr "Нетмаска:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Волшебникот успешно го конфигурираше Вашиот NFS сервер."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Треба повторно да прилагодите NIS името на доменот. За NIS сервер потребно е "
-"да го поправите NIS името на доменот, да не е како локалниот домен или било "
-"каков."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS сервер со autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS клиент"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Подесете NIS сервер со autofs map, auto.home и auto.master датотеки."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1443,35 +1424,35 @@ msgstr ""
 "Кога корисниците ќе се најават на компјутерска мрежа со NIS клиенти, "
 "автоматски ги монтираат домашните директроиуми од серверот."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Што сакате да направите?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Конфигурирајте компјутер како NIS клиент"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Само треба да внесете NIS домен и NIS сервер."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS сервер:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS домен:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1479,42 +1460,42 @@ msgstr ""
 "Домашен NIS: основен домашен директориум за корисниците на NIS сервер. Овој "
 "директориум ќе се експортира преку NFS серверот."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS домен: NIS домен кој ќе се употребува (генарално исто и како името на "
 "DNS доменот)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS сервер: името на вашиот компјутер."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Домашен NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS име на доменот:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Волшебникот ќе го подеси NIS серверот со autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS директориум:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS име на доменот: името на NIS доменот."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS сервер: името на компјутерот на NIS серверот."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1522,23 +1503,23 @@ msgstr ""
 "YPBIND демонот го наоѓа серверот за NIS домени и ја одржува NIS "
 "информацијата за поврзување."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Грешка: треба да е директориум."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Грешка: Името на NIS доменот не треба да е 'none' или 'localdomain'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Ве молиме прилагодете."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Волшебникот успешно ја конфигурира вашата машина како NIS клиент."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1546,15 +1527,15 @@ msgstr ""
 "Волшебникот успешно ја конфигурира вашата машина како NIS сервер со autofs "
 "map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Конфигурирање на вашиот систем како NIS сервер со Autofs map..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS со Autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Конфигурирање на вашиот систем како NIS клиент ..."
 
@@ -1925,7 +1906,7 @@ msgstr ""
 "прокси:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1962,6 +1943,14 @@ msgstr "Squid самовила"
 msgid "PXE Wizard"
 msgstr "FTP самовила"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Треба повторно да го пролагодите името на доменот, да не е како локалниот "
+"домен или било каков. Ве молиме вклучете го drakconnect и прилагодете го."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 #, fuzzy
 msgid "Set PXE server"
@@ -2353,25 +2342,25 @@ msgstr "Конфигурирање на PXE сервер на вашиот ко�
 msgid "PXE server"
 msgstr "NFS сервер"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba самовила"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Сите - Без ограничување на пристап"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Мои правила - Прашај ме за допуштени и недопуштени компјутери"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2379,56 +2368,56 @@ msgstr ""
 "Самба му овозможува на Вашиот сервер да се однесува како датотечен и "
 "принтерски сервер за компјутери што не оперираат под линукс системи."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba конфигурациска самовила"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Овој волшебник ќе Ви помогне во конфигурирање на Samba сервисите на Вашиот "
 "сервер."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Sabma треба да ја знае Windows Workgroup-ата што ќе ја опслужува."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Workgroup"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Работна група:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Workgroup-от е грешен"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Серверски банер."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "Банерот е описот на овој сервер во Windows компјутерите."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Банер:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Серверскиот банер е неточен"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Ниво на пристап:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2437,7 +2426,7 @@ msgstr ""
 "* Пример 1: пушти ги сите IP адреси во 150.203.*.*; освен една\\nhosts allow "
 "= 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2446,7 +2435,7 @@ msgstr ""
 "* Пример 2: дозвола за компјутерите што одговараат на дадена мрежа/маска "
 "\\nhosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
@@ -2454,7 +2443,7 @@ msgid ""
 msgstr ""
 "* Пример 3: пушти неколку компјутери\\nhosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2466,23 +2455,23 @@ msgstr ""
 "допуштај пристап од еден конкретен компјутер\\nhosts allow = @foonet\\nhosts "
 "deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Запомнете дека за пристап се потребни соодветни кориснички лозинки."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Допуштени:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Недопуштени:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Овозможени Самба сервиси"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2492,19 +2481,19 @@ msgstr ""
 "Вашите Windows компјутери, и може да Ви понуди споделување на принтерите "
 "поврзани на Вашиот сервер."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Овозможи споделување датотеки"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Овозможи серверско споделување на принтер"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Нека домашните директориуми се достапни за нивните сопственици"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2512,29 +2501,29 @@ msgstr ""
 "Избравте да дозволите пристап на корисниците до нивните домашни директориуми "
 "преку самба, но Вие/тие мора да го користат smbpasswd за да постават лозинка."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Споделен директориум:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Внесете го патот на директориумот што сакате да го споделите."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 #, fuzzy
 msgid "Failed to create directory."
 msgstr "Терба да е директориум."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Датотечни пермисии"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2544,61 +2533,61 @@ msgstr ""
 "Внеси ги корисниците или групата, одвоени со запирки (групите мора да имаат "
 "префикс \\'@\\') како:\\nroot, fred, @users, @wheel за секој вид пермисии."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "read листа:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "write листа:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Изберете кои принтери да бидат достапни од познатите корисници"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Овозможи ги сите принтери"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Конфигурирање на Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Серверски банер:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Споделување датотеки:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Принтер сервер:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Дома:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Принтери:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Самовилата успешно го конфигурираше Вашиот Samba сервер."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Конфигурирање на FTP серверот ..."
 
@@ -2848,3 +2837,17 @@ msgstr "Apache сервер"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Конфигурирање на вашиот систем како Apache сервер ..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Треба повторно да го прилагодите името на вашиот компјутер."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Не можам да се поврзам на %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Треба повторно да прилагодите NIS името на доменот. За NIS сервер "
+#~ "потребно е да го поправите NIS името на доменот, да не е како локалниот "
+#~ "домен или било каков."
diff --git a/po/ms.po b/po/ms.po
index fd975d39..895f9cc2 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-10-31 07:20+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -22,31 +22,31 @@ msgstr "wizard konfigurasi"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Amaran"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Ralat."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Tahniah"
 
@@ -87,19 +87,19 @@ msgstr ""
 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:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "Client identification:"
 msgstr "(%ld)PELANGGAN >>> %s"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "IP dan dalam."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Your client on the network will be identified by name, as in clientname."
@@ -107,23 +107,23 @@ msgid ""
 "in the usual dotted syntax."
 msgstr "on dalam on IP dalam."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 #, fuzzy
 msgid "Name of the machine:"
 msgstr "_Nama Warna:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Alamat IP DCC:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Amaran"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Amaran dalam."
@@ -131,12 +131,12 @@ msgstr "Amaran dalam."
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Ralat"
@@ -181,12 +181,25 @@ msgstr "Alamat IP"
 msgid "The wizard successfully added the client."
 msgstr ""
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Tutup"
 
@@ -281,8 +294,8 @@ msgstr "DHCP:"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "dimatikan"
@@ -291,8 +304,8 @@ msgstr "dimatikan"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "dihidupkan"
@@ -307,64 +320,53 @@ msgstr "Antaramuka"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Gagal"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Terima Notis Pelayan"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Terima Notis Pelayan"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "hos:"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../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."
 msgstr "Domain Nama Pelayan IP."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Konfigurasikan"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the DNS services of your server. This "
@@ -372,96 +374,96 @@ msgid ""
 "with non-local requests forwarded to an outside DNS."
 msgstr "lokal lokal lokal."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 #, fuzzy
 msgid "What do you want to do:"
 msgstr "Anda pasti mahu keluar?"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(anda tidak perlu menaip domain selepas nama)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Alamat IP"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Nama warna latarbelakang"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "Hos tidak diketahui %s."
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "_Nama Warna:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Pelayan FTP"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 #, fuzzy
 msgid "IP of your forwarder"
 msgstr "Alamat IP DCC:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "DNS Songsang"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 #, fuzzy
 msgid "Add search domain"
 msgstr "Pencarian Case Sensitif%s%s"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -469,117 +471,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 #, fuzzy
 msgid "Default domain name to search:"
 msgstr "Nama bagi font default untuk digunakan"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Ralat:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "--help  Keluarkan bantuan ini."
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 #, fuzzy
 msgid "Computer name:"
 msgstr "_Nama Warna:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Alamat IP DCC:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Namahos tidak sah"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "DHCP."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "DHCP."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "DHCP."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "FTP"
@@ -613,7 +615,7 @@ msgstr "%s: ralat pelayan nama tidak dapat dipulihkan berlaku."
 msgid "FTP server"
 msgstr "Pelayan FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Pelayan Web"
@@ -643,7 +645,7 @@ msgstr "Pelayan Berita"
 msgid "Mandrakelinux Install server"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Pelayan Web"
@@ -668,7 +670,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "[%s (%s): gagal.  Diabaikan]\n"
@@ -915,13 +917,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Membaca fail konfigurasi sistem %s..."
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -929,309 +925,298 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Pelayan Konfigurasikan"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Katalaluan:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Katalaluan:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Internet Mel."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Namahos:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "jendela-direktori"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "FTP"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 #, fuzzy
 msgid "Ldap wizard"
 msgstr "Masa"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Membaca fail konfigurasi sistem %s..."
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Membaca fail konfigurasi sistem %s..."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Membaca fail konfigurasi sistem %s..."
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Terima Notis Pelayan"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Terima Notis Pelayan"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Nama Pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "_Nama Warna:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "bekas-html"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Katalaluan:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Katalaluan:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Proksi SOCKS: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Nama warna latarbelakang"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Nama warna latarbelakang%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "jendela-direktori"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "jendela-direktori"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Katalaluan:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Katalaluan:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "jendela-direktori"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "_Nama Warna:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Nama Pengguna:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Terima Notis Pelayan"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "bekas-html"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Internet FTP"
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "IDENT: data tidak betul."
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Internet FTP"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Gagal"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Ralat!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 #, fuzzy
 msgid "News Wizard"
@@ -1371,13 +1356,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktori:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid "Access control"
 msgstr "Tak dapat mengakses %s"
@@ -1433,149 +1418,143 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Pelayan Berita"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "(%ld)PELANGGAN >>> %s"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "Anda pasti mahu keluar?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Asal:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Internet Berita."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "jendela-direktori"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS server: hostname of the NIS server."
 msgstr "tak dapat menentukan namahos"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Samada palet patut digunakan"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 #, fuzzy
 msgid "Please adjust it."
 msgstr " --help           Sangat jelas..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Internet FTP"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Internet Berita."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "FTP"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Pelayan Berita"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "FTP"
@@ -1935,7 +1914,7 @@ msgid ""
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -1971,6 +1950,12 @@ msgstr "Proksi SOCKS: %s"
 msgid "PXE Wizard"
 msgstr "FTP"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2309,109 +2294,109 @@ msgstr ""
 msgid "PXE server"
 msgstr "Terima Notis Pelayan"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 #, fuzzy
 msgid "Samba wizard"
 msgstr "Masa"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, fuzzy, perl-format
 msgid "%s does not exist."
 msgstr "pengguna %s tidak wujud"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Semua Tidak"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 #, fuzzy
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "dan"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 #, fuzzy
 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:72
+#: ../samba_wizard/Samba.pm:76
 #, fuzzy
 msgid "Samba configuration wizard"
 msgstr "Membaca fail konfigurasi sistem %s..."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 #, fuzzy
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Tetingkap Kumpulankerja."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Kumpulankerja"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Kumpulankerja:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 #, fuzzy
 msgid "The Workgroup is wrong"
 msgstr "%s adalah salah saiz (%s!= %s + %s)"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 #, fuzzy
 msgid "Server banner."
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 #, fuzzy
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "dalam Tetingkap."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 #, fuzzy
 msgid "The server banner is incorrect"
 msgstr "Jawapan pelayan tidak sah."
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid "Access level:"
 msgstr "Tak dapat mengakses %s"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr "dalam"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr "hos"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr "hos"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2420,26 +2405,26 @@ msgid ""
 "hosts deny = pirate"
 msgstr "hos dalam NIS"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "pengguna."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 #, fuzzy
 msgid "Allow hosts:"
 msgstr "Hos unik:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 #, fuzzy
 msgid "Deny hosts:"
 msgstr "Hos unik:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 #, fuzzy
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
@@ -2447,52 +2432,52 @@ msgid ""
 "server."
 msgstr "fail Tetingkap dan."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 #, fuzzy
 msgid "Enable file sharing area"
 msgstr "Benarkan beberapa buffer fail"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 #, fuzzy
 msgid "Enable server Printer Sharing"
 msgstr "Pelayan"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 #, fuzzy
 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/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 #, fuzzy
 msgid "Shared directory:"
 msgstr "jendela-direktori"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 #, fuzzy
 msgid "Type the path of the directory you want being shared."
 msgstr "Jenis direktori."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid "File permissions"
 msgstr "menukar keizinan %s"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2500,67 +2485,67 @@ msgid ""
 "root, fred, @users, @wheel for each kind of permission."
 msgstr "Jenis."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 #, fuzzy
 msgid "Read list:"
 msgstr "item-senarai"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 #, fuzzy
 msgid "Write list:"
 msgstr "item-senarai"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 #, fuzzy
 msgid "Enable all printers"
 msgstr "mengabaikan segala hujah"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "FTP"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 #, fuzzy
 msgid "Server banner:"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 #, fuzzy
 msgid "File sharing:"
 msgstr "Pemilih-fail"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 #, fuzzy
 msgid "Print server:"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 #, fuzzy
 msgid "Home:"
 msgstr "Laman Mula"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Pencetak:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "FTP"
@@ -2813,3 +2798,7 @@ msgstr "(%ld)PELAYAN >>> %s"
 #, fuzzy
 msgid "Configuring your system as Apache server ..."
 msgstr "FTP"
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Nama Pengguna:"
diff --git a/po/mt.po b/po/mt.po
index 6e25fd31..1fe4e4ce 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-10 06:45+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -26,31 +26,31 @@ msgstr "saħħar ta' konfigurazzjoni"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Twissija."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Problema."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Prosit!"
 
@@ -90,18 +90,18 @@ msgstr "Dan is-saħħar jgħinek biex iżżid klijent ġdid fuq id-DNS lokali."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(m'hemmx bżonn iddaħħal id-dominju wara l-isem)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identifikazzjoni tal-klijent:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Innota li l-indirizz IP u isem il-klijent iridu jkunu uniċi fuq in-network."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -111,21 +111,21 @@ msgstr ""
 "Kull kompjuter fuq in-network irid ikollu indirizz IP uniku, fis-sintassi "
 "normali tat-tikek."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Indirizz IP tal-kompjuter:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Twissija"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Int qiegħed fuq dhcp. Is-server jista' ma jaħdimx b'din il-konfigurazzjoni."
@@ -133,12 +133,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Problema"
@@ -182,12 +182,32 @@ msgstr "IP tal-klijent:"
 msgid "The wizard successfully added the client."
 msgstr "Is-saħħar żied il-klijent."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Trid tibdel l-isem tad-dominju. Għal server DNS trid isem ta' dominju ta' "
+"veru, mhux localdomain jew xejn. L-isem tal-kompjuter irid ikun FQDN "
+"(\"Fully Qualified Domain Name\"). Ħaddem drakconnect biex tirranġah."
+
+#: ../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."
+msgstr ""
+"Trid tibdel l-isem tad-dominju. Għal server DNS trid isem ta' dominju ta' "
+"veru, mhux localdomain jew xejn. L-isem tal-kompjuter irid ikun FQDN "
+"(\"Fully Qualified Domain Name\"). Ħaddem drakconnect biex tirranġah."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Il-kmand għadu qed jaħdem. Triq tikkanċellah u toħroġ mis-Saħħar?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Agħlaq"
 
@@ -282,8 +302,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "mitfi"
@@ -292,8 +312,8 @@ msgstr "mitfi"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "attivat"
@@ -306,52 +326,38 @@ msgstr "Interfaċċja:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Is-saħħar ikkonfiguralek is-servizzi DHCP tas-server."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Falla"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Erġa' ħaddem drakwizard, u ipprova ibdel xi parametri."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Trid tibdel l-isem tal-kompjuter."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Trid tibdel l-isem tad-dominju. Għal server DNS trid isem ta' dominju ta' "
-"veru, mhux localdomain jew xejn. L-isem tal-kompjuter irid ikun FQDN "
-"(\"Fully Qualified Domain Name\"). Ħaddem drakconnect biex tirranġah."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Server DNS ewlieni"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Server NFS skjav"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Żid kompjuter fid-DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Neħħi kompjuter minn DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -359,11 +365,11 @@ msgstr ""
 "DNS (Domain Name Server) huwa s-servizz li jżomm assoċjazzjoni bejn indirizz "
 "ta' kompjuter u l-isem."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Saħħar ta' konfigurazzjoni DNS ewlieni"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -373,47 +379,47 @@ msgstr ""
 "konfigurazzjoni tipprovdilek servizz DNS lokali għal ismijiet ta kompjuters "
 "lokali, filwaqt li ismijiet m'humiex lokali jiġu mgħoddija lil DNS estern."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "X'tixtieq tagħmel:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Server DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(M'hemmx bżonn iddaħħal id-dominju wara l-isem)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP tas-server:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Dominju NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Agħżel il-kompjuter li trid tneħħi mil-lista segwenti."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Neħħi kompjuter mill-konfigurazzjoni DNS eżistenti."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Neħħi kompjuter:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -422,11 +428,11 @@ msgstr ""
 "Server DNS skjav ineħħi ftit mill-piż minn fuq dak ewlieni, u jiffunzjona "
 "wkoll bħala server ta' backup, f'każ li s-server ewlieni jiġrilu xi ħaġa."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Indirizz IP tas-server ewlieni DNS:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -434,11 +440,11 @@ msgstr ""
 "\"Forwarding\" iseħħ biss għal dawk it-talbiet li s-server m'għandux "
 "awtorità fuqhom u m'għandux risporta għalihom fil-\"cache\"."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP tal-\"forwarder\""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -446,15 +452,15 @@ msgstr ""
 "Jekk għandek bżonn \"IP forwarder\" u għandek l-indirizz tiegħu, daħħlu "
 "hawn, jekk le ħallih vojt"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS estern:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Żid dominju tat-tfittxija"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -462,7 +468,7 @@ msgstr ""
 "Id-dominju tas-server jiġi miżjud awtomatikament, m'hemmx għalfejn iddaħħlu "
 "hawn."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -474,27 +480,27 @@ msgstr ""
 "biss l-isem tad-dominju lokali. Dan jista' jinbidel billi tillistja s-"
 "sekwenza tat-tfittxija ta' dominji wara l-kelma \"search\""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Dominju impliċitu biex tfittex:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Dan m'huwiex indirizz validu għall-\"forwarder\"... Agħfas Li jmiss biex "
 "tkompli"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Dan m'huwiex indirizz validu ta' DNS ewlieni... Agħfas Li jmiss biex tkompli"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Dan m'huwiex indirizz validu... Agħfas Li jmiss biex tkompli"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -502,11 +508,11 @@ msgstr ""
 "Jidher li dan il-kompjuter diġà qiegħed fil-konfigurazzjoni DNS... Agħfas Li "
 "jmiss biex tkompli"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Problema:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -514,7 +520,7 @@ msgstr ""
 "Jidher li dan mhux preżenti fil-konfigurazzjoni DNS... Agħfas Li jmiss biex "
 "tkompli"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -522,71 +528,71 @@ msgstr ""
 "Jidher li ebda server DNS ma ġie miżjud mis-saħħar. Jekk jogħġbok ħaddem is-"
 "saħħar tad-DNS ewlieni."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Jidher li dan mhux server ewlieni DNS, għalhekk ma nistax inżid/inneħħi "
 "kompjuters."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Is-Saħħar issa se jibni l-konfigurazzjoni DNS skjav"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "b'din il-konfigurazzjoni:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Klijent b'din l-identifikazzjoni se jiġi miżjud mad-DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Indirizz IP tal-kompjuter:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Il-klijent b'din l-identifikazzjoni se jitneħħa mid-DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Is-server DNS se jiġi konfigurat b'din il-konfigurazzjoni"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Isem is-server:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Isem id-dominju:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Is-saħħar żied il-klijent."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Is-saħħar neħħa l-kompjuter mid-DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Is-saħħar ikkonfiguralek is-servizzi DNS tas-server."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Jekk jogħġbok erġa' ħaddem drakwizard, u pprova ibdel xi parametri."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Qed jiġi kkonfigurat is-server DNS ewlieni ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Qed jiġi kkonfigurat is-server DNS skjav ..."
 
@@ -614,7 +620,7 @@ msgstr "Server tal-imejl"
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Server Samba"
 
@@ -638,7 +644,7 @@ msgstr "mappa autofs tas-server NIS"
 msgid "Mandrakelinux Install server"
 msgstr "Server tal-installazzjoni Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Server Kolab"
 
@@ -663,7 +669,7 @@ msgstr ""
 "%s m'hux installat\n"
 "Klikkja \"Li jmiss\" biex tinstalla jew \"Ikkanċella\" biex tieqaf"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Installazzjoni falliet"
 
@@ -908,15 +914,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Saħħar ta' konfigurazzjoni ta' Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Trid tibdel l-isem tad-dominju - ma jridx ikun \"localdomain\" jew vojt. "
-"Jekk jogħġbok ħaddem drakconnect biex tirranġah."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -928,7 +926,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:59
+#: ../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 "
@@ -938,39 +936,39 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 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:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Daħħal il-password għall-kont tal-manager tas-server Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Passwords ma jaqblux, jew password vojt. Jekk jogħġbok ikkoreġi."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Irrepeti password:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Isem il-kompjuter:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Dominju tal-imejl:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -978,45 +976,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Għaddejja l-installazzjoni"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Qed jiġi konfigurat is-server Kolab fuq is-sistema..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Saħħar tas-Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Trid tibdel l-isem tad-dominju. Għal server LDAP trid isem ta' dominju ta' "
-"veru, mhux localdomain jew xejn. L-isem tal-kompjuter irid ikun FQDN "
-"(\"Fully Qualified Domain Name\"). Ħaddem drakconnect biex tirranġah."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Uri konfigurazzjoni LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Żid utent mas-server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Ħassar konfigurazzjoni LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1024,194 +1012,192 @@ msgstr ""
 "Huwa protokoll ħafif biex taċċessa servizzi tad-direttorju, speċifikament "
 "servizzi tad-direttorju ibbażati fuq X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP ifisser Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Saħħar ta' konfigurazzjoni LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "L-ewwel trid tissettja s-server LDAP."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "L-għażla tiegħek:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Ħassar konfigurazzjoni"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Qed nikteb il-bażi eżistenti f' /root/ldap-save.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP Żieda ta' Utent"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Utent maħluq f':"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Isem proprju:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Isem:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Login ta' utent:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "L-ewwel trid iddaħħal isem proprju validu:"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Trid iddaħħal isem validu:"
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Trid iddaħħal isem tal-utent validu"
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Password tal-utent LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "passwords iridu jaqblu"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Verifika tal-password:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Trid iddaħħal password għal LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Il-passwords ma jaqblux"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Amministatur"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "L-amministratur huwa utent privileġġjat b' aċċess għal \"grant\" fuq id-"
 "databażi LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Amministatur,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Qed jiġi kkonfigurat server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Isem tad-dominju:"
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Isem tad-dominju:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Amministatur LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Friegħi tad-direttorju LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 "L-isimijiet mid-DNS jintużaw għad-definizzjonijiet tal-friegħu tad-"
 "direttorju LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Friegħi tad-direttorju LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Amministratur LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Password LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Ivverifika password LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Trid iddaħħal friegħi tad-direttorju validu LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Konferma tal-utent li trid toħloq"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Isem proprju:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Isem tal-utent:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Oħloq f':"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Ikkonferma l-informazzjoni għall-ħolqien ta' server LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Kontenitur tal-utenti:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Is-saħħar ikkonfiguralek is-server LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Ġie miżjud l-utent"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Problema waqt iż-żieda ta' utent fid-databażi LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Server diġà konfigurat"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Diġà għandek server LDAP konfigurat"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s ma rnexxiex"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Problema!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Ma stajtx naqbad ma' %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Saħħar \"news\""
@@ -1350,13 +1336,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direttorju:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Id-direttorju li għażilt ma jeżistix."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontroll tal-aċċess"
 
@@ -1410,28 +1396,20 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Is-saħħar ikkonfiguralek is-server NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Trid taġġusta l-isem tad-dominju NIS. Għal server NIS trid isem ta' dominju "
-"validu, mhux \"localdomain\" jew inkella vojt."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Server NIS b'mappa autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Klijent NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Issettja server NIS b'mappa autofs u fajls auto.home u auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1439,28 +1417,28 @@ msgstr ""
 "Users awtomatikament jimmontaw id-direttorju personali mis0-server meta "
 "jilloggjaw fuq network ta' kompjuters klijenti NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "X'tixtieq tagħmel?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Ikkonfigura kompjuter biex ikun klijent NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Trid sempliċiment iddaħħal tagħti dominju u server NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Server NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Dominju NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1470,7 +1448,7 @@ msgstr ""
 "Is-saħħar jibni mappa autofs, sabiex l-utenti NIS ikunu jistgħu jimmontaw id-"
 "direttorju personali fuq il-kompjuter klijent NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1478,42 +1456,42 @@ msgstr ""
 "Bażi NIS: Direttorju bażi għad-direttorji personali tal-utenti NIS. Dan id-"
 "direttorju jiġi esportat mis-server NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Dominju NIS: Id-dominju NIS li se tuża (ġeneralment l-istess bħad-dominju "
 "DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Server NIS: isem tal-kompjuter tiegħek."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Bażi NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Dominju NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Is-saħħar se jissettjalek is-server NIS b'mappa autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Direttorju NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Dominju NIS: isem tad-dominju NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Server NIS: isem il-kompjuter tas-server NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1521,38 +1499,38 @@ msgstr ""
 "Id-daemon YPBIND isib is-server għad-dominju NIS u jmantni l-informazzjoni "
 "tal-binding NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Żball: irid ikun direttorju."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Żball: nisdomainname ma jridx ikun vojt jew \"localdomain\"."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Jekk jogħġbok irranġah."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Is-saħħar ikkonfiguralek il-kompjuter biex ikun klijent NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 "Is-saħħar ikkonfiguralek il-kompjuter biex ikun server NIS b'mappa autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Qed jiġi kkonfigurat il-kompjuter bħala server NIS b'mappa autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS b'mappa autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Qed tiġi kkonfigurata s-sistema bħala klijent NIS..."
 
@@ -1918,7 +1896,7 @@ msgid ""
 msgstr "Is-saħħar ġabar dawn il-parametri meħtieġa biex tikkonfigura l-proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1950,6 +1928,14 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Saħħar 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."
+msgstr ""
+"Trid tibdel l-isem tad-dominju - ma jridx ikun \"localdomain\" jew vojt. "
+"Jekk jogħġbok ħaddem drakconnect biex tirranġah."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Issettja server PXE"
@@ -2317,24 +2303,24 @@ msgstr "Qed jiġi konfigurat server PXE fuq is-sistema..."
 msgid "PXE server"
 msgstr "Server PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Saħħar tas-Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s ma jeżistix."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Kollox - ebda restrizzjoni lill-aċċess"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Regoli tiegħi - Staqsini għal kompjuters aċċettati jew miċħuda"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2342,37 +2328,37 @@ msgstr ""
 "Samba jħalli lis-server tiegħek jaġixxi bħala server tal-fajls u printers "
 "għal kompjuters li jħaddmu sistema tal-Windows."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Saħħar ta' konfigurazzjoni tas-Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Dan is-saħħar jgħinek tikkonfigura s-servizzi Samba fuq is-server tiegħek."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba jrid ikun jaf il-workgroup tal-Windows fejn se jservi."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Workgroup"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Workgroup:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Il-workgroup huwa ħażin"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Deskrizzjoni tas-server."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2380,19 +2366,19 @@ msgstr ""
 "Din id-deskrizzjoni hija l-mod kif is-server jiġi deskritt fuq kompjuters "
 "bil-Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Deskrizzjoni:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Id-deskrizzjoni tas-server hija ħażina"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Livell ta’ aċċess:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2400,7 +2386,7 @@ msgstr ""
 "* Eżempju 1: ħalli l-IPs kollha taħt 150.203.*.* minbarra wieħed\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2408,7 +2394,7 @@ msgstr ""
 "* Eżempju 2: ippermetti kompjuters li jaqblu mal-indirizz/netmask mogħtija \n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2416,7 +2402,7 @@ msgstr ""
 "* Eżempju 3: ħalli żewġ kompjuters\n"
 "hosts allow = kemmuna, filfla"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2428,23 +2414,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Innota li l-aċċess xorta jeħtieġ password adegwat \"user-level\"."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Ippermetti kompjuters:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Iċħad kompjuters:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Servizzi Samba attivati"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2453,19 +2439,19 @@ msgstr ""
 "Samba jista' jipprovdi post komuni fejn jiġu serviti l-fajls lill-kompjuters "
 "Windows, u jista' wkoll iservi printers li huma mqabbdin mas-server tiegħek."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Attiva l-post għall-qsim ta' fajls"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Ippermetti l-qsim tal-printer"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Offri d-direttorji personali lis-sidien tagħhom"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2474,28 +2460,28 @@ msgstr ""
 "permezz ta' Samba, imma int jew huma xorta tridu tużaw smbpasswd biex "
 "tissettjaw password."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Direttorju offrut:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Ittajpja d-direttorju li trid toffri."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Oħloq direttorju maqsum jekk ma jeżistix"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Ma rnexxilix noħloq direttorju."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permessi tal-fajls"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2505,59 +2491,59 @@ msgstr ""
 "b' \"@\". Eżempju: \n"
 "root, fred, @users, @wheel għal kull tip ta' permess"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "lista ta' qari:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "lista ta' ktib:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Agħżel liema printers trid li jkunu aċċessibbli mill-users magħrufa"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Offri l-printers kollha"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Qed jiġi kkonfigurat Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi konfigurat Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Deskrizzjoni tas-server:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Offerti ta' fajls:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Server tal-ipprintjar:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Direttorju personali:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Printers:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Is-saħħar ikkonfiguralek is-server Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Qed jiġi kkonfigurat is-server Samba..."
 
@@ -2797,3 +2783,25 @@ msgstr "Server Apache:"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Qed tiġi kkonfigurata s-sistema bħala server Apache..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Trid tibdel l-isem tal-kompjuter."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Trid tibdel l-isem tad-dominju. Għal server LDAP trid isem ta' dominju "
+#~ "ta' veru, mhux localdomain jew xejn. L-isem tal-kompjuter irid ikun FQDN "
+#~ "(\"Fully Qualified Domain Name\"). Ħaddem drakconnect biex tirranġah."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Ma stajtx naqbad ma' %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Trid taġġusta l-isem tad-dominju NIS. Għal server NIS trid isem ta' "
+#~ "dominju validu, mhux \"localdomain\" jew inkella vojt."
diff --git a/po/nb.po b/po/nb.po
index ca77a752..710b11a4 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-08 20:52+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@linux-mandrake.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@linux-mandrake.com>\n"
@@ -31,31 +31,31 @@ msgstr "konfigurasjonsveiviser"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Advarsel."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Feil."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gratulerer"
 
@@ -98,18 +98,18 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(du trenger ikke å skrive domenet etter navnet)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Klient identifikasjon"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "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:134
+#: ../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, "
@@ -119,33 +119,33 @@ msgstr ""
 "firmat.net. Hver maskin på nettverket må ha en (unik) IP adresse, i den "
 "vanlig punktete syntaksen."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Navnet på maskinen:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP-adressen til maskinen:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Advarsel"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Du er i dhcp, tjeneren vil muligens ikke virke med din konfigurasjon."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Feil"
@@ -190,13 +190,33 @@ msgstr "Klient-IP:"
 msgid "The wizard successfully added the client."
 msgstr "Veiviseren la vellykket til en klient."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Du trenger å omjustere ditt domenenavn. For en DNS-tjener trenger du et "
+"korrekt domenenavn, ikke likt localdomain eller intet. Vertsnavn må være et "
+"FQDN: Fully Qualified Domain Name. Kjør drakconnect for å justere det."
+
+#: ../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."
+msgstr ""
+"Du trenger å omjustere ditt domenenavn. For en DNS-tjener trenger du et "
+"korrekt domenenavn, ikke likt localdomain eller intet. Vertsnavn må være et "
+"FQDN: Fully Qualified Domain Name. Kjør drakconnect for å justere det."
+
+#: ../common/Wizcommon.pm:98
 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.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Lukk"
 
@@ -290,8 +310,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "deaktivert"
@@ -300,8 +320,8 @@ msgstr "deaktivert"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "aktivert"
@@ -314,52 +334,38 @@ msgstr "Grensesnitt:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Veiviseren konfigurerte vellykket DHCP-tjenestene."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Feilet"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Start drakwizard på nytt, og prøv å endre noen parametre."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Du trenger å omjustere ditt vertsnavn."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Du trenger å omjustere ditt domenenavn. For en DNS-tjener trenger du et "
-"korrekt domenenavn, ikke likt localdomain eller intet. Vertsnavn må være et "
-"FQDN: Fully Qualified Domain Name. Kjør drakconnect for å justere det."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Master DNS-tjener"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Slave DNS-tjener"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Legg til vert i DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Fjern vert fra DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -367,11 +373,11 @@ msgstr ""
 "DNS (Domain Name Server) er tjenesten som setter en maskin i forbindelse med "
 "et internett vertsnavn."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "DNS Master-konfigureringsveiviser"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -382,47 +388,47 @@ msgstr ""
 "lokale maskinnavn, med ikke-lokale forespørsler sendt videre til en DNS på "
 "utsiden."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Hva ønsker du å gjøre:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS-tjener"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Du trenger ikke å skrive domenet etter navnet)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Tjener-IP:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS-domenenavn:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Velg verten du vil fjerne fra den følgende lista."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Fjern en vert fra eksisterende DNS-konfigurasjon."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Fjern vert:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Maskinnavn:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -432,11 +438,11 @@ msgstr ""
 "vil også fungere som en backuptjener, i tilfelle din master-tjener ikke kan "
 "nås."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP-adresse til master DNS-tjener:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -444,11 +450,11 @@ msgstr ""
 "Videresending skjer bare på de forespørslene hvor tjeneren ikke er autoritær "
 "og ikke har svaret i mellomlager."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP til din videresender"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -456,15 +462,15 @@ msgstr ""
 "Så hvis du trenger det og kjenner til din ip-videresender eller IP-adresse "
 "til den, hvis ikke så la den være tom"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Ekstern DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Legg til søkedomene"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -472,7 +478,7 @@ msgstr ""
 "Domenenavn på denne tjeren er automatisk lagt til og du trenger ikke å legge "
 "det til her."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -484,27 +490,27 @@ msgstr ""
 "Dette kan endres ved å angi domenesøgenavnestien ønsket etter 'search'-"
 "nøgleordet."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Standard domenavn som skal søkes:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 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:187
+#: ../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"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Dette er ikke en gyldig IP-adresse... trykk neste for å fortsette"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -512,11 +518,11 @@ msgstr ""
 "Det ser ut som om verten allerede er i din DNS-konfigurasjon... trykk "
 "nestefor å fortsette"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Feil:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -524,7 +530,7 @@ msgstr ""
 "Det ser ut som om dette ikke er til stede i din DNS-konfigurasjon... trykk "
 "nestefor å fortsette"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -532,72 +538,72 @@ msgstr ""
 "Det ser ut som om ingen DNS-tjener har blitt satt igjennom veiviseren."
 "Vennligst kjør DNS-veiviser: Master DNS-tjener."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 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 er en slave. Så "
 "jeg kan ikke legge til eller fjerne vert."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Veiviseren vil nå nå bygge din DNS-slavekonfigurasjon"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "med denne konfigurasjonen:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Klient med denne identifikasjonen vil bli lagt til i din DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Maskinnavn:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Maskinen IP-adresse:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 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:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 "DNS-tjeneren er i ferd med å bli konfigurert med den følgende konfigurasjonen"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Tjeners Vertsnavn:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domenenavn:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Veiviseren la vellykket til vert i din DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Veiviseren fjernet vellykket verten fra din DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Veiviseren konfigurerte vellykket DNS-tjenestene på tjeneren din."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Vennligst start drakwizard på nytt, og prøv å endre noen parametre."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurerer ditt system som en Master DNS-tjener ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurerer ditt system som en Slave DNS-tjener ..."
 
@@ -625,7 +631,7 @@ msgstr "Eposttjener"
 msgid "FTP server"
 msgstr "FTP-tjener"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba-tjener"
 
@@ -649,7 +655,7 @@ msgstr "Nis-tjener autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux-Installasjonstjener"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab-tjener"
 
@@ -674,7 +680,7 @@ msgstr ""
 "%s er ikke installert\n"
 "Klikk \"Neste\" for å installere eller \"Avbryt\" for å avslutte"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Installasjon feilet"
 
@@ -917,15 +923,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab-konfigurasjonsveiviser"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Du trenger å omjustere ditt domenenavn, ikke likt localdomain eller intet. "
-"Vennligst kjør drakconnect for å justere det."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -937,7 +935,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:59
+#: ../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 "
@@ -947,39 +945,39 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. Veiviseren vil ta en sikkerhetskopi av alle "
 "dine tidligere konfigurasjonsfiler for disse tjenestene."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Velkommen til Kolab Gruppevare-tjenerkonfigurasjonsveiviser"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Skriv inn passordet for manager-konto til Kolab-tjener."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Passord stemmer ikke overens, eller er tomt passord, vennligst rett."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Gjenta passord:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Veiviseren vil nå konfiguere Kolab-tjener med de følgende parametrene"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Vertsnavn"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Epostdomene:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -987,45 +985,35 @@ msgstr ""
 "Kolab-tjeneren er nå konfigurert og kjører. Logg inn som 'manager' med "
 "passordet du tastet inn på https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Installasjon pågår"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Installerer Kolab-tjener på ditt system..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerer Kolab-tjener på ditt system..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap-veiviser"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Du trenger å omjustere ditt domenenavn. For en LDAP-tjener trenger du et "
-"korrekt domenenavn, ikke likt localdomain eller intet. Vertsnavn må være et "
-"FQDN: Fully Qualified Domain Name. Kjør drakconnect for å justere det."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Vis Ldap-konfigurasjon"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Legg til bruker i Ldap-tjener"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Slett Ldap-konfigurasjon"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1033,192 +1021,190 @@ msgstr ""
 "Det er en lettvektsprotokoll for å få tilgang til katalogtjenester, "
 "spesifikt X.500-baserte katalogtjenester."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP står for Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Ldap-konfigurasjonsveiviser"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Du må sette opp en Ldap-tjener først."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ditt valg:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Slett konfigurasjon"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Lagrer eksisterende base i /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP Legg til bruker"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Bruker Opprettet i: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Bruker Opprettet i: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Fornavn:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Brukernavn:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Du må skrive inn et gyldig Fornavn."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Du må skrive inn et gyldig Navn."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Du må skrive inn et gyldig Brukernavn."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP-BrukerPassord"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "passord må stemme overens"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Gjenta passord:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Du må skrive inn et passord for LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Passordene stemmer ikke overens"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Administrator er en administrerende bruker som kan gi tilgang i LDAP-"
 "databasen"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrator,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Konfigurerer LDAP-tjener"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Domenenavn: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Domenenavn: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Administrattor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP-katalogtre"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS-navninga er brukt for LDAP-katalogtredefinisjon"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP-katalogtre:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP-administrator:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP-passord:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Gjenta LDAP-passord:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Du må skrive inn et gyldig LDAP-katalogtre."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Bekreftelse om brukeren skal opprettes"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Fornavn:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Brukernavn:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Opprett i:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Bekreftelsesinformasjon for å opprette LDAP-tjener"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Brukerbeholder:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Veiviseren har gjennomført konfigureringen av LDAP-tjeneren."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Bruker ble vellykket lagt til "
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Feil under forsøk på å legge til bruker i LDAP-database"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Tjener er allerede konfigurert"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Du har allerede konfigurert din Ldap-tjener"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Feilet"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Feil!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Klarte ikke å koble til %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News-veiviser"
@@ -1362,13 +1348,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Stien du entret eksisterer ikke."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Tilgangskontroll"
 
@@ -1422,29 +1408,21 @@ msgstr "Nettmaske:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Veiviseren konfigurerte vellykket NFS tjeneren din."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Du trenger å omjustere ditt NIS-domenenavn. For en NIS-tjener trenger du et "
-"korrekt NIS-domenenavn, ikke likt localdomain eller intet."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NFS-tjener med autofs-kort"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NFS-klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 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."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1452,28 +1430,28 @@ msgstr ""
 "Brukere monterer automatisk deres hjemmeområde fra tjener, når de logger på "
 "et NIS klient-nettverk."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Hvad vil du gjøre?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Konfigurerer ditt system som en NIS-klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Du må taste inn nis-domene og nis-tjener"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS-tjener:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS-domene:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1483,7 +1461,7 @@ msgstr ""
 "Veiviseren bygger også autofs-kort, så den gir mulighetre for NIS-brukere å "
 "automatisk montere deres hjemmekatalog på en NIS-klientmaskin."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1491,42 +1469,42 @@ msgstr ""
 "Hjemme-NIS: hjemmeområde for brukere på NIS-tjener. Denne katalogen vil bli "
 "eksportert via NFS-tjeneren."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS-domene: NIS-domene som skal brukes (generelt det samme som ditt DNS-"
 "domenenavn)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS-tjener: navn på din maskin."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Hjem-NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS-domenenavn:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Veiviseren vil sette din NIS-tjener med autofs-kort"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS-brukerområde:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS-domenenavn: navn på NIS-domene."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS-tjener: vertsnavn på NIS-tjeneren."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1534,23 +1512,23 @@ msgstr ""
 "YPBIND-daemonen finner tjeneren for NIS-domener og vedlikeholder NIS-"
 "informasjonsbindings daemon."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Feil; skulle være en katalog"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Feil; nisdomainname bør være korrekt (ikke 'none' eller 'localdomain')"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Vennligst juster det."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Veiviseren konfigurerte vellykket din makin til å være en NIS-klient."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1558,15 +1536,15 @@ msgstr ""
 "Veiviseren konfigurerte vellykket maskinen din til å være en NIS-tjener med "
 "autofs-kort."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurerer ditt system som en NIS-tjener med autofs-kort..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS med autofs-kort"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurerer ditt system som NIS-klient ..."
 
@@ -1932,7 +1910,7 @@ msgstr ""
 "din:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1964,6 +1942,14 @@ msgstr "Squid-veiviser"
 msgid "PXE Wizard"
 msgstr "PXE-veiviser"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Du trenger å omjustere ditt domenenavn, ikke likt localdomain eller intet. "
+"Vennligst kjør drakconnect for å justere det."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Sett PXE-tjener"
@@ -2324,24 +2310,24 @@ msgstr "Konfigurerer PXE-tjener på ditt system..."
 msgid "PXE server"
 msgstr "PXE-tjener"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba-veiviser"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s eksisterer ikke."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Alle - Ingen tilgangsrestriksjoner"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mine regler - Spør meg om tillatte og nektede verter"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2349,57 +2335,57 @@ msgstr ""
 "Samba lar tjeneren din opptre som en fil- og skrivertjener for "
 "arbeidstasjoner som kjøre ikke-Linux systemer."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba-konfigurasjonsveiviser"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Denne veiviseren vil hjelpe deg med å konfigurere Samba-tjenestene på "
 "tjeneren din."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba må vite Windows arbeidsgruppene den skal tjene."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Arbeidsgruppe"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Arbeidsgruppe:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Arbeidsgruppen er feil"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Tjener-banner."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 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."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Tjener-banneret er feil"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Tilgangsnivå:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2407,7 +2393,7 @@ msgstr ""
 "* Eksempel 1: tillat alle IPer i 150.203.*.*; foruten en\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2415,7 +2401,7 @@ msgstr ""
 "* Eksempel 2: tillat verter som stemmer med gitt network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2423,7 +2409,7 @@ msgstr ""
 "* Eksempel 3: tillatt et par verter\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2435,23 +2421,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Merk at tilgang fortsatt krever passende brukernivå passord."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Tillat verter:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Nekt verter:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Slått på Samba tjenester"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2460,19 +2446,19 @@ msgstr ""
 "Samba kan tilby et felles fildelingsområde for din Windows arbeidstasjon, og "
 "kan også tilby skriverdeling for skrivere tilkoblet tjeneren din."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Slå på fildelingsområde"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Slå på tjener skriverdeling"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Gjør hjemmeområdene tilgjengelig for eierne av disse"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2480,28 +2466,28 @@ msgstr ""
 "Du har valgt å tillate brukere tilgang til disses hjemmeområder via samba, "
 "men du/de må bruke smbpasswd for å opprette et passord."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Delt område:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Skriv stien til området du ønsker skal deles."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Opprett delt katalog hvis det ikke eksistere"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Klarte ikke å opprette katalog."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Filtillatelser"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2511,60 +2497,60 @@ msgstr ""
 "en'@) som dette:\n"
 "root, fred, @users, @wheel for hver type av tillatelse."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "les liste:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "skriv liste:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 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"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Slå på alle skrivere"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Konfigurerer Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Veiviseren samlet følgende parametere for å konfigurere Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Tjener-banner:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Fildeling:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Skrivertjener:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Hjem:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Skrivere:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Veiviseren konfigurerte vellykket Samba tjeneren din."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Konfigurerer din Samba-tjener."
 
@@ -2807,6 +2793,28 @@ msgstr "Apache-tjener"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer ditt system som en Apache-tjener ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Du trenger å omjustere ditt vertsnavn."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Du trenger å omjustere ditt domenenavn. For en LDAP-tjener trenger du et "
+#~ "korrekt domenenavn, ikke likt localdomain eller intet. Vertsnavn må være "
+#~ "et FQDN: Fully Qualified Domain Name. Kjør drakconnect for å justere det."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Klarte ikke å koble til %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Du trenger å omjustere ditt NIS-domenenavn. For en NIS-tjener trenger du "
+#~ "et korrekt NIS-domenenavn, ikke likt localdomain eller intet."
+
 #~ msgid "Adrministrator"
 #~ msgstr "Administrator"
 
diff --git a/po/nl.po b/po/nl.po
index 4332d798..6bf4aac4 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-10-11 17:56+0100\n"
 "Last-Translator: hkc <hkc@i-detect.com>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -25,31 +25,31 @@ msgstr "Configuratiewizard"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Waarschuwing."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Fout."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gefeliciteerd"
 
@@ -92,11 +92,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(u hoeft achter de naam geen domein op te geven)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Client-identificatie:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -104,7 +104,7 @@ msgstr ""
 "Let erop dat het opgegeven IP adres en de clientnaam uniek zijn voor uw "
 "netwerk."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -115,21 +115,21 @@ msgstr ""
 "moet een (uniek) IP adres hebben, genoteerd als: x.x.x.x., waarbij de x "
 "vervangen dient te worden door cijfers."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Naam van de computer:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP adres van de computer:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Waarschuwing"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "U heeft voor DHCP gekozen, de server werkt misschien niet goed met uw "
@@ -138,12 +138,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fout opgetreden"
@@ -188,14 +188,38 @@ msgstr "IP adres client:"
 msgid "The wizard successfully added the client."
 msgstr "De wizard heeft de client succesvol toegevoegd."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"U dient uw domeinnaam aan te passen. Voor een DNS server heeft u een "
+"correcte domeinnaam nodig, die niet gelijk is aan localdomain of none "
+"(geen). De hostnaam moet een FQDN: Fully Qualified Domain Name (volledig "
+"gekwalificeerd domeinnaam) zijn. Start drakconnect om de domeinnaam aan te "
+"passen."
+
+#: ../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."
+msgstr ""
+"U dient uw domeinnaam aan te passen. Voor een DNS server heeft u een "
+"correcte domeinnaam nodig, die niet gelijk is aan localdomain of none "
+"(geen). De hostnaam moet een FQDN: Fully Qualified Domain Name (volledig "
+"gekwalificeerd domeinnaam) zijn. Start drakconnect om de domeinnaam aan te "
+"passen."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "Nog bezig opdracht uit te voeren. Wilt u deze opdracht stoppen en de Wizard "
 "afsluiten?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Sluiten"
 
@@ -290,8 +314,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "uitgezet"
@@ -300,8 +324,8 @@ msgstr "uitgezet"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "aangezet"
@@ -314,54 +338,38 @@ msgstr "Interface:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "De wizard heeft de DHCP-dienst op uw server succesvol ingesteld."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Mislukt"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Start drakwizard opnieuw en probeer het met andere gegevens."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "U dient uw computernaam aan te passen."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"U dient uw domeinnaam aan te passen. Voor een DNS server heeft u een "
-"correcte domeinnaam nodig, die niet gelijk is aan localdomain of none "
-"(geen). De hostnaam moet een FQDN: Fully Qualified Domain Name (volledig "
-"gekwalificeerd domeinnaam) zijn. Start drakconnect om de domeinnaam aan te "
-"passen."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Primaire DNS server"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Secundaire DNS server"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Computer toevoegen aan DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Computer verwijderen uit DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -369,11 +377,11 @@ msgstr ""
 "DNS (Domein Naam Server) is de dienst die een machine koppelt aan een "
 "computernaam op het internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "DNS Master-configuratiewizard"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -383,47 +391,47 @@ msgstr ""
 "configuratie zal een lokale DNS service bieden voor lokale computernamen, "
 "terwijl niet-lokale namen worden doorgestuurd naar een externe DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Wat wilt u doen:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS server"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(U hoeft achter de naam geen domein op te geven)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Server IP:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS domeinnaam:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Kies de computer die u wilt verwijderen uit de volgende lijst."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Een computer uit de bestaande DNS configuratie verwijderen."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Computer verwijderen:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Naam van de computer:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -433,11 +441,11 @@ msgstr ""
 "primaire name server over en dient tevens als een backup server indien uw "
 "primaire name server niet bereikbaar is."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Het IP adres van de primaire DNS server:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -445,11 +453,11 @@ msgstr ""
 "Doorsturen gebeurt alleen met verzoeken waarvoor de server niet gezaghebbend "
 "is en het antwoord niet in de cache heeft."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Het IP adres van uw doorstuurserver"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -457,15 +465,15 @@ msgstr ""
 "Als u dit nodig heeft en u weet het IP adres van uw doorstuurserver, vul het "
 "dan hier in; als u het niet weet vul dan niets in"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Externe DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Zoekdomein toevoegen"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -473,7 +481,7 @@ msgstr ""
 "De domeinnaam van deze server wordt automatisch toegevoegd en u hoeft deze "
 "hier niet aan te geven."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -485,28 +493,28 @@ msgstr ""
 "domainnaam. Dit kan aangepast worden door het gewenste domein zoekpad aan te "
 "geven na het zoekwoord"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Standaard zoekdomein naam:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Dit is geen geldig IP adres voor uw doorstuurserver... klik op Volgende om "
 "verder te gaan"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Dit is geen geldig adres voor een primaire DNS server... klik op Volgende om "
 "verder te gaan"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Dit is geen geldig IP adres... klik op Volgende om verder te gaan"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -514,11 +522,11 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Fout opgetreden:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -526,7 +534,7 @@ msgstr ""
 "Waarschijnlijk is dit niet aanwezig is in uw DNS configuratie... klik op "
 "Volgende om verder te gaan"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -534,71 +542,71 @@ msgstr ""
 "Waarschijnlijk is er geen DNS server ingesteld met behulp van de wizard. "
 "Voer de DNS wizard: Primaire DNS server uit."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Waarschijnlijk bent u geen primaire DNS server, maar een secundaire. Ik kan "
 "geen computer toevoegen of verwijderen."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "De wizard zal nu uw secundaire DNS configuratie opzetten"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "met deze gegevens:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Een client met deze identificatie zal aan uw DNS worden toegevoegd"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Naam van de computer:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP-adres van de computer:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "De client met deze identificatie zal uit uw DNS verwijderd worden"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "De DNS server zal worden geconfigureerd met de volgende gegevens"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Naam van de server:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domeinnaam:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "De wizard heeft de client succesvol aan uw DNS toegevoegd."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "De wizard heeft de client succesvol uit uw DNS verwijderd."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "De wizard heeft de DNS service op uw server succesvol geconfigureerd."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Start drakwizard opnieuw en probeer het met andere gegevens."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configureer uw systeem als primaire DNS server ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configureer uw systeem als secundaire DNS server ..."
 
@@ -626,7 +634,7 @@ msgstr "Mail server"
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba server"
 
@@ -650,7 +658,7 @@ msgstr "NIS server autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux installatieserver"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -675,7 +683,7 @@ msgstr ""
 "%s is niet geïnstalleerd\n"
 "Klik op \"Volgende\" om te installeren of \"Annuleren\" om af te sluiten"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Installatie is mislukt"
 
@@ -925,15 +933,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab-configuratiewizard"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"U dient uw domeinnaam aan te passen zodanig dat die niet gelijk is aan "
-"localdomain of none. Start drakconnect om de domeinnaam aan te passen."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -945,7 +945,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:59
+#: ../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 "
@@ -955,39 +955,39 @@ msgstr ""
 "Cyrus, Postfix, Imap, Saslauth. De wizard zal een reservekopie van all uw "
 "voorgaande configuratiebestanden van deze diensten aanmaken "
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Welkom bij de Kolab Groupware server-configuratiewizard"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Voer het wachtwoord voor de manager-account van de Kolab server in"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Wachtwoord is niet correct, voer wachtwoord opnieuw in"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Wachtwoord (nogmaals):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Computernaam:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "E-maildomein:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -995,47 +995,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Bezig met installeren"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Bezig met configureren van de Kolab server op uw systeem..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap wizard"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"U dient uw domeinnaam aan te passen. Voor een DNS server heeft u een "
-"correcte domeinnaam nodig, die niet gelijk is aan localdomain of none "
-"(geen). De hostnaam moet een FQDN: Fully Qualified Domain Name (volledig "
-"gekwalificeerd domeinnaam) zijn. Start drakconnect om de domeinnaam aan te "
-"passen."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Weergeven Ldap confuiguratie"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Gebruiker toevoegen aan de LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "LDAP Configuratie verwijderen"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1043,194 +1031,192 @@ msgstr ""
 "Dit is een lichtgewicht protocol voor toegang tot mapdiensten, specifiek "
 "gericht op de X 500 gebaseerde map diensten"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP staat voor /\"Lightweight Directory Access Protocol/\" (Lichtegewicht "
 "map toegang protocol)"
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "LDAP Configuratie wizard"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "U dient eerst een LDAP server te configureren"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Uw keuze:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Configuratie verwijderen"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Bezig met opslaan van bestaande basis in /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP toevoegen gebruiker"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Gebruiker toegevoegd in:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Gebruiker toegevoegd in: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Voornaam:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Aanmeldnaam gebruiker:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "U moet een geldige voornaam invoeren"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "U moet een geldige naam invoeren"
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "U moet een geldige gebruikersnaam invoeren"
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP gebruiker wachtwoord"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "wachtwoorden moeten gelijk zijn"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Wachtwoord (nogmaals):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "U moet een wachtwoord invoeren voor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "De wachtwoorden komen niet overeen"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Beheerder"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "De beheerder is een power user met toegangs rechten tot de LDAP database"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Beheerder,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Bezig met configureren van de LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Domeinnaam:"
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Domeinnaam:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP beheerder"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP map boomstructuur:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 "De DNS benaming wordt gebruikt voor de LDAP map boom-structuur definitie "
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP map boomstructuur:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP beheerder:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP wachtwoord:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP wachtwoord (nogmaals):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "U moet een geldig LDAP map boomstructuur invoeren:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Bevestiging van de aan te maken gebruiker"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Voornaam:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Gebruikersnaam:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Aanmaken in:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Informatie bevestiging om een LDAP server aan te maken"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Gebruikerscontainer:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "De wizard heeft de LDAP succesvol ingesteld."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Gebruiker succesvol toegevoegd"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Fout tijdens toevoegen van gebruiker aan de Ldap database"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "De server is reeds geconfigureerd"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "U heeft uw Ldap server reeds geconfigureerd."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Mislukt"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Fout!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Kan geen connectie met %s aanmaken"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News-wizard"
@@ -1371,13 +1357,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Het ingevoerde pad bestaat niet."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Toegangscontrole"
 
@@ -1432,30 +1418,22 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "De wizard heeft uw NFS server succesvol ingesteld."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"U dient uw NIS-domeinnaam aan te passen. Voor een NIS-server heeft u een "
-"correcte NIS-domeinnaam nodig, die niet gelijk is aan localdomain of none. "
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS server met autofs folder"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS client"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Configureer een NIS server met autofs folder, auto.home en auto.master "
 "bestanden."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1463,28 +1441,28 @@ msgstr ""
 "Gebruikers koppelen automatisch hun persoonlijke map van de server wanneer "
 "zij zich aanmelden op een NIS-client netwerk."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Wat wilt u doen?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Configureer uw computer als een NIS client"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "U hoeft alleen nisdomain en nisserver in te vullen."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS domein:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1495,7 +1473,7 @@ msgstr ""
 "dat het de NIS-gebruiker de mogelijkheid biedt om haar persoonlijke map "
 "automatisch te koppelen op een NIS client-computer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1503,41 +1481,41 @@ msgstr ""
 "Home NIS: persoonlijke map voor gebruikers op een NIS server. Deze map wordt "
 "via de NFS server geëxporteerd."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS domein: te gebruiken NIS domein (meestal dezelfde als uw DNS-domeinnaam)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS server: de naam van uw computer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS domeinnaam:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "De wizard stelt uw NIS server in met autofs-mapping"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS map:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domeinnaam: naam van het NIS domein."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS server: hostnaam van de NIS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1545,25 +1523,25 @@ msgstr ""
 "De YPBIND daemon vindt de server voor NIS-domeinen en onderhoudt de NIS "
 "binding-informatie."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Er is een fout opgetreden. Dit moet een map zijn"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 "Er is een fout opgetreden, nisdomeinnaam mag niet 'none' of 'localdomain' "
 "zijn."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Pas dit aan."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "De wizard heeft uw computer succesvol als NIS client geconfigureerd."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1571,15 +1549,15 @@ msgstr ""
 "De wizard heeft uw computer succesvol als NIS-server met autofs mapping "
 "geconfigureerd."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Uw computer wordt geconfigureerd als NIS server met autofs map..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS met autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Uw computer wordt als NIS-client geconfigureerd ..."
 
@@ -1949,7 +1927,7 @@ msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw proxy te configureren:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1981,6 +1959,14 @@ msgstr "Squid proxy"
 msgid "PXE Wizard"
 msgstr "PXE wizard"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"U dient uw domeinnaam aan te passen zodanig dat die niet gelijk is aan "
+"localdomain of none. Start drakconnect om de domeinnaam aan te passen."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXE server opgeven"
@@ -2340,24 +2326,24 @@ msgstr "De PXE server op ow computer wordt geconfigureerd..."
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba wizard"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s bestaat niet."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Allen - Geen restricties op toegang"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mijn regels - vraag mij de toegelaten en geweigerde computers"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2365,56 +2351,56 @@ msgstr ""
 "Samba laat uw server zich gedragen ale een bestands- en printer-server voor "
 "werkstations die geen Linux draaien."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba configuratiewizard"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Deze wizard helpt u bij het instelllen van de Samba services op uw server."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba moet weten welke Windows Werkgroep het gaat bedienen."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Werkgroep"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Werkgroep:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "De Werkgroep is niet juist"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Server Banner."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "De banner is de omschrijving van deze server voor de Windows werkstations."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "De server banner is niet correct"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Toegangs niveau:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2422,7 +2408,7 @@ msgstr ""
 "* Voorbeeld 1: laat alle IPs in 150.203.*.* toe, behalve één\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2431,7 +2417,7 @@ msgstr ""
 "netmask bevinden\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2439,7 +2425,7 @@ msgstr ""
 "* Voorbeeld 3: laat enkele computers toe\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2451,24 +2437,24 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = piraat"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Opmerking: Voor toegang zijn nog steeds gebruikerswachtwoorden vereist."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Computers toestaan:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Computers niet toelaten:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Samba services geactiveerd"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2478,19 +2464,19 @@ msgstr ""
 "werkstation, en printer deling leveren voor de printers die verbonden zijn "
 "met uw server."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Bestandsdelingsruimte inschakelen"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Printerdeling op server inschakelen"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Maak de persoonlijke mappen beschikbaar voor hun eigenaars"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2499,28 +2485,28 @@ msgstr ""
 "persoonlijke mappen via Samba, maar u/zij moeten smbpasswd gebruiken om een "
 "wachtwoord aan te maken."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Gedeelde map:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Voer het pad van de map in die u wilt delen."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Gedeelde map aanmaken, indien het nog niet is aangemaakt"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Aanmaken map is mislukt"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Bestandsrechten"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2530,60 +2516,60 @@ msgstr ""
 "voorafgegaan worden door een '@') zoals dit vorbeeld:\n"
 "root, fred, @users, @wheel voor elke soort van toegangsrechten."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "lees lijst:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Schrijflijst:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Selecteer welke printers bereikbaar mogen zijn voor bekende gebruikers"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Gebruik alle printers"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Samba configureren"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "De wizard heeft de volgende gegevens verzameld om Samba te configureren."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Server banner:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Bestanden delen:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Print server:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Persoonlijke map:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Printers:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "De wizard heeft uw Samba server succesvol geconfigureerd."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "De Samba server wordt geconfigureerd..."
 
@@ -2824,3 +2810,28 @@ msgstr "Apache webserver:"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "De computer wordt als Apache webserver geconfigureerd ..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "U dient uw computernaam aan te passen."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "U dient uw domeinnaam aan te passen. Voor een DNS server heeft u een "
+#~ "correcte domeinnaam nodig, die niet gelijk is aan localdomain of none "
+#~ "(geen). De hostnaam moet een FQDN: Fully Qualified Domain Name (volledig "
+#~ "gekwalificeerd domeinnaam) zijn. Start drakconnect om de domeinnaam aan "
+#~ "te passen."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Kan geen connectie met %s aanmaken"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "U dient uw NIS-domeinnaam aan te passen. Voor een NIS-server heeft u een "
+#~ "correcte NIS-domeinnaam nodig, die niet gelijk is aan localdomain of "
+#~ "none. "
diff --git a/po/pl.po b/po/pl.po
index 93430179..1877183f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-08-24 22:25+0200\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: polski <pl@li.org>\n"
@@ -25,31 +25,31 @@ msgstr "druid konfiguracyjny"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Ostrzeżenie."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Błąd."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gratulacje"
 
@@ -89,18 +89,18 @@ msgstr "Ten druid pomoże ci dodać nowego klienta w lokalnym DNS-ie."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(nie trzeba wpisywać domeny po nazwie)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identyfikacja klienta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Zwróć uwagę, aby podany numer IP i nazwa klienta były unikalne w sieci."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -110,33 +110,33 @@ msgstr ""
 "firma.net. Każdy komputer w sieci musi posiadać (unikalny) adres IP, w "
 "standardowej postaci rozdzielanej kropkami."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nazwa komputera:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Adres IP maszyny:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Jesteś w dhcp, serwer może nie pracować z tą konfiguracją."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Błąd"
@@ -180,12 +180,34 @@ msgstr "IP klienta:"
 msgid "The wizard successfully added the client."
 msgstr "Druid zakończył z powodzeniem dodawanie klienta."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Należy ponownie wprowadzić nazwę domeny. Dla serwera DNS należy podać "
+"poprawną nazwę domeny, inną niż localdomain i none. Nazwa komputera musi być "
+"zgodna z FQDN (Fully Qualified Domain Name - Pełna Złożona Nazwa Domeny). "
+"Uruchom polecenie drakconnect, aby ją ustawić."
+
+#: ../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."
+msgstr ""
+"Należy ponownie wprowadzić nazwę domeny. Dla serwera DNS należy podać "
+"poprawną nazwę domeny, inną niż localdomain i none. Nazwa komputera musi być "
+"zgodna z FQDN (Fully Qualified Domain Name - Pełna Złożona Nazwa Domeny). "
+"Uruchom polecenie drakconnect, aby ją ustawić."
+
+#: ../common/Wizcommon.pm:98
 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.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Zamknij"
 
@@ -277,8 +299,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "wyłączone"
@@ -287,8 +309,8 @@ msgstr "wyłączone"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "włączone"
@@ -301,54 +323,39 @@ msgstr "Interfejs:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Druid z powodzeniem skonfigurował usługi DHCP serwera."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Niepowodzenie"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Uruchom ponownie program drakwizard i spróbuj zmienić niektóre parametry."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Należy ponownie skonfigurować nazwę komputera."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Należy ponownie wprowadzić nazwę domeny. Dla serwera DNS należy podać "
-"poprawną nazwę domeny, inną niż localdomain i none. Nazwa komputera musi być "
-"zgodna z FQDN (Fully Qualified Domain Name - Pełna Złożona Nazwa Domeny). "
-"Uruchom polecenie drakconnect, aby ją ustawić."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Podstawowy serwer DNS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Pomocniczy serwer DNS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Dodaj komputer w DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Usuń komputer z DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -356,11 +363,11 @@ msgstr ""
 "DNS (Serwer Nazw Domenowych) jest usługą ustawiającą odpowiednie nazwy "
 "komputerów w odpowiedzi na zapytanie w postaci numerycznej i na odwrót."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Druid konfiguracji podstawowego serwera DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -370,47 +377,47 @@ msgstr ""
 "udostępni lokalną usługę DNS dla lokalnych nazw komputerów, na nielokanle "
 "zapytanie przesyłane na zewnątrz DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Co chcesz zrobić:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Serwer DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(nie trzeba wpisywać domeny po nazwie)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Adres IP serwera:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Nazwa domeny NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Wybierz komputer do usunięcia z poniższej listy."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Usuń komputer z istniejącej konfiguracji DNS."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Usuń komputer:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Nazwa komputera:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -420,11 +427,11 @@ msgstr ""
 "oraz może pracować jako serwer zapasowy gdy z jakiegoś powodu serwer "
 "podstawowy będzie niedostępny."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Adres IP podstawowego serwera DNS:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -432,11 +439,11 @@ msgstr ""
 "Przekierowywanie występuje tylko dla tych zapytań, dla których serwer nie "
 "jest autorytarny i nie posiada odpowiedzi w pamięci podręcznej."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP komputera przesyłającego"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -444,15 +451,15 @@ msgstr ""
 "Jeśli potrzebujesz tej funkcji i znasz adres komputera przekierowującego "
 "wpisz go, jeśli nie pozostaw pole pustym."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Zewnętrzny DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Dodaj domenę wyszukiwania"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -460,7 +467,7 @@ msgstr ""
 "Nazwa domeny tego serwera jest automatycznie dodawana i nie ma potrzeby "
 "dodawania jej tutaj."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -473,28 +480,28 @@ msgstr ""
 "poprzez wypisanie ścieżki żądanej domeny wyszukiwania poprzedzonej słowem "
 "kluczowym wyszukiwania"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Domyślna nazwa domeny do przeszukiwania:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 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ć"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "To nie jest poprawny adres IP podstawowego DNS... naciśnij dalej aby "
 "kontynuować"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "To nie jest poprawny adres IP... naciśnij dalej aby kontynuować"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -502,11 +509,11 @@ msgstr ""
 "Wygląda na to, że komputer jest już w konfiguracji DNS... naciśnij dalej aby "
 "kontynuować"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Błąd:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -514,7 +521,7 @@ msgstr ""
 "Wygląda na to, że wpis nie jest obecny w konfiguracji DNS... naciśnij dalej "
 "aby kontynuować"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -522,71 +529,71 @@ msgstr ""
 "Wygląda na to, że żaden serwer DNS został ustawiony za pomocą druida. "
 "Uruchom druida DNS: podstawowy serwer DNS."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 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."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Druid przeprowadzi teraz budowę konfiguracji zapasowego DNS"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "z tą konfiguracją:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Klient z tą tożsamością zostanie dodany do DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Nazwa komputera:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Adres IP komputera:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 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:249
+#: ../dns_wizard/Bind.pm:243
 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:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Nazwa serwera:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Nazwa domeny:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Druid pomyślnie dodał komputer do DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Druid pomyślnie usunął komputer z DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Druid pomyślnie skonfigurował usługę DNS na serwerze."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Uruchom ponownie drakwizard'a i spróbuj zmienić niektóre parametry."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurowanie systemu jako podstawowy serwer DNS ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurowanie systemu jako pomocniczy serwer DNS ..."
 
@@ -614,7 +621,7 @@ msgstr "Serwer poczty"
 msgid "FTP server"
 msgstr "Serwer FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Serwer samby"
 
@@ -638,7 +645,7 @@ msgstr "Mapa autofs serwera NIS"
 msgid "Mandrakelinux Install server"
 msgstr "Serwer instalacyjny Mandrake"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Serwer Kolab"
 
@@ -663,7 +670,7 @@ msgstr ""
 "Pakiet %s nie jest zainstalowany\n"
 "Kliknij \"Dalej\" aby go zainstalować lub \"Anuluj aby zakończyć"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalacja nie powiodła się"
 
@@ -905,15 +912,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Druid konfiguracji Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Należy ponownie wprowadzić nazwę domeny inną niż localdomain i none. Uruchom "
-"polecenie drakconnect aby ją ustawić."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -925,7 +924,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:59
+#: ../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 "
@@ -935,39 +934,39 @@ msgstr ""
 "cyrus, postfix, imap, saslauth. Druid utworzy kopię zapasową wszystkich "
 "poprzednich plików konfiguracyjnych dla tych usług."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Witaj w druidzie konfiguracji serwera do pracy grupowej Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Wprowadź hasło dla konta zarządczego serwera Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Hasło się nie zgadza lub jest puste. Popraw je."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Hasło ponownie:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Nazwa komputera:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Domena pocztowa:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -975,46 +974,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instalacja trwa"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Instalowanie serwera Kolab w systemie..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurowanie serwera Kolab w systemie..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Druid Samby"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Należy ponownie wprowadzić nazwę domeny. Dla serwera LDAP należy podać "
-"poprawną nazwę domeny, inną niż localdomain i none. Nazwa komputera musi być "
-"zgodna z FQDN (Fully Qualified Domain Name - Pełna Złożona Nazwa Domeny). "
-"Uruchom polecenie drakconnect, aby ją ustawić."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Wyświetl konfigurację Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Dodaj użytkownika do serwera Ldap "
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Usuń konfigurację Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1022,193 +1010,191 @@ msgstr ""
 "To jest lekki protokół dostepowy do usług katalogowych, dokładniej usług "
 "katalogowych opartych na protokole X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP to skrót od angielskiego \"Lightweight Directory Access Protocol\"."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Druid konfiguracji Ldap "
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Musisz najpierw zainstalować serwer Ldap."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Twój wybór:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Usuń konfigurację"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Zapisywanie istniejącej bazy w /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Dodawanie użytkownika LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Utworzono użytkownika w:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Utworzono użytkownika w: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Imię:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Login użytkownika:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Wprowadź prawidłowe imię."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Wprowadź prawidłową Nazwę."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Wprowadź prawidłową nazwę użytkownika."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Hasło użytkownika LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "hasła muszą być takie same"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Hasło (ponownie):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Wprowadź hasło do LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Administrator jest nadrzędnym użytkownikiem z nadanym dostępem do bazy "
 "danych LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrator,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Konfigurowanie serwera LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Nazwa domeny: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Nazwa domeny: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Administrator LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Drzewo katalogów LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "Nazewnictwo DNS jest używany do definicji drzewa katalogów LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Drzewo katalogów LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Administrator LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Hasło LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Hasło LDAP (ponownie):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Należy wprowadzić poprawne drzewo katalogów LDAP."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Potwierdź utworzenie użytkownika"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Imię:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Nazwa użytkownika:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Utwórz w:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Potwierdzenie utworzenia serwera LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Pojemnik użytkowników:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Druid pomyślnie skonfigurował serwer LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Pomyślnie dodano użytkownika"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Błąd przy dodawaniu użytkownika do bazy danych LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Serwer jest już skonfigurowany"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Serwer Ldap został już skonfigurowany"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s zakończone niepowodzeniem"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Błąd!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Nie można połączyć się z %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Druid grup dyskusyjnych"
@@ -1348,13 +1334,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Podana ścieżka nie istnieje."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontrola dostępu"
 
@@ -1409,28 +1395,20 @@ msgstr "Maska sieci:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Druid pomyślnie skonfigurował serwer NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Należy ponownie wprowadzić nazwę domeny. Dla serwera DNS należy podać "
-"poprawną nazwę domeny, inną niż localdomain i none. "
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Serwer NIS z autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Klient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Skonfiguruj serwer NIS z autofs map, pliki auto.home i auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1438,28 +1416,28 @@ msgstr ""
 "Klient może automatycznie montować swoje katalogi domowe podczas logowania "
 "do sieci klienckiej NIS komputera."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Co chcesz zrobić?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Konfigurowanie komputera jako serwera NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Po prostu należy podać domenę i serwer nis."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Serwer NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Domena NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1470,7 +1448,7 @@ msgstr ""
 "serwera NIS do automatycznego montowania katalogu domowego na komputerze "
 "klienta NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1478,40 +1456,40 @@ msgstr ""
 "Katalog domowy NIS: katalog domowy dla użytkowników na serwerze NIS. Ten "
 "katalog będzie eksportowany przez serwer NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "Domena NIS: domena NIS dla twojego serwera NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Serwer NIS: nazwa twojego komputera."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Katalog domowy NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Nazwa domeny NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Zostanie ustawiony serwer NIS z autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Katalog NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nazwa domeny NIS: nazwa domeny NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Serwer NIS: nazwa komputera z serwerem nis."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1519,37 +1497,37 @@ msgstr ""
 "Demon YPBIND wyszukuje serwer z domenami NIS oraz opiekuje się demonem "
 "informacji o dowiązaniach NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Błąd powinien być katalogiem"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Błąd: 'none' ani 'localdomain' nie mogą być nazwą domeny NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Popraw to."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Druid pomyślnie skonfigurował komputer jako klient NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Druid pomyślnie skonfigurował serwer NIS z autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurowanie systemu jako serwer NIS z mapą autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "Serwer z autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurowanie systemu jako klient NIS ..."
 
@@ -1921,7 +1899,7 @@ msgstr ""
 "pośrednika:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1953,6 +1931,14 @@ msgstr "Pośrednik Squid"
 msgid "PXE Wizard"
 msgstr "Druid 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."
+msgstr ""
+"Należy ponownie wprowadzić nazwę domeny inną niż localdomain i none. Uruchom "
+"polecenie drakconnect aby ją ustawić."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Ustaw serwer PXE"
@@ -2309,24 +2295,24 @@ msgstr "Konfigurowanie serwera PXE w systemie ..."
 msgid "PXE server"
 msgstr "Serwer PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Druid Samby"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s nie istnieje."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Wszystko - brak limitów dostępu"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Własne zasady - Pytanie o dozwolone lub zabronione komputery"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2334,36 +2320,36 @@ msgstr ""
 "Samba umożliwia serwerowi pracę jako serwer plików i wydruku dla stacji "
 "roboczyć pracujących pod kontrolą systemów operacyjnych innych niż Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Druid konfiguracji Samby"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Ten druid pomoże ci w konfiguracji usług Samba twojego serwera."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba wymaga informacji o grupie roboczej, którą będzie obsługiwać."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grupa robocza"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grupa robocza:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Grupa robocza jest niepoprawna"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Baner serwera."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2371,19 +2357,19 @@ msgstr ""
 "Baner to sposób w jaki serwer jest opisywany w systemie Windows stacji "
 "roboczej."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Baner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Baner serwera jest niepoprawny"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Poziom dostępu:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2391,7 +2377,7 @@ msgstr ""
 "* Przykład 1: dozwolone wszystkie IP w 150.203.*.*; z wyjątkiem jednego\n"
 "host allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2399,7 +2385,7 @@ msgstr ""
 "* Przykład 2: dozwolone komputery pasujące do podanej sieci/maski sieci\n"
 "host allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2407,7 +2393,7 @@ msgstr ""
 "* Przykład 3: dozwolonych kilka komputerów\n"
 "host allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2419,24 +2405,24 @@ msgstr ""
 "host allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Zauważ, że dostęp wciąż wymaga odpowiednich haseł z poziomu użytkownika."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Dozwolone komputery:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Zabronione komputery:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Włączone usługi Samba"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2445,19 +2431,19 @@ msgstr ""
 "Samba może dostarczyć obszaru współdzielenia plików wspólnych dla stacji "
 "roboczej Windows a także udostępnić drukarki podłączone do serwera."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Włącz obszar współdzielenia plików"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Włącz współdzielenie drukarek serwera"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Czyni katalogi domowe dostępnymi dla ich właścicieli"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2466,28 +2452,28 @@ msgstr ""
 "pośrednictwem samby lecz oni muszą użyć polecenia smbpasswd do ustawienia "
 "hasła."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Katalog współdzielony:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Podaj ścieżkę do katalogu, który ma być współdzielony."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Stwórz współdzielony katalog, jeżeli taki nie istnieje"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Utworzenie katalogu nie powiodło się."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Uprawnienia plików"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2497,59 +2483,59 @@ msgstr ""
 "poprzedzone znakiem '@') tak jak w przykładzie:\n"
 "root, fred, @users, @wheel dla każdego rodzaju uprawnień."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "lista odczytu:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "lista zapisu:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Wybierz, która z drukarek ma być dostępna z kont znanych użytkowników"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Włącz wszystkie drukarki"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Konfigurowanie Samby"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Druid zebrał poniższe parametry wymagane do skonfigurowania Samby."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Baner serwera:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Współdzielenie plików:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Serwer wydruku:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Katalog domowy:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Drukarki:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Druid pomyślnie skonfigurował serwer Samby."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Konfigurowanie serwera Samba..."
 
@@ -2788,6 +2774,29 @@ msgstr "Serwer Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurowanie systemu jako serwera Apache ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Należy ponownie skonfigurować nazwę komputera."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Należy ponownie wprowadzić nazwę domeny. Dla serwera LDAP należy podać "
+#~ "poprawną nazwę domeny, inną niż localdomain i none. Nazwa komputera musi "
+#~ "być zgodna z FQDN (Fully Qualified Domain Name - Pełna Złożona Nazwa "
+#~ "Domeny). Uruchom polecenie drakconnect, aby ją ustawić."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Nie można połączyć się z %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Należy ponownie wprowadzić nazwę domeny. Dla serwera DNS należy podać "
+#~ "poprawną nazwę domeny, inną niż localdomain i none. "
+
 #~ msgid "Configure Ldap server"
 #~ msgstr "Konfigurowanie serwera Ldap "
 
diff --git a/po/pt.po b/po/pt.po
index 32ca5bd0..f5602441 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-13 02:56+0000\n"
 "Last-Translator: Américo José Melo <mmodem00@netvisao.pt>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -33,31 +33,31 @@ msgstr "assistente de configuração"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Aviso."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Erro."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Parabéns"
 
@@ -91,17 +91,18 @@ 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)"
 msgstr "(não precisa escrever o domínio a seguir ao nome)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identificação do cliente:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -109,7 +110,7 @@ msgstr ""
 "Note que o endereço IP dado e o nome do cliente dados devem ser únicos na "
 "rede."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -119,33 +120,33 @@ msgstr ""
 "empresa.net. Toda a maquina na rede tem que ter um endereço IP (único), na "
 "sintaxe com pontos habitual."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nome da maquina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Endereço IP da máquina:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Aviso"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Está em dhcp, o servidor pode não funcionar com a sua configuração."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erro"
@@ -190,11 +191,34 @@ msgstr "IP Cliente:"
 msgid "The wizard successfully added the client."
 msgstr "O assistente adicionou com sucesso o cliente."
 
-#: ../common/Wizcommon.pm:86
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Precisa reajustar o seu nome de domínio. Para um servidor DNS que precisa de "
+"um nome de domínio correcto, diferente do domínio local ou nenhum. O "
+"Hostname tem que ser FQDN: (FQDN: Fully Qualified Domain Name). Execute o "
+"drakconnect para o ajustar."
+
+#: ../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."
+msgstr ""
+"Precisa reajustar o seu nome de domínio. Para um servidor DNS que precisa de "
+"um nome de domínio correcto, diferente do domínio local ou nenhum. O "
+"Hostname tem que ser FQDN: (FQDN: Fully Qualified Domain Name). Execute o "
+"drakconnect para o ajustar."
+
+#: ../common/Wizcommon.pm:98
+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.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Fechar"
 
@@ -212,7 +236,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"
@@ -286,8 +311,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "desactivado"
@@ -296,8 +321,8 @@ msgstr "desactivado"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "activado"
@@ -310,53 +335,38 @@ msgstr "Interface:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "O assistente configurar com sucesso os serviços DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Falhou"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Relance o drakwizard, e tente modificar alguns parâmetros."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Precisa reajustar o seu hostname."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Precisa reajustar o seu nome de domínio. Para um servidor DNS que precisa de "
-"um nome de domínio correcto, diferente do domínio local ou nenhum. O "
-"Hostname tem que ser FQDN: (FQDN: Fully Qualified Domain Name). Execute o "
-"drakconnect para o ajustar."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Servidor DNS master"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Servidor DNS slave"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Adicionar anfitrião no DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Remover anfitrião do DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -364,11 +374,11 @@ msgstr ""
 "DNS (Servidor de Nomes do Domínio) é um serviço que mapeia um endereço de IP "
 "de uma máquina com um nome de anfitrião (hostname) da Internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Assistente de configuração DNS Master"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -378,44 +388,44 @@ msgstr ""
 "Esta configuração irá fornecer um serviço DNS local para os nomes das "
 "máquinas locais, com pedidos não locais dirigidos a um DNS exterior."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "O que deseja fazer:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "Interface do Servidor DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Não precisa adicionar o domínio a seguir ao nome)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "Nome do Dominio DNS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Escolha o anfitrião que deseja remover da seguinte lista:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Remova um anfitrião na na configuração DNS existente."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Remover anfitrião:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Nome do Computador:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -425,11 +435,11 @@ msgstr ""
 "de nome primario, e irá também funcionar como um servidor de backup, no caso "
 "do seu servidor master estar inalcançável."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Endereço IP do servidor DNS master:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -437,11 +447,11 @@ msgstr ""
 "O reenvio ocorre apenas naquelas questões onde o servidor não é autoritário "
 "e não possui a resposta na sua cache."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP do seu reenviador"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -449,15 +459,15 @@ msgstr ""
 "Se precisar dele e souber o IP do seu reenviador introduza o endereço IP do "
 "mesmo, se não souber deixe em branco"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS externo:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Adicionar domínio de procura"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -465,7 +475,7 @@ msgstr ""
 "O nome de domínio deste servidor é adicionado automáticamente, e não precisa "
 "de o adicionar aqui."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -477,27 +487,28 @@ msgstr ""
 "apenas contém o nome de domínio local. Isto pode ser alterado ao listar o "
 "caminho de procura do domínio desejado seguido da palavra-chave de procura"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Nome de domínio padrão para procurar:"
 
-#: ../dns_wizard/Bind.pm:182
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+#: ../dns_wizard/Bind.pm:176
+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"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Isto não é um endereço IP do DNS Master válido... prima seguinte para "
 "continuar"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Isto não é um endereço IP válido... prima seguinte para continuar"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -505,11 +516,11 @@ msgstr ""
 "Parece que esse anfitrião já está na sua configuração DNS... prima seguinte "
 "para continuar"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -517,7 +528,7 @@ msgstr ""
 "Parece que isto não consta da sua configuração DNS... prima seguinte para "
 "continuar"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -525,69 +536,72 @@ msgstr ""
 "Parece que nenhum servidor DNS foi configurado através do assistente. Por "
 "favor execute o Assistente DNS: Servidor DNS Master."
 
-#: ../dns_wizard/Bind.pm:217
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+#: ../dns_wizard/Bind.pm:211
+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 anfitrião."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "O assistente irá Agora construir a sua configurção DNS slave"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "com esta configuração:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Um cliente com esta identificação será adicionado ao seu DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Nome do computador:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Endereço IP do computador:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 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:249
-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: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"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Hostname do Servidor:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Nome do domínio:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "O assistente adicionou com sucesso o anfitrião no seu DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "O assistente removeu com sucesso o anfitrião do seu DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "O assistente configurou com sucesso o serviço DNS do seu servidor."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Por favor Relance o drakwizard, e tente modificar alguns parâmetros."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "A configurar o seu sistema como um servidor DNS Master ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "A configurar seu sistema como um servidor DNS Slave ..."
 
@@ -615,7 +629,7 @@ msgstr "Servidor Mail"
 msgid "FTP server"
 msgstr "Servidor FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Servidor Samba"
 
@@ -639,7 +653,7 @@ msgstr "Servidor NIS mapa autofs"
 msgid "Mandrakelinux Install server"
 msgstr "Servidor de Instalação Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
@@ -664,7 +678,7 @@ msgstr ""
 "%s não está instalado\n"
 "Clique em  \"Seguinte\"para instalar ou em \"Cancelar\" para sair"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalação falhada"
 
@@ -678,7 +692,8 @@ msgstr "Assistente de Configuração do Servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 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:79
 msgid "Select the kind of FTP service you want to activate:"
@@ -716,7 +731,8 @@ msgstr "Permitir FXP: permite a transferência de ficheiros via outro FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "Chroot home user: users will only see their home directory."
-msgstr "Chroot home user: os utilizadores irão apenas ver a sua directoria pessoal."
+msgstr ""
+"Chroot home user: os utilizadores irão apenas ver a sua directoria pessoal."
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "FTP Proftpd server options"
@@ -820,7 +836,8 @@ msgstr "Permitir FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
 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:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
@@ -873,7 +890,8 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:81
 msgid "The destination directory is already in use. Please choose another one."
-msgstr "A directoria de destino encontra-se já em uso. Por favor escolha outra."
+msgstr ""
+"A directoria de destino encontra-se já em uso. Por favor escolha outra."
 
 #: ../installsrv_wizard/Installsrv.pm:85
 msgid "Your install server will be configured with these parameters"
@@ -905,15 +923,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Assistente de Configuração do Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Precisa reajustar o seu nome de domínio, diferente do domínio local ou "
-"nenhum. Por favor execute o drakconnect para o ajustar."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -925,7 +935,7 @@ msgstr ""
 "livro de endereços partilhado com provisão para utilizadores mailbox como "
 "também contactos e um POP# e ainda acesso IMAP4 (rev1) ao mail"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -935,39 +945,40 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Bemvindo ao Assistente de configuração do servidor Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Introduza a senha para a conta do gestor do servidor Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "As senhas diferem, ou a senha é nula, por favor corrija."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Senha de novo:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Nome de Anfitrião:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Domínio Mail:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -975,46 +986,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instalação em progresso"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "A configurar o servidor Kolab no seu sistema..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Assistente Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Precisa reajustar o seu nome de domínio. Para um servidor LDAP que precisa "
-"de um nome de domínio correcto, diferente do domínio local ou nenhum. O "
-"Hostname tem que ser FQDN: (FQDN: Fully Qualified Domain Name). Execute o "
-"drakconnect para o ajustar."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Mostrar a configuração Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Adicionar utilizador no servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Apagar a configuração Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1022,190 +1022,189 @@ msgstr ""
 "É um protocolo ligeiro para aceder a serviços de directorias, "
 "especificamente a serviços de directorias baseados em X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP significa Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Assistente de configuração Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Primeiro tem que configurar um servidor Ldap."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "A sua escolha:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Apagar configuração"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Gravar a base existente em /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Adicionar Utilizador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Utilizador Criado em: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Utilizador Criado em: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Primeiro Nome:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Login do Utilizador:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Tem que introduzir um Primeiro Nome válido"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Tem que introduzir um Nome válido"
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Tem que introduzir um Nome de Utilizador válido"
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Senha do Utilizador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "as senhas têm que ser iguais"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Senha (de novo):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Tem que introduzir uma senha para o LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "As senhas diferem"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../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
+msgid "Administrator,%s"
+msgstr "Administrador,%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "A configurar o Servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Nome do domínio: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Nome do domínio: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Administrador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Arvore de directorias LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "O nome DNS é usado para a definição da arvore de directorias LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Arvore de directorias LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Administrador LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Senha LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Senha LDAP (de novo):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Tem que introduzir uma arvore de directorias LDAP válida ."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Confirmação do utilizador a criar"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Primeiro Nome:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Nome do Utilizador:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Criar em:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Confirmação da Informação para criar o servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Recipiente de Utilizadores: "
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "O assistente configurou com sucesso o LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Utilizador adicionado com sucesso"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Erro ao adicionar um utilizador na base de dados Ldap"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Servidor já configurado"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Já configurou o seu Servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Falhado"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Erro!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Incapaz de ligar a %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Assistente de Notícias"
@@ -1308,7 +1307,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."
@@ -1331,7 +1331,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 ""
@@ -1347,13 +1348,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directoria:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "O caminho que escreveu não existe."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Controlo do acesso"
 
@@ -1407,31 +1408,22 @@ msgstr "Máscara de rede:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "O assistente configurou com sucesso o seu servidor NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Precisa reajustar o seu nome de domínio NIS. Para um servidor NIS é "
-"necessário um nome de domínio NIS correcto, diferente do domínio local ou "
-"nenhum."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Servidor NIS com mapa autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Configure um servidor NIS com mapa autofs, e ficheiros auto.home e auto."
 "master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1439,28 +1431,28 @@ msgstr ""
 "Os utilizadores montam automaticamente a sua directoria home do servidor, "
 "quando se ligam a um computador cliente NIS da rede."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "O que deseja fazer?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Configure o computador para ser um cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Tem apenas que preencher os campos nisdomain e nisserver."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Servidor NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Domínio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1471,7 +1463,7 @@ msgstr ""
 "providencie as capacidades ao utilizador NIS para automontar a sua pasta "
 "pessoal (home) num computador cliente NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1479,42 +1471,42 @@ msgstr ""
 "Home NIS: pasta pessoal (home) para os utilizadores no servidor NIS. Esta "
 "directoria será exportada através de um servidor NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Domínio NIS: domínio NIS a usar (geralmente o mesmo que o seu nome de "
 "domínio DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Servidor NIS: nome do seu computador."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Nome do Dominio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "O assistente irá configurar o seu servidor NIS com mapa autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Directoria NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nome de Dominio NIS: nome do domínio do NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Servidor NIS: hostname do servidor NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1522,23 +1514,24 @@ msgstr ""
 "O daemon YPBIND procura o servidor de domínios NIS e mantém a informação "
 "sobre as ligações dos mesmos."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Erro: deveria ser uma directoria."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Erro: o nome de domínio nis não deve ser 'none' ou 'localdomain'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Por favor ajuste."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
-msgstr "O assistente configurou com sucesso a sua máquina para ser um Cliente NIS."
+msgstr ""
+"O assistente configurou com sucesso a sua máquina para ser um Cliente NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1546,15 +1539,15 @@ msgstr ""
 "O assistente configurou com sucesso a sua máquina para um servidor NIS com "
 "mapa autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "A configurar o seu sistema para um servidor NIS com mapa Autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS com mapa Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "A configurar o seu sistema como um cliente NIS ..."
 
@@ -1623,7 +1616,8 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade should be a valid domain name such as \"mydomain.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:93
 msgid "Masquerade domain name:"
@@ -1673,8 +1667,8 @@ msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
-"O seu servidor irá enviar o correio através uma gateway de correio, que "
-"se irá ocupar do resto do envio."
+"O seu servidor irá enviar o correio através uma gateway de correio, que se "
+"irá ocupar do resto do envio."
 
 #: ../postfix_wizard/Postfix.pm:114
 msgid "Mail server name:"
@@ -1683,16 +1677,15 @@ msgstr "Nome do servidor de correio:"
 #: ../postfix_wizard/Postfix.pm:119
 msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
-"A definição padrão é de anexar o myhostname que é boa para pequenos "
-"sites."
+"A definição padrão é de anexar o myhostname que é boa para pequenos sites."
 
 #: ../postfix_wizard/Postfix.pm:119
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from."
 msgstr ""
-"O parâmetro minhaorigem especifica o domínio de onde o correio "
-"enviado localmente parece vir."
+"O parâmetro minhaorigem especifica o domínio de onde o correio enviado "
+"localmente parece vir."
 
 #: ../postfix_wizard/Postfix.pm:124 ../postfix_wizard/Postfix.pm:137
 msgid "myorigin:"
@@ -1707,8 +1700,8 @@ msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr ""
-"O assistente recolheu os parâmetros seguintes necessários à configuração "
-"do seu servidor de correio externo:"
+"O assistente recolheu os parâmetros seguintes necessários à configuração do "
+"seu servidor de correio externo:"
 
 #: ../postfix_wizard/Postfix.pm:135
 msgid "Internet mail gateway:"
@@ -1782,18 +1775,18 @@ msgid ""
 "needs to be greater than 1024."
 msgstr ""
 "A porta proxy define a porta na qual o servidor proxy irá esperar pelos "
-"pedidos http. Por omissão é 3128, outro valor habitual pode ser 8080, "
-"o valor da porta tem de ser superior a 1024."
+"pedidos http. Por omissão é 3128, outro valor habitual pode ser 8080, o "
+"valor da porta tem de ser superior a 1024."
 
 #: ../proxy_wizard/Squid.pm:78
 msgid "Proxy port:"
 msgstr "Porta proxy:"
 
 #: ../proxy_wizard/Squid.pm:83
-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 ""
-"Prima Seguinte se quer manter este valor, ou Voltar para mudar a sua "
-"escolha."
+"Prima Seguinte se quer manter este valor, ou Voltar para mudar a sua escolha."
 
 #: ../proxy_wizard/Squid.pm:83
 msgid "You have entered a port that may be useful for this service:"
@@ -1808,10 +1801,11 @@ 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:94
-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."
+"A cache do disco é o espaço no disco que pode ser usado para pôr em cache no "
+"disco."
 
 #: ../proxy_wizard/Squid.pm:94
 msgid "For your information, here is /var/spool/squid space on disk:"
@@ -1850,8 +1844,8 @@ msgid ""
 "secure."
 msgstr ""
 "Escolha o nível que corresponde às suas necessidades. Se não sabe, o nível "
-"da rede Local é habitualmente o mais apropriado. Tenha em atenção que "
-"o nível Todos pode não ser seguro."
+"da rede Local é habitualmente o mais apropriado. Tenha em atenção que o "
+"nível Todos pode não ser seguro."
 
 #: ../proxy_wizard/Squid.pm:106
 msgid "The proxy can be configured to use different access control levels"
@@ -1916,13 +1910,14 @@ msgid "Configuring the Proxy"
 msgstr "A configurar o Proxy"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-msgid "The wizard collected the following parameters needed to configure your proxy:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "O assistente recuperou os parametros seguintes necessários para configurar o "
 "seu proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1954,6 +1949,14 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Assistente 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."
+msgstr ""
+"Precisa reajustar o seu nome de domínio, diferente do domínio local ou "
+"nenhum. Por favor execute o drakconnect para o ajustar."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Configurar servidor PXE"
@@ -2008,8 +2011,8 @@ msgid ""
 "PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
-"A descrição PXE é usada para explicar o conteúdo da imagem de boot, p."
-"ex.:Imagem Mandrakelinux 10, Imagem Mandrakelinux cooker.."
+"A descrição PXE é usada para explicar o conteúdo da imagem de boot, p.ex.:"
+"Imagem Mandrakelinux 10, Imagem Mandrakelinux cooker.."
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
@@ -2053,7 +2056,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:142
 msgid "Path to all.rdz: provide the full path to all.rdz image"
-msgstr "Caminho para all.rdz: introduza o caminho completo para a imagem all.rdz"
+msgstr ""
+"Caminho para all.rdz: introduza o caminho completo para a imagem all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:142
 msgid ""
@@ -2067,7 +2071,8 @@ msgstr ""
 "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 boot PXE que deseja remover do seu servidor "
 "PXE."
@@ -2078,7 +2083,8 @@ msgstr "Remover 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 respectiva entrada no menu PXE serão apagadas."
+msgstr ""
+"A imagem de boot PXE, e a respectiva entrada no menu PXE serão apagadas."
 
 #: ../pxe_wizard/Pxe.pm:155
 msgid "Boot image to remove:"
@@ -2098,8 +2104,10 @@ msgstr ""
 "boot com parâmetros comuns."
 
 #: ../pxe_wizard/Pxe.pm:161
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Por favor escolha, da lista abaixo, a imagem de boot PXE que deseja modificar"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Por favor escolha, da lista abaixo, a imagem de boot PXE que deseja modificar"
 
 #: ../pxe_wizard/Pxe.pm:163 ../pxe_wizard/Pxe.pm:172 ../pxe_wizard/Pxe.pm:250
 msgid "Boot image to modify:"
@@ -2110,7 +2118,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Adicionar uma opção à imagem de boot PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandrakelinux install server directory"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr ""
 "Directoria de Instalação: o caminho completo para o directório do servidor "
 "Mandrakelinux Install"
@@ -2197,10 +2206,9 @@ msgid ""
 "a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you "
 "don't do that, PXE query will not be answered by this server."
 msgstr ""
-"É necessário usar um ficheiro dhcpd.conf especial com o parâmetro PXE. "
-"Para configurar tal opção, use o assistente DHCP e verifique a caixa "
-"'Activar PXE'. Se não o fizer, pedidos PXE não serão atendidos por este "
-"servidor."
+"É necessário usar um ficheiro dhcpd.conf especial com o parâmetro PXE. Para "
+"configurar tal opção, use o assistente DHCP e verifique a caixa 'Activar "
+"PXE'. Se não o fizer, pedidos PXE não serão atendidos por este servidor."
 
 #: ../pxe_wizard/Pxe.pm:196
 msgid ""
@@ -2212,7 +2220,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 ""
@@ -2238,7 +2247,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 iamgens de boot PXE, necessita de correr "
 "'Configurar servidor PXE' previamente."
@@ -2315,24 +2325,24 @@ msgstr "A configurar o servidor PXE no seu sistema..."
 msgid "PXE server"
 msgstr "Servidor PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Assistente Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s não existe."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Todos - sem restrições de acesso"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "As minhas regras - pedir-me os anfitriões autorizados e recusados"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2340,53 +2350,56 @@ msgstr ""
 "Samba permite ao seu servidor de se comportar como um servidor de ficheiros "
 "e de impressão para as maquinas que usam sistemas operativos não-Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Assistente de Configuração do Samba"
 
-#: ../samba_wizard/Samba.pm:72
-msgid "This wizard will help you configuring the Samba services of your server."
-msgstr "Este assistente vai ajudar-lo a configurar os serviços Samba do seu servidor."
+#: ../samba_wizard/Samba.pm:76
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr ""
+"Este assistente vai ajudar-lo a configurar os serviços Samba do seu servidor."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba precisa de saber qual grupo de trabalho Windows ele vai servir."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grupo de trabalho"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grupo de trabalho:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "O grupo de trabalho é errado"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Bandeira do Servidor."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 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:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Bandeira:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "A Bandeira do Servidor não é correcta"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nível de acesso:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2394,7 +2407,7 @@ msgstr ""
 "* Exemplo 1: autoriza todos os IPs em 150.203.*.*; exceptuado um\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2402,7 +2415,7 @@ msgstr ""
 "* Exemplo 2: permite os anfitriões que correspondem à rede indicada\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2410,7 +2423,7 @@ msgstr ""
 "* Exemplo 3: autoriza dois anfitriões\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2422,23 +2435,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Note que o acesso continua de exigir as passwords dos utilizadores."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Anfitriões autorizados:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Recusar os anfitriões:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Serviços Samba autorizados"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2447,19 +2460,19 @@ msgstr ""
 "Samba pode fornecer uma zona de partilha de ficheiros comum para as suas "
 "maquinas Windows, assim como partilhar as impressoras ligadas ao servidor."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Autoriza uma zona de partilha"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Autoriza a Partilha de Impressoras pelo Servidor"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Põe as pastas dos utilizadores à disposição dos proprietários"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2467,28 +2480,28 @@ msgstr ""
 "Você escolheu de permitir um acesso dos utilizadores às suas pastas com "
 "samba mas você/eles devem usar smbpasswd para definir uma password."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Directoria partilhada:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Escreva o caminho da directoria que deseja partilhar."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Criar directório partilhado caso não exista"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Erro ao criar o directório"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permissões nos ficheiros"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2498,59 +2511,60 @@ msgstr ""
 "devem começar por um '@') assim:\n"
 "root, fred, @users, @wheel para cada tipo de autorização."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Lista de leitura:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Lista de escritura:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 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/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Autoriza todas as impressoras"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "A configurar o Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "O assistente recolheu os seguintes parâmetros para configurar o Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Bandeira do Servidor:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Partilha de Ficheiros:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Servidor de Impressão:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Casa:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Impressoras:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "O assistente conseguiu configurar o seu servidor Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "A configurar o seu servidor Samba..."
 
@@ -2576,11 +2590,13 @@ msgstr ""
 
 #: ../time_wizard/Ntp.pm:82
 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:82
 msgid "press next to begin, or cancel to leave this wizard"
-msgstr "carregue em seguinte para começar, ou anular para sair deste assistente."
+msgstr ""
+"carregue em seguinte para começar, ou anular para sair deste assistente."
 
 #: ../time_wizard/Ntp.pm:87
 msgid ""
@@ -2678,7 +2694,8 @@ msgstr "Assistente Web"
 
 #: ../web_wizard/Apache.pm:71
 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:71
 msgid "Web server configuration wizard"
@@ -2793,3 +2810,26 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "A configurar o seu sistema como um servidor Apache ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Precisa reajustar o seu hostname."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Precisa reajustar o seu nome de domínio. Para um servidor LDAP que "
+#~ "precisa de um nome de domínio correcto, diferente do domínio local ou "
+#~ "nenhum. O Hostname tem que ser FQDN: (FQDN: Fully Qualified Domain Name). "
+#~ "Execute o drakconnect para o ajustar."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Incapaz de ligar a %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Precisa reajustar o seu nome de domínio NIS. Para um servidor NIS é "
+#~ "necessário um nome de domínio NIS correcto, diferente do domínio local ou "
+#~ "nenhum."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 97527239..fe6538bd 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,18 +7,20 @@
 # Tiago Cruz <tiagocruz@linuxdicas.com.br>, 2003, 2004.
 # Deivi Lopes Kuhn <deivikuhn@yahoo.com.br>, 2003.
 # Carlinhos Cecconi <carlinux@terra.com.br>, 2003.
+# Deivi Lopes Kuhn <deivi@softwarelivre.org>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
-"PO-Revision-Date: 2004-05-06 14:21-0300\n"
-"Last-Translator: Ricardo de Castilho <cast_brasil@ig.com.br>\n"
-"Language-Team: Brazilian Portuguese <linux_pt_BR@yahoogrupos.com.br>\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
+"PO-Revision-Date: 2004-12-20 00:18+0000\n"
+"Last-Translator: Deivi Lopes Kuhn <deivi@softwarelivre.org>\n"
+"Language-Team: Português do Brasil <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
 
 #: ../Wiztemplate.pm:31
 msgid "configuration wizard"
@@ -26,31 +28,31 @@ msgstr "assistente de configuração"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Aviso"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Erro."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Parabéns"
 
@@ -92,18 +94,18 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(você não precisa digitar o domínio após o nome)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identificação do Cliente:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "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:134
+#: ../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, "
@@ -113,33 +115,33 @@ msgstr ""
 "empresa.net. Cada máquina na rede deve ter um endereço de IP único na "
 "sintaxe pontilhada usual."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Nome da máquina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Endereço de IP da máquina:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Aviso"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Você está em DHCP; o servidor pode não funcionar com sua configuração"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Erro."
@@ -184,12 +186,36 @@ msgstr "IP do cliente:"
 msgid "The wizard successfully added the client."
 msgstr "O assistente adicionou o cliente com sucesso."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Você precisa reajustar seu nome de domínio. Para o servidor DNS é necessário "
+"um nome de domínio correto, não igual ao domínio local ou em branco. O "
+"hostname precisa ser um nome DNS completo (FQDN). Execute o drakconnect para "
+"ajustar isso."
+
+#: ../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."
+msgstr ""
+"Você precisa reajustar seu nome de domínio. Para o servidor DNS é necessário "
+"um nome de domínio correto, não igual ao domínio local ou em branco. O "
+"hostname precisa ser um nome DNS completo (FQDN). Execute o drakconnect para "
+"ajustar isso."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
+"O comando continua sendo executado. Você deseja terminá-lo e sair do "
+"assistente?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Fechar"
 
@@ -285,8 +311,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "desabilitado"
@@ -295,8 +321,8 @@ msgstr "desabilitado"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "habilitado"
@@ -309,53 +335,38 @@ msgstr "Interface:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "O assistente configurou com sucesso os serviços DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Falha"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Reinicie o drakwizard, e tente mudar alguns parâmetros"
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Você precisa reajustar seu nome de máquina (hostname)"
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"Você precisa reajustar seu nome de domínio. Para o servidor DNS é necessário "
-"um nome de domínio correto, não igual ao domínio local ou em branco. Execute "
-"o drakconnect para ajustar isso."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Servidor NFS mestre"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Servidor DNS escravo"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Adicionar host no DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Remover hosts no DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -363,11 +374,11 @@ msgstr ""
 "DNS (Servidor de Nomes de Domínio) é o serviço que relaciona um endereço IP "
 "com um nome de domínio na internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Assistente de Configuração DNS Mestre"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -377,47 +388,44 @@ msgstr ""
 "Esta configuração proverá um serviço local de DNS para os nomes de "
 "computadores locais. Requisições não locais são enviadas a um DNS externo."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "O que você gostaria de fazer:"
 
-#: ../dns_wizard/Bind.pm:126
-#, fuzzy
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
-msgstr "Servidor DNS"
+msgstr "Interface do servidor DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Você não precisa adicionar o domínio após o nome)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
-#, fuzzy
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
-msgstr "IP do servidor:"
+msgstr "Servidor:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
-#, fuzzy
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
-msgstr "Nome de domínio NIS:"
+msgstr "Nome de domínio DNS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Escolha o host que você deseja remover na lista:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Remove um host na configuração DNS existe."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Remover hosts:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Nome do Computador:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -427,11 +435,11 @@ msgstr ""
 "de nomes primário, e também funcionará como um servidor backup, no caso do "
 "seu servidor mestre esteja inacessível."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Endereço de IP do servidor de DNS mestre:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -439,11 +447,11 @@ msgstr ""
 "O forwarding ocorre somente naquelas perguntas para que o usuário não é "
 "autorizado e não tem a resposta em seu cache."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "End. IP do seu \"forwarder\""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -452,15 +460,15 @@ msgstr ""
 "pacotes IPs (IP forwarder) entre com o endereço IP. Se você não sabe este "
 "endereço, deixe em branco."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS externo:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Adicionar procura de domínio"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -468,7 +476,7 @@ msgstr ""
 "Nome de domínio deste servidor é automaticamente adicionado, e você não "
 "precisa adicionar ele aqui."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -480,29 +488,29 @@ msgstr ""
 "pode ser alterada acrescentando-se os domínio desejados como novas chaves de "
 "pesquisa."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Nome de domínio padrão para pesquisar:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 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"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Este não é um endereço de IP válido do DNS mestre... pressione próximo para "
 "continuar"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../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"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -510,11 +518,11 @@ msgstr ""
 "Parece que host já está na sua configuração de DNS... pressione próximo para "
 "continuar"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -522,7 +530,7 @@ msgstr ""
 "Parece que isso não está presente na sua configuração DNS... pressione "
 "próximo para continuar"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -530,71 +538,71 @@ msgstr ""
 "Parece que nenhum servidor DNS tem sido configurado através do assistente. "
 "Favor execute o assistente do DNS: Servidor DNS mestre."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Parece que o seu não é um servidor DNS mestre, mas só um escravo. Então eu "
 "não posso adicionar/remover maquina."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "O Assistente irá construir sua configuração do DNS escravo"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "com esta configuração:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Cliente com esta identificação será adicionado ao seu DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Nome do Computador:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Endereço de IP com computador:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 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:249
+#: ../dns_wizard/Bind.pm:243
 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:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Nome da máquina servidora:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Nome de domínio:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "O assistente adicionou o host com sucesso em seu DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "O assistente removeu o host com sucesso de seu DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "O assistente configurou com sucesso o serviço de DNS do seu servidor."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Favor reiniciar o drakwizard, e tente mudar alguns parâmetros."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurando seu sistema como servidor de DNS mestre."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurando seu sistema como um servidor DNS escravo..."
 
@@ -622,7 +630,7 @@ msgstr "Servidor de e-mail"
 msgid "FTP server"
 msgstr "Servidor de FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Servidor Samba"
 
@@ -643,18 +651,16 @@ msgid "NIS server autofs map"
 msgstr "Servidor NIS mapa autofs"
 
 #: ../drakwizard.pl:52
-#, fuzzy
 msgid "Mandrakelinux Install server"
-msgstr "Instalação de Servidores Mandrakelinux"
+msgstr "Servidor de Instalação Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Servidor Kolab"
 
 #: ../drakwizard.pl:54
-#, fuzzy
 msgid "ldap server"
-msgstr "Servidor Kolab"
+msgstr "Servidor ldap"
 
 #: ../drakwizard.pl:68
 msgid "Drakwizard wizard selection"
@@ -673,7 +679,7 @@ msgstr ""
 "%s não está instalado\n"
 "Clique em \"Próximo\" para instalar ou em \"Cancelar\" para sair"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Falha na instalação"
 
@@ -842,18 +848,16 @@ msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Favor reinicie o drakwizard, e tente mudar alguns parâmetros."
 
 #: ../installsrv_wizard/Installsrv.pm:53
-#, fuzzy
 msgid "Configure a Mandrakelinux install server (via NFS and http)"
-msgstr "Configurar o Mandrakelinux instalação de servidores (via NFS e http)"
+msgstr "Configurar o serividor de instalação Mandrakelinux (via NFS e http)"
 
 #: ../installsrv_wizard/Installsrv.pm:53
-#, fuzzy
 msgid ""
 "Easily configure a Mandrakelinux server installation directory, with NFS and "
 "HTTP access."
 msgstr ""
-"Configure facilmente um diretório de instalação do servidor Mandrakelinux, "
-"com acesso NFS e HTTP."
+"Configure facilmente um diretório para o servidor de instalação "
+"Mandrakelinux, com acesso NFS e HTTP."
 
 #: ../installsrv_wizard/Installsrv.pm:58
 msgid "Destination directory: copy file in which directory?"
@@ -864,7 +868,6 @@ msgid "Install server configuration"
 msgstr "Configuração do servidor de instalação"
 
 #: ../installsrv_wizard/Installsrv.pm:58
-#, fuzzy
 msgid ""
 "Path to data: specify your source directory, should be base of a "
 "Mandrakelinux installation."
@@ -881,7 +884,6 @@ msgid "ie use: /var/install/mdk-release"
 msgstr "isto é, use: /var/install/mdk-release"
 
 #: ../installsrv_wizard/Installsrv.pm:77
-#, fuzzy
 msgid ""
 "Error, the source path must be a directory with full Mandrakelinux "
 "installation directory."
@@ -906,34 +908,24 @@ msgid "Enable HTTP install server:"
 msgstr "Habilita instalação de HTTP no servidor:"
 
 #: ../installsrv_wizard/Installsrv.pm:100
-#, fuzzy
 msgid "Configuring your system, please wait..."
-msgstr "Configurando seu sistema como um Cliente DNS ..."
+msgstr "Configurando seu sistema, por favor aguarde ..."
 
 #: ../installsrv_wizard/Installsrv.pm:104
-#, fuzzy
 msgid ""
 "Congratulations, Mandrakelinux 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 Mandrakelinux through a network."
 msgstr ""
-"Parabéns, o servidor de instalação do Mandrakelinux está pronto agora. Você "
-"pode configurar agora um servidor DHCP com suporte PXE e um servidor PXE. "
-"Então será muito fácil instalar o Mandrakelinux através da rede."
+"Parabéns, o servidor de instalação do Mandrakelinux está pronto. Você pode "
+"configurar agora um servidor DHCP com suporte PXE e um servidor PXE. Com "
+"isto será muito fácil instalar o Mandrakelinux através da rede."
 
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
 msgstr "Assistente de Configuração do Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Você precisa reajustar seu nome-de-domínio, não igual ao 'localdomais' ou "
-"'nenhum'. Favor executar o drakconnect para ajustar isso."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -945,7 +937,7 @@ msgstr ""
 "provisão para usuários da caixa postal como os contatos e um POP3 como IMAP4"
 "(rev1) e acesso ao correio"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -955,39 +947,39 @@ msgstr ""
 "Cyrus, Sufixo, Imap, Saslauth.  O assistente fará ajustes em todos os "
 "arquivos para a configuração destes serviços."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Assistente de configuração do Kolab Groupware"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Entre com a senha entrar no gerenciador de usuário Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Senha errada ou nula, digite a senha correta."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Senha novamente:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Servidor:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Domínio:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -995,259 +987,225 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Instalação em andamento"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Instalando o Kolab em seu sistema..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurando o servidor Kolab no seu sistema..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Assistente do samba"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Você precisa reajustar seu nome de domínio. Para o servidor LDAP é "
-"necessário um nome de domínio correto, não igual ao domínio local ou em "
-"branco. Execute o drakconnect para ajustar isso."
-
-#: ../ldap_wizard/Ldap.pm:99
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
-msgstr "Assistente de configuração do LDAP"
+msgstr "Ver configuração Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
-msgstr "Add - adiciona entrada no servidor LDAP"
+msgstr "Adicionar usuário no servidor Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
-msgstr "Assistente de configuração do LDAP"
+msgstr "Remover configuração Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
+"Protocolo para acesso a serviços de diretório, especialmente os baseados em "
+"X 500"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
-msgstr ""
+msgstr "LDAP significa Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Assistente de configuração do LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
-msgstr "Definir o servidor PXE."
+msgstr "Você deve configurar um servidor de Ldap primeiro."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
-msgstr ""
+msgstr "Sua escolha:"
 
-#: ../ldap_wizard/Ldap.pm:146
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
-msgstr "Configuração do servidor de instalação"
+msgstr "Remover configuração"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
-msgstr ""
+msgstr "Armazenar a base existente em /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
-msgstr ""
+msgstr "Adicionar usuário Ldap"
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Nome de usuário:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Primeiro Nome:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
-msgstr "Nome de usuário:"
+msgstr "Nome:"
 
-#: ../ldap_wizard/Ldap.pm:158
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
-msgstr "Recipiente:"
+msgstr "Login do usuário:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
-msgstr ""
+msgstr "Você deve fornecer um primeiro nome válido."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
-msgstr ""
+msgstr "Você deve fornecer um nome válido."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
-msgstr ""
+msgstr "Você deve fornecer um nome de usuário válido."
 
-#: ../ldap_wizard/Ldap.pm:178
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
-msgstr "Senha:"
+msgstr "Senha do usuário LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
-msgstr ""
+msgstr "as senhas precisam ser iguais"
 
-#: ../ldap_wizard/Ldap.pm:182
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
-msgstr "Senha novamente:"
+msgstr "Senha (novamente):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
-msgstr ""
+msgstr "Você deve fornecer a senha para o LDAP"
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
+"Administrador é um usuário especial com direito de acesso a base de dados do "
+"LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
-msgstr "Configurando o Samba"
+msgstr "Configurando o servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Nome de domínio:"
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Nome de domínio: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
-msgstr ""
+msgstr "Administrador LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
-msgstr "Diretório TFTP:"
+msgstr "Árvore de diretório LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
-msgstr ""
+msgstr "O nome DNS é utilizado para a definição da árvore de diretório LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
-msgstr "Diretório TFTP:"
+msgstr "Árvore de diretório LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
-msgstr ""
+msgstr "Administrador LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
-msgstr "Senha:"
+msgstr "Senha LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
-msgstr "Senha novamente:"
+msgstr "Senha LDAP (novamente):"
 
-#: ../ldap_wizard/Ldap.pm:211
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
-msgstr "Diretório TFTP:"
+msgstr "Você deve fornecer uma árvore de diretório LDAP válida:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
-msgstr ""
+msgstr "Confirmação do usuário a ser criado"
 
-#: ../ldap_wizard/Ldap.pm:231
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Primeiro Nome:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Nome de usuário:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
-msgstr ""
+msgstr "Criar em:"
 
-#: ../ldap_wizard/Ldap.pm:239
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
-msgstr "Configurando o servidor DHCP"
+msgstr "Confirmação das informações para criação do servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Recipiente:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "O assistente configurou com sucesso seu servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:260
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
-msgstr "Dados adicionados com sucesso"
+msgstr "Usuário adicionado com sucesso"
 
-#: ../ldap_wizard/Ldap.pm:270
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
-msgstr "Add - adiciona entrada no servidor LDAP"
+msgstr "Erro ao adicionar usuário no banco de dados LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
-msgstr ""
+msgstr "Servidor já configurado"
 
-#: ../ldap_wizard/Ldap.pm:283
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
-msgstr "O assistente configurou com sucesso seu servidor Samba"
+msgstr "Você já configurou o seu servidor LDAP"
 
-#: ../ldap_wizard/Ldap.pm:442
-#, fuzzy, perl-format
+#: ../ldap_wizard/Ldap.pm:421
+#, perl-format
 msgid "%s Failed"
-msgstr "Falha"
+msgstr "%s Falha"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
-#, fuzzy
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
-msgstr "Erro."
-
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
+msgstr "Erro!"
 
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
@@ -1391,13 +1349,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Diretório:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "O caminho digitado não existe."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Controle de acesso"
 
@@ -1451,31 +1409,22 @@ msgstr "Máscara de rede:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "O assistente configurou com sucesso seu servidor NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Você precisa reajustar seu nome-de-domínio NIS. Para o servidor NIS você "
-"precisa de um nome-de-domínio NIS correto, não igual ao domínio local ou em "
-"branco."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Servidor de NIS com mapa autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Configura um servidor NIS com mapa autofs, arquivo auto.home e arquivo auto."
 "master"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1483,28 +1432,28 @@ msgstr ""
 "Usuários automaticamente montam seus diretórios 'home' do servidor, quando "
 "eles fazem logon em uma rede de computadores clientes NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Configura o computador para ser um cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Você deve apenas informar o seu domínio NIS e o servidor NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Servidor NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Domínio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1514,7 +1463,7 @@ msgstr ""
 "assistente também constrói mapa autofs, assim ele fornece as capacidades "
 "para usuário NIS auto-montar seu diretório 'home' num computador cliente NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1522,42 +1471,42 @@ msgstr ""
 "NIS Home: diretório 'home' para usuários no servidor NIS. Este diretório "
 "será exportado através do servidor NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Domínio NIS: domínio NIS para usar (geralmente o mesmo que o seu nome-de-"
 "domínio DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Servidor NIS: nome do seu computador."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Nome de domínio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "O assistente definirá seu servidor NIS com mapa autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Diretório NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nome-de-domínio NIS: nome do domínio NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Servidor NIS: nome da máquina do servidor NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1565,23 +1514,23 @@ msgstr ""
 "O daemon YPBIND procura por servidores de domínio NIS e mantém as "
 "informações de ligação"
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Erro, deveria ser um diretório."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Erro, nome-de-domínio-nis não deveria ser 'nenhum' ou 'localdomain'"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Favor ajustá-lo"
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "O assistente configurou com sucesso sua máquina como um cliente de NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1589,15 +1538,15 @@ msgstr ""
 "O assistente configurou com sucesso sua máquina como um servidor NIS com "
 "mapa autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Configurando seu sistema como um servidor NIS com mapa Autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS com para autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Configurando seu sistema como um Cliente DNS ..."
 
@@ -1967,7 +1916,7 @@ msgstr ""
 "servidor proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1999,14 +1948,21 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Assistente do 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."
+msgstr ""
+"Você precisa reajustar seu nome-de-domínio, não igual ao 'localdomais' ou "
+"'nenhum'. Favor executar o drakconnect para ajustar isso."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Definir servidor PXE"
 
 #: ../pxe_wizard/Pxe.pm:86
-#, fuzzy
 msgid "Add boot image (Mandrakelinux release < 9.2)"
-msgstr "Adicionar imagem de boot (Mandrakelinux release < 9,2)"
+msgstr "Adicionar imagem de boot (versão do Mandrakelinux menor que 9,2)"
 
 #: ../pxe_wizard/Pxe.pm:87
 msgid "Remove boot image in PXE"
@@ -2017,9 +1973,8 @@ msgid "Modify boot image in PXE"
 msgstr "Modifica imagem de boot no PXE"
 
 #: ../pxe_wizard/Pxe.pm:89
-#, fuzzy
 msgid "Add all.rdz image (Mandrakelinux release > 10.0)"
-msgstr "Adicionar a imagem all.rdz (Mandrakelinux release > 10.0)"
+msgstr "Adicionar a imagem all.rdz (Versão do Mandrakelinux maior que 10.0)"
 
 #: ../pxe_wizard/Pxe.pm:111
 msgid "PXE wizard"
@@ -2051,13 +2006,12 @@ msgid "Add a boot image"
 msgstr "Adiciona imagem de boot"
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
-#, fuzzy
 msgid ""
 "PXE description is used to explain the role of the boot image, e.g.: "
 "Mandrakelinux 10 image, Mandrakelinux cooker image.."
 msgstr ""
 "A descrição PXE é usada para demonstrar o tipo de imagem de boot. Por "
-"exemplo: Mandrakelinux 10 image, Mandrakelinux cooker image..."
+"exemplo: Imagem Mandrakelinux 10, Imagem Mandrakelinux cooker..."
 
 #: ../pxe_wizard/Pxe.pm:132 ../pxe_wizard/Pxe.pm:142
 msgid ""
@@ -2154,9 +2108,8 @@ msgid "Boot image to modify:"
 msgstr "Imagem de boot a modificar:"
 
 #: ../pxe_wizard/Pxe.pm:170
-#, fuzzy
 msgid "Add option to the PXE boot image"
-msgstr "Adiciona opção para boot de disco PXE"
+msgstr "Adicionar uma opção a imagem de boot PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
 msgid ""
@@ -2366,24 +2319,24 @@ msgstr "Configurando o servidor PXE no seu sistema..."
 msgid "PXE server"
 msgstr "Servidor PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Assistente do samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s não existe"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Todas - sem restrição de acesso"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Minhas regras - Pergunte-me os hosts permitidos e proibidos"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2391,57 +2344,57 @@ msgstr ""
 "O Samba permite que seu servidor comporte-se como um servidor de arquivos e "
 "impressão para estações de trabalho que rodam sistemas não-Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Assistente de Configuração do Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Este assistente ajudará você a configurar o serviço SAMBA em seu servidor."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 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."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grupo de trabalho"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grupo de trabalho:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "O grupo de trabalho está incorreto"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Logotipo do Servidor"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "O banner é a maneira como este usuário será descrito nas estações Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Logo:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Esse logotipo do Servidor está incorreto"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nível de Acesso:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2449,7 +2402,7 @@ msgstr ""
 "* Exemplo 1: permitir todos os IPs em 150.203.*.*; exceto um\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2458,7 +2411,7 @@ msgstr ""
 "subrede\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2466,7 +2419,7 @@ msgstr ""
 "* Exemplo 3: permitir uma dupla de hosts\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2478,23 +2431,23 @@ msgstr ""
 "hosts allow = \\@foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Note que o acesso ainda requer uma senha de nível de usuário válida."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Permitir hosts:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Bloquear hosts:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Habilita o serviço Samba."
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2504,19 +2457,19 @@ msgstr ""
 "estações de trabalho Windows, e pode também fornecer um compartilhamento de "
 "impressoras para as que estiverem conectadas a seu servidor."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Habilita a área de compartilhamento de arquivos"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Habilita o Servidor de Compartilhamento de Impressoras"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Faz os diretórios home's serem acessíveis por seus proprietários"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2525,28 +2478,28 @@ msgstr ""
 "através do samba, mas você e eles devem usar o comando smbpasswd para "
 "ajustar uma senha."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Diretório compartilhado:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Digite o caminho do diretório que você quer compartilhar."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
-msgstr ""
+msgstr "Criar diretório compartilhado, caso ele não exista"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
-msgstr ""
+msgstr "Falha ao criar diretório"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permissões de arquivos"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2556,61 +2509,61 @@ msgstr ""
 "precedidos de um '\\@') como este:\n"
 "root, fred, \\@users, \\@wheel para cada tipo da permissão."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Lista de leitura:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, \\@users, \\@wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Lista de escrita:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Selecione qual impressora você deseja que esteja acessível para os usuários "
 "conhecidos"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Habilita todas as impressoras"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Configurando o Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "O assistente coletou os seguintes parâmetros para configurar o Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Logotipo do Servidor:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Compartilhar arquivo:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Servidor de impressão"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Home:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Impressoras:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "O assistente configurou com sucesso seu servidor Samba"
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Configurando seu servidor Samba..."
 
@@ -2855,162 +2808,35 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando seu sistema como servidor Apache ..."
 
-#, fuzzy
-#~ msgid "Configure Ldap server"
-#~ msgstr "Configurando o servidor DHCP"
-
-#, fuzzy
-#~ msgid "Configure OpenLDAP Server "
-#~ msgstr "Configurando o servidor DHCP"
-
-#, fuzzy
-#~ msgid "Configure OpenLDAP server"
-#~ msgstr "Configurando o servidor DHCP"
-
-#, fuzzy
-#~ msgid "Add user in OpenLDAP server"
-#~ msgstr "Add - adiciona entrada no servidor LDAP"
-
-#, fuzzy
-#~ msgid "OpenLDAP configuration wizard"
-#~ msgstr "Assistente de configuração do LDAP"
-
-#, fuzzy
-#~ msgid "Setup an OpenLDAP server."
-#~ msgstr "Definir o servidor PXE."
-
-#, fuzzy
-#~ msgid "You must setup an OpenLDAP server first."
-#~ msgstr "Definir o servidor PXE."
-
-#, fuzzy
-#~ msgid "Save an existing configuration"
-#~ msgstr "Remove um host na configuração DNS existe."
-
-#, fuzzy
-#~ msgid "The wizard successfully added a user in LDAP"
-#~ msgstr "O assistente adicionou com sucesso a entrada no ldap"
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Você precisa reajustar seu nome de máquina (hostname)"
 
 #~ msgid ""
-#~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
-#~ "a number, without spaces)"
-#~ msgstr ""
-#~ "Nome PXE: o nome mostrado no menu PXE (favor fornecer uma palavra ou um "
-#~ "número, sem espaço)"
-
-#~ msgid "Add option to the PXE boot disk"
-#~ msgstr "Adiciona opção para boot de disco PXE"
-
-#~ msgid "Server - Set configuration of LDAP server"
-#~ msgstr "Servidor - Definir configuração do servidor LDAP"
-
-#~ msgid "Apache web server"
-#~ msgstr "Apache servidor web"
-
-#~ msgid "Copying data to destination directory, can take a while...."
+#~ "You need to readjust your domainname. For an LDAP 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 ""
-#~ "Copiando dados para o diretório de destino, isso pode demorar um pouco..."
-
-#~ msgid "Install Server"
-#~ msgstr "Instalação de Servidores"
-
-#~ msgid "Setup a ldap server."
-#~ msgstr "Configura um servidor LDAP."
-
-#~ msgid "which operation on LDAP:"
-#~ msgstr "qual operação do LDAP:"
-
-#~ msgid "Add data in LDAP"
-#~ msgstr "Adiciona dados no LDAP"
+#~ "Você precisa reajustar seu nome de domínio. Para o servidor LDAP é "
+#~ "necessário um nome de domínio correto, não igual ao domínio local ou em "
+#~ "branco. O nome do host deve ser um nome completo (FQDN). Execute o "
+#~ "drakconnect para ajustar isso."
 
-#~ msgid "uid, gid, home directory, "
-#~ msgstr "uid, gid, diretório home, "
+#~ msgid "User Created in: "
+#~ msgstr "Usuário criado em:"
 
-#~ msgid "Last Name:"
-#~ msgstr "Último Nome:"
+#~ msgid "Administrator"
+#~ msgstr "Administrador"
 
-#~ msgid "Home Directory:"
-#~ msgstr "Diretório home:"
+#~ msgid "Domain name: "
+#~ msgstr "Nome de domínio:"
 
-#~ msgid "Login shell:"
-#~ msgstr "Login no Shell:"
-
-#~ msgid "uid number:"
-#~ msgstr "número do uid:"
-
-#~ msgid "Group ID:"
-#~ msgstr "ID do grupo:"
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Não foi possível  conectar a %s"
 
 #~ msgid ""
-#~ "LDAP RootDSE\n"
-#~ "\n"
-#~ "example:\n"
-#~ "obelx.nux.com\n"
-#~ "\n"
-#~ "will be in ldap config:\n"
-#~ "\n"
-#~ "dc=obelx,dc=nux,dc=com\n"
-#~ "\n"
-#~ "RootDN is the manager of your ldap server."
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
 #~ msgstr ""
-#~ "LDAP RootDSE\n"
-#~ "\n"
-#~ "exemplo:\n"
-#~ "obelx.nux.com\n"
-#~ "\n"
-#~ "para este domínio você irá configurar como:\n"
-#~ "\n"
-#~ "dc=obelx,dc=nux,dc=com\n"
-#~ "\n"
-#~ "RootDN é o usuário com direito administrativo para seu servidor ldap."
-
-#~ msgid "RootDSE"
-#~ msgstr "RootDSE"
-
-#~ msgid "RootDN"
-#~ msgstr "RootDN"
-
-#~ msgid "Default OU"
-#~ msgstr "OU padrão"
-
-#~ msgid "Ok Now add entry in LDAP"
-#~ msgstr "Ok Adicionando agora entra no LDAP"
-
-#~ msgid "Home directory:"
-#~ msgstr "Diretório do usuário:"
-
-#~ msgid "shadowMax:"
-#~ msgstr "shadowMax:"
-
-#~ msgid "shadowMin:"
-#~ msgstr "shadowMin:"
-
-#~ msgid "shadowWarning:"
-#~ msgstr "aviso Sombra:"
-
-#~ msgid "shadowInactive:"
-#~ msgstr "shadowInactive:"
-
-#~ msgid "shadowExpire:"
-#~ msgstr "shadowExpire:"
-
-#~ msgid "objectClass:"
-#~ msgstr "objectClass:"
-
-#~ msgid "Ok Now building your LDAP configuration"
-#~ msgstr "Ok Construindo agora sua configuração LDAP"
-
-#~ msgid "Error in Home directory"
-#~ msgstr "Erro no diretório Home"
-
-#~ msgid "Error, pass could not be empty"
-#~ msgstr "Erro, passagem não pode ser vazia"
-
-#~ msgid "Error in Login shell"
-#~ msgstr "Erro no Shell de login"
-
-#~ msgid "Please choose a correct one"
-#~ msgstr "Favor escolher um correto"
-
-#~ msgid "Please Should be a number"
-#~ msgstr "Por favor, deveria ser um número"
+#~ "Você precisa reajustar seu nome-de-domínio NIS. Para o servidor NIS você "
+#~ "precisa de um nome-de-domínio NIS correto, não igual ao domínio local ou "
+#~ "em branco."
diff --git a/po/ro.po b/po/ro.po
index 3ec23e88..26e4550c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2003-12-16 17:15+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -23,31 +23,31 @@ msgstr "asistent de configurare"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Avertisment."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Eroare."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Felicitări!"
 
@@ -90,11 +90,11 @@ msgstr "Acest asistent vă va ajuta să adăugaţi un client nou în DNS-ul loca
 msgid "(you don't need to type the domain after the name)"
 msgstr "(nu trebuie să scrieţi domeniul după nume)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identificare client:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -103,7 +103,7 @@ msgstr ""
 "Reţineţi că numărul IP alocat şi numele clientului trebuie să fie unic în "
 "reţea."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -113,34 +113,34 @@ msgstr ""
 "net. Orice maşină din reţea trebuie să aibă o adresă IP (unică) în formatul "
 "uzual cu puncte."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Numele maşinii: "
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Numărul IP al maşinii:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Avertisment"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Sunteţi în DHCP, serverul poate nu va rula în configuraţia dvs."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Eroare"
@@ -185,12 +185,25 @@ msgstr "IP client:"
 msgid "The wizard successfully added the client."
 msgstr "Asistentul a adăugat clientul cu succes."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Închide"
 
@@ -282,8 +295,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "Dezactivat"
@@ -292,8 +305,8 @@ msgstr "Dezactivat"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "Activat"
@@ -307,53 +320,42 @@ msgstr "Interfaţă:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Asistentul a configurat cu succes serviciile DHCP al serverului dvs."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "Activat"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "Refuză gazdele:"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -361,12 +363,12 @@ msgstr ""
 "DNS (Domain Name Server) este un serviciu care pune în corespondenţă o "
 "maşină cu un nume de gazdă de Internet"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Asistent configurare DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -377,92 +379,92 @@ msgstr ""
 "numele calculatoarelor locale, cu cererile ne-locale transmise către un DNS "
 "exterior."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(nu trebuie să scrieţi domeniul după nume)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Antet server:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Nume de domeniu 'mascaradat':"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "Refuză gazdele:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nume server de ştiri:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Configurez serverul DNS"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -470,119 +472,119 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Aceasta nu este o adresă validă... apăsaţi Următorul pentru continuare"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Aceasta nu este o adresă validă... apăsaţi Următorul pentru continuare"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Aceasta nu este o adresă validă... apăsaţi Următorul pentru continuare"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Eroare"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Dns (configurare)"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Nume server de ştiri:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Antet server:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Asistentul a adăugat clientul cu succes."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Asistentul a adăugat clientul cu succes."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Asistentul a configurat cu succes serviciile DNS ale serverului dvs."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurez serverul DNS"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurez serverul DNS"
@@ -613,7 +615,7 @@ msgstr "Server de email"
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Server Samba"
 
@@ -639,7 +641,7 @@ msgstr "Server de ştiri"
 msgid "Mandrakelinux Install server"
 msgstr "Server de email"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Server Samba"
@@ -666,7 +668,7 @@ msgstr ""
 "%s nu este instalat\n"
 "Apăsaţi \"Înainte\" pentru a instala sau \"Renunţă\" pentru a ieşi"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalarea a eşuat"
 
@@ -905,13 +907,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Asistent de configurare Samba"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -919,307 +915,296 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Asistent de configurare server Web"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Parolă:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, 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:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Antet server:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Director utilizator:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Configurez serverul FTP"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Configurez serverul FTP"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Asistent Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "asistent de configurare"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "asistent de configurare"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "asistent de configurare"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Server Samba"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Configurare server de timp salvată"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Parola"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Parolă:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Parolele nu sunt identice"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Configurez Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Nume de domeniu 'mascaradat':"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Nume de domeniu 'mascaradat':%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Director utilizator:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Director utilizator:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Parolă:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Director utilizator:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Antet server:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Configurez serverul DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Nume server de ştiri:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Asistentul a configurat cu succes serviciul Proxy al serverului dvs."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Asistentul a configurat cu succes serviciul Samba al serverului dvs."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Activat"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Eroare"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Asistent Ştiri"
@@ -1362,13 +1347,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Director:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Calea introdusă nu există."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Control acces"
 
@@ -1422,148 +1407,142 @@ msgstr "Mască de reţea:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Asistentul a configurat cu succes serviciul NFS al serverului dvs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Server de ştiri"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "IP client:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "Server NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Acasă:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Nume de domeniu 'mascaradat':"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Asistentul a configurat cu succes serviciul Samba al serverului dvs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "Director utilizator:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nume de domeniu 'mascaradat':"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Director partajat:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Asistentul a configurat cu succes serviciul Samba al serverului dvs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Asistentul a configurat cu succes serviciul Samba al serverului dvs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Configurez serverul DNS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Server de ştiri"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Configurez serverul DNS"
@@ -1939,7 +1918,7 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea Proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1975,6 +1954,12 @@ msgstr "Asistent SQUID"
 msgid "PXE Wizard"
 msgstr "Asistent FTP"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2301,27 +2286,27 @@ msgstr ""
 msgid "PXE server"
 msgstr "Server ftp"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Asistent Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s nu există."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Tot - Fără restriţii de acces"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 "Reguli personalizate - Întreabă-mă care sunt gazdele care au/nu au drept de "
 "acces"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2329,39 +2314,39 @@ msgstr ""
 "Samba permite serverului dvs. să se comporte ca server de fişiere şi "
 "imprimare pentru staţiile de lucru ce rulează sisteme non-Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Asistent de configurare Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Acest asistent vă va ajuta la configurarea serviciilor Samba pentru serverul "
 "dumneavoastră."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 "Samba necesită specificarea grupului de lucru Windows pe care îl va deservi."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Nume grup de lucru"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grup de lucru:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Grupul de lucru este eronat"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Antet server."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2369,19 +2354,19 @@ msgstr ""
 "Antetul conţine modul în care acest server va fi descris staţiilor de lucru "
 "Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Antet"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Antetul serverului nu este corect"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nivel acces:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2389,7 +2374,7 @@ msgstr ""
 "* Exemplul 1: permite tuturor IP-urilor din 150.203.*.*; exceptând unul\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2398,7 +2383,7 @@ msgstr ""
 "reţea se potriveşte\n"
 "hosts allow= 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2406,7 +2391,7 @@ msgstr ""
 "* Exemplul 3: permite accesul unor gazde\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2418,25 +2403,25 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Reţineţi că accesul necesită totuşi parole corespunzătoare la nivel "
 "utilizator"
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Permite gazdelor:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Refuză gazdele:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Servicii Samba activate"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2446,19 +2431,19 @@ msgstr ""
 "luctru Windows, de asemenea poate oferi partajarea imprimantelor conectate "
 "la serverul dvs."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Activează zona de partajare a fişierelor"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Activare partajare imprimante de pe server"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Face disponibile directoarele acasă pentru proprietarii lor."
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2467,28 +2452,28 @@ msgstr ""
 "via SAMBA, dar trebuie să folosiţi/folosească smbpasswd pentru alegerea "
 "parolei."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Director partajat:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Introduceţi calea directorului pe care doriţi să îl partajaţi."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Drepturi fişiere"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2498,62 +2483,62 @@ msgstr ""
 "precedate  de un '@')ca în:\n"
 "root, gigi, @users,@wheel pentru fiecare fel de drepturi."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Lista citire:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Lista scriere:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Selectaţi imprimantele ce vor fi accesibile utilizatorilor cunoscuţi"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Activează toate imprimantele"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Configurez Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Asistentul a colectat următorii parametri\n"
 "configurarea Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Antet server:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Partajare fişiere:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Server de tipărire:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Acasă:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Imprimante:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Asistentul a configurat cu succes serviciul Samba al serverului dvs."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Configurez serverul FTP"
@@ -2804,6 +2789,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Configurez serverul DNS"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Nume server de ştiri:"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Configurez serverul DHCP"
 
diff --git a/po/ru.po b/po/ru.po
index e6d7b76b..0e2b4e54 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-10-14 12:05+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -23,31 +23,31 @@ msgstr "мастер настройки"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Предупреждение."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Ошибка."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Поздравляем"
 
@@ -87,18 +87,18 @@ msgstr "Этот мастер поможет вам добавить новог�
 msgid "(you don't need to type the domain after the name)"
 msgstr "(вам не нужно вводить домен после имени)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Идентификация клиента:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Помните, что указанный IP-адрес и имя клиента должны быть уникальными в сети."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -108,33 +108,33 @@ msgstr ""
 "net. Каждая машина в сети должна иметь (уникальный) IP-адрес с обычным "
 "точечным синтаксисом."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Имя машины:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP-адрес машины:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Предупреждение"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Вы используете dhcp, сервер может не работать с вашей конфигурацией."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Ошибка"
@@ -179,12 +179,34 @@ msgstr "IP клиента:"
 msgid "The wizard successfully added the client."
 msgstr "Мастер успешно добавил клиента."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Вам необходимо исправить имя своего домена. Для сервера DNS вы должны "
+"изменить имя домена, не равное localdomain или пустому значению. Имя хоста "
+"должно быть полностью определенным именем домена (FQDN, Fully Qualified "
+"Domain Name). Запустите drakconnect для его изменения."
+
+#: ../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."
+msgstr ""
+"Вам необходимо исправить имя своего домена. Для сервера DNS вы должны "
+"изменить имя домена, не равное localdomain или пустому значению. Имя хоста "
+"должно быть полностью определенным именем домена (FQDN, Fully Qualified "
+"Domain Name). Запустите drakconnect для его изменения."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Команда все еще работает. Хотите убить ее и завершить работу Мастера?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Закрыть"
 
@@ -276,8 +298,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "отключен"
@@ -286,8 +308,8 @@ msgstr "отключен"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "включен"
@@ -300,53 +322,38 @@ msgstr "Интерфейс:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Мастер успешно настроил службы DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Завершился неудачей"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Перезапустите drakwizard, и попробуйте изменить некоторые параметры."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Вам необходимо изменить имя своего хоста."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Вам необходимо исправить имя своего домена. Для сервера DNS вы должны "
-"изменить имя домена, не равное localdomain или пустому значению. Имя хоста "
-"должно быть полностью определенным именем домена (FQDN, Fully Qualified "
-"Domain Name). Запустите drakconnect для его изменения."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Ведущий сервер DNS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Подчиненный сервер DNS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Добавить хост в DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Удалить хост из DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -354,11 +361,11 @@ msgstr ""
 "DNS (сервер доменных имен) - это служба, которая сопоставляет IP адрес "
 "машины с именем хоста в Интернете."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Мастер настройки ведущего DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -368,47 +375,47 @@ msgstr ""
 "предоставит локальную службу DNS для имен локальных компьютеров с "
 "нелокальными запросами, перенаправляемыми на внешние DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Что вы хотите сделать:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Сервер DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Вам не нужно вводить домен после имени)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP сервера:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Доменное имя NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Выберите хост, который вы хотите удалить из следующего списка."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Удалить хост из существующей конфигурации DNS."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Удалить хост:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Имя компьютера:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -418,11 +425,11 @@ msgstr ""
 "имен, а также будет работать в качестве резервного в случае, если ваш "
 "ведущий сервер недоступен."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP-адрес ведущего сервера DNS:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -430,11 +437,11 @@ msgstr ""
 "Переадресация выполняется только для тех запросов, для которых сервер не "
 "является аутентичным и не содержит ответа в своем кэше."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP вашего форвардера"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -442,15 +449,15 @@ msgstr ""
 "Если вам это надо и вы знаете IP своего форвардера, введите его IP-адрес, "
 "если вы не знаете, оставьте его пустым"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Внешний DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Добавить поисковый домен"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -458,7 +465,7 @@ msgstr ""
 "Доменное имя этого сервера добавляется автоматически и вам нет необходимости "
 "добавлять его здесь."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -470,27 +477,27 @@ msgstr ""
 "может быть заменен списком желаемого поискового домена с путем поиска, "
 "следующего за условием поиска"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Доменное имя для поиска по умолчанию:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Это недействительный IP-адрес вашего форвардера... Нажмите Далее для "
 "продолжения"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Это недействительный IP-адрес ведущего DNS... Нажмите Далее для продолжения"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Это недействительный IP-адрес... Нажмите Далее для продолжения"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -498,11 +505,11 @@ msgstr ""
 "Похоже, что этот хост уже есть в конфигурации вашей DNS... Нажмите Далее для "
 "продолжения"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -510,7 +517,7 @@ msgstr ""
 "Похоже, что этот отсутствует в конфигурации вашей DNS... Нажмите Далее для "
 "продолжения"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -518,72 +525,72 @@ msgstr ""
 "Похоже, что сервер DNS не был настроен при помощи мастера. Пожалуйста, "
 "запустите мастер DNS: Ведущий сервер DNS."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Похоже, что вы не являетесь ведущим сервером DNS, поэтому невозможно удалить/"
 "добавить хост."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Сейчас мастер построит конфигурацию вашего ведомого DNS"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "с этой конфигурацией:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Клиент с этой идентификацией будет добавлен в вашу DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Имя компьютера:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP-адрес компьютера:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Клиент с этой идентификацией будет удален из вашей DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Сервер DNS будет настроен со следующей конфигурацией"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Имя хоста:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Доменное имя:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Мастер успешно добавил хост в вашу DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Мастер успешно удалил хост из вашей DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Мастер успешно настроил службу DNS вашего сервера."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Перезапустите drakwizard и попробуйте изменить некоторые параметры."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 "Ваша система настраивается для работы в качестве ведущего сервера DNS..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr ""
 "Ваша система настраивается для работы в качестве подчиненного сервера DNS..."
@@ -612,7 +619,7 @@ msgstr "Почтовый сервер"
 msgid "FTP server"
 msgstr "Сервер FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Сервер Samba"
 
@@ -636,7 +643,7 @@ msgstr "Сервер NIS с картой autofs"
 msgid "Mandrakelinux Install server"
 msgstr "Сервер установки Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Сервер Kolab"
 
@@ -661,7 +668,7 @@ msgstr ""
 "%s не установлен\n"
 "Нажмите Далее для установки или Отмена для выхода"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Установка завершилась неудачей"
 
@@ -907,15 +914,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Мастер настройки Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Вам необходимо исправить имя своего домена, не равное localdomain или "
-"пустому значению. Пожалуйста, запустите drakconnect для его изменения."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -928,7 +927,7 @@ msgstr ""
 "предоставлением пользователям почтовых ящиков, а также контакты и доступ к "
 "почте через POP3 и IMAP4 (rev1)."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -938,39 +937,39 @@ msgstr ""
 "Proftpd, LDAP, Cyrus, Postfix, Imap, Saslauth. Мастер сделает резервную "
 "копию всех ваших конфигурационных файлов для этих служб."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Добро пожаловать в мастер конфигурации сервера Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Введите пароль для учетной записи менеджера сервера Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Пароль не совпадает или отсутствует. Пожалуйста, исправьте."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Пароль (еще раз):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Сейчас мастер настроит сервер Kolab с этими параметрами"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Имя хоста:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Почтовый домен:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -978,46 +977,35 @@ msgstr ""
 "Сервер kolab теперь настроен и запущен. Войдите в систему как 'manager' с "
 "введенным ранее паролем по адресу https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Выполняется установка"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "В вашу систему устанавливается сервер Kolab..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Настраивается сервер Kolab для вашей системы..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Мастер LDAP"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Вам необходимо исправить имя своего домена. Для сервера LDAP вы должны "
-"изменить имя домена, не равное localdomain или пустому значению. Имя хоста "
-"должно быть полностью определенным именем домена (FQDN, Fully Qualified "
-"Domain Name). Запустите drakconnect для его изменения."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Показать конфигурацию LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Добавить пользователя в сервер LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Удалить конфигурацию LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1025,193 +1013,191 @@ msgstr ""
 "Это облегчённый протокол доступа к службам каталогов - особых служб "
 "каталогов на основе X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP означает Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Мастер настройки LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Вы должны сначала настроить сервер LDAP."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ваш выбор:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Удалить конфигурацию"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Существующая база сохраняется в /root/LDAP-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Добавление пользователя LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Пользователь создан в: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Пользователь создан в: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Первое имя:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Логин:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Вы должны ввести действительное первое имя."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Вы должны ввести действительное имя."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Вы должны ввести действительное имя пользователя."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Пароль пользователя LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "Пароли должны совпадать"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Пароль (еще раз):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Вы должны ввести пароль для LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Администратор"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Администратор - это привилегированный пользователь с неограниченным доступом "
 "к базе данных LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Администратор,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Настраивается сервер LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Доменное имя:"
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Доменное имя:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Администратор LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Дерево каталога LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 "Для определения дерева каталога LDAP используется присваивание имён DNS"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Дерево каталога LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Администратор LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Пароль LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Пароль LDAP (еще раз):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Вы должны ввести действительное дерево каталога LDAP."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Подтверждение создания пользователя"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Первое имя:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Имя пользователя:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Создать в:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Информация для подтверждения создания сервера LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Контейнер пользователей:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Мастер успешно настроил LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Пользователь успешно добавлен"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Ошибка добавления пользователя в базу данных LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Сервер уже настроен"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Вы уже настроили свой сервер LDAP"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "Сбой %s"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Ошибка!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Невозможно подключиться к %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Мастер новостей"
@@ -1350,13 +1336,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Каталог:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Введенный вами путь не существует."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Управление доступом"
 
@@ -1410,29 +1396,21 @@ msgstr "Сетевая маска:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Мастер успешно настроил ваш сервер NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Вам необходимо исправить имя своего домена NIS. Для сервера NIS вам нужно "
-"установить имя домена NIS, не равное localdomain или пустому значению."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Сервер NIS c картой autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Клиент NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Установка сервера NIS с картой autofs, файлами auto.home и auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1440,28 +1418,28 @@ msgstr ""
 "Пользователи могут автоматически монтировать свои домашние каталоги при "
 "входе в компьютерную сеть клиентов NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Чего изволите?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Настроить компьютер в качестве клиента NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Вам просто нужно ввести nisdomain и nisserver."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Сервер NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Домен NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1472,7 +1450,7 @@ msgstr ""
 "пользователям NIS автоматически монтировать их домашние каталоги на "
 "клиентских машинах NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1480,42 +1458,42 @@ msgstr ""
 "Домашний каталог NIS: домашний каталог для пользователей сервера NIS. Этот "
 "каталог будет экспортирован через сервер NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Домен NIS: используемый домен NIS (в общем случае совпадает с доменным "
 "именем вашего DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Сервер NIS: имя вашего компьютера."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Домашний каталог NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Доменное имя NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Мастер установит сервер NIS с картой autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Каталог NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Доменное имя NIS: имя домена NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS сервер: имя хоста NIS сервера."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1523,40 +1501,40 @@ msgstr ""
 "Демон YPBIND находит сервер с NIS доменами и поддерживает связанную "
 "информацию NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Ошибка: должен быть каталог."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Ошибка: nisdomainname не может быть 'none' или 'localdomain'"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Пожалуйста, настройте это."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Мастер успешно настроил вашу машину в качестве клиента NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 "Мастер успешно настроил вашу машину в качестве сервера NIS с картой autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 "Ваша система настраивается для работы в качестве сервера NIS с картой "
 "Autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS с картой autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Ваша система настраивается для работы в качестве клиента NIS ..."
 
@@ -1928,7 +1906,7 @@ msgstr ""
 "Мастер собрал следующие параметры, необходимые для настройки вашего прокси:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1960,6 +1938,14 @@ msgstr "Прокси Squid"
 msgid "PXE Wizard"
 msgstr "Мастер 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."
+msgstr ""
+"Вам необходимо исправить имя своего домена, не равное localdomain или "
+"пустому значению. Пожалуйста, запустите drakconnect для его изменения."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Настроить сервер PXE"
@@ -2319,24 +2305,24 @@ msgstr "Настраивается сервер PXE на вашей систем
 msgid "PXE server"
 msgstr "Сервер PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Мастер Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s не существует."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Все - без ограничения доступа"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Мои правила - Спрашивать меня о разрешенных и запрещенных хостах"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2345,56 +2331,56 @@ msgstr ""
 "и сервера печати для рабочих станций, работающих не под управлением системы "
 "Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Мастер настройки Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Этот мастер поможет вам настроить службы Samba вашего сервера."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 "Samba необходимо знать рабочую группу Windows, которую она будет обслуживать."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Рабочая группа"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Рабочая группа:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Неверная рабочая группа"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Баннер сервера."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "Баннер представляет собой описание сервера для рабочих станций Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Баннер:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Неверный баннер сервера"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Уровень доступа:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2402,7 +2388,7 @@ msgstr ""
 "* Пример 1: разрешить все IP-адреса из 150.203.*.*; за исключением одного\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2410,7 +2396,7 @@ msgstr ""
 "* Пример 2: разрешить хосты, соответствующие заданной сети/сетевой_маске\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2418,7 +2404,7 @@ msgstr ""
 "* Пример 3: разрешить группу хостов\n"
 "hosts allow = station2, server3"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2430,25 +2416,25 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Помните, что для доступа еще требуются соответствующие пароли "
 "пользовательского уровня."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Разрешенные хосты:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Запрещенные хосты:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Включенные службы Samba"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2458,19 +2444,19 @@ msgstr ""
 "станций Windows, а также может обеспечить общий доступ к принтерам, "
 "подключенным к вашему серверу."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Включить область общего доступа к файлам"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Включить сервер общего доступа к принтерам"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Сделать домашние каталоги доступными для их владельцев"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2478,28 +2464,28 @@ msgstr ""
 "Вы выбрали разрешить пользователям доступ к своим домашним каталогам при "
 "помощи samba, но для установки пароля вы/они должны использовать smbpasswd."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Общий каталог:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Введите путь к каталогу, к которому вы хотите открыть общий доступ."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Создать общий каталог, если он не существует"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Не удалось создать каталог."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Разрешения файлов"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2509,61 +2495,61 @@ msgstr ""
 "'@'), например:\n"
 "root, fred, @users, @wheel для каждого типа разрешений."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Список чтения:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Список записи:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Выберите принтеры, которые вы хотите сделать доступными для известных "
 "пользователей"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Включить все принтеры"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Настраивается Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Мастер собрал следующие параметры для настройки Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Баннер сервера:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Общий доступ к файлам:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Сервер печати:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Домашние каталоги:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Принтеры:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Мастер успешно настроил ваш сервер Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Настраивается ваш сервер Samba..."
 
@@ -2807,3 +2793,26 @@ msgstr "Сервер Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Ваша система настраивается для работы в качестве сервера Apache..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Вам необходимо изменить имя своего хоста."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Вам необходимо исправить имя своего домена. Для сервера LDAP вы должны "
+#~ "изменить имя домена, не равное localdomain или пустому значению. Имя "
+#~ "хоста должно быть полностью определенным именем домена (FQDN, Fully "
+#~ "Qualified Domain Name). Запустите drakconnect для его изменения."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Невозможно подключиться к %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Вам необходимо исправить имя своего домена NIS. Для сервера NIS вам нужно "
+#~ "установить имя домена NIS, не равное localdomain или пустому значению."
diff --git a/po/sk.po b/po/sk.po
index fab38e05..14880d6e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-sk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-13 15:03+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <sk@li.org>\n"
@@ -23,31 +23,31 @@ msgstr "sprievodca konfiguráciou"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Varovanie:"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Chyba."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gratulujem"
 
@@ -88,17 +88,17 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(nie je potrebné zadávať doménu)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identifikácia klienta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "Uvedomte si, že IP adresa a meno počítača musia byť v sieti jedinečné."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -108,33 +108,33 @@ msgstr ""
 "Každý počítač v sieti musí mať jedinečnú IP adresu v obvyklom tvare "
 "oddelenom bodkami."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Meno počítača:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP adresa počítača:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Upozornenie"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Máte nastavené dhcp, server nemusí fungovať s touto konfiguráciou."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Chyba"
@@ -179,12 +179,32 @@ msgstr "IP klienta:"
 msgid "The wizard successfully added the client."
 msgstr "Sprievodca úspešne pridal klienta."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Potrebujete zmeniť vaše doméhové meno. Pre DNS server potrebujete správne "
+"doménové meno, nie localdomain alebo žiadne. Spustite drakconnect pre jeho "
+"nastavenie."
+
+#: ../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."
+msgstr ""
+"Potrebujete zmeniť vaše doméhové meno. Pre DNS server potrebujete správne "
+"doménové meno, nie localdomain alebo žiadne. Spustite drakconnect pre jeho "
+"nastavenie."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Príkaz stále beží. Prajete si ho zabiť a ukončiť Sprievodcu?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Zatvoriť"
 
@@ -275,8 +295,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "zakázané"
@@ -285,8 +305,8 @@ msgstr "zakázané"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "povolené"
@@ -299,52 +319,38 @@ msgstr "Rozhranie:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Sprievodca úspešne nakonfiguroval služby DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Zlyhalo"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Znovuspustiť drakwizard a skúsiť zmeniť niektoré nastavenia."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Je potrebné zmeniť vaše meno počítača."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Potrebujete zmeniť vaše doméhové meno. Pre DNS server potrebujete správne "
-"doménové meno, nie localdomain alebo žiadne. Spustite drakconnect pre jeho "
-"nastavenie."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Master DNS server"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Slave DNS server"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Pridať hosta v DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Odstrániť adresu z DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -352,11 +358,11 @@ msgstr ""
 "DNS (server doménových mien) je služba ktorá spája počítač s jeho "
 "internetovým menom."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Sprievodca konfiguráciou master DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -366,47 +372,47 @@ msgstr ""
 "konfigurácia poskytne lokálne DNS služby pre lokálne mená počítačov, externé "
 "požiadavky budú posunuté na vonkajší DNS server."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Čo si želáte spraviť:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS server"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(nie je potrebné zadávať doménu za menom)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP servera:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS doménové meno:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Vyberte si meno, ktoré si želáte odstrániť z nasledovného zoznamu."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Odstrániť meno v existujúcej DNS konfigurácii."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Odstrániť adresu:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Meno počítača:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -415,11 +421,11 @@ msgstr ""
 "Slave doménový server môže plniť byť v prípade nedostupnosti primárneho "
 "servera jeho zálohou ktorá ho zastupuje počas doby výpadku."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP adresa master DNS servera:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -427,11 +433,11 @@ msgstr ""
 "Forwardovanie sa použije iba pre tie požiadavky ktoré nie sú autoritatívne a "
 "nenachádzajú sa vo vyrovnávacej pamäti."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP adresa pre forwarder"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -439,15 +445,15 @@ msgstr ""
 "Ak požadujete túto funkcionalitu a viete IP adresu vášho forwardera - "
 "zadajte ju, ak neviete nechajte prázdne"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Externé DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Pridať doménu na vyhľadávanie"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -455,7 +461,7 @@ msgstr ""
 "Doménové meno tohto server je automaticky pridané a nie je potrebné ho tu "
 "pridávať."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -466,28 +472,28 @@ msgstr ""
 "obsahuje lokálnu doménu. Toto môže byť zmenené zadaním zoznamu žiadaných "
 "domén ktorám predchádza kľúčové slovo search"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Predvolená doména na vyhľadávanie:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Toto nie je korektná IP adresa pre forwarder... kliknite na Ďalej pre "
 "pokračovanie"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Toto nie je korektná IP adresa pre master DNS... kliknite na Ďalej pre "
 "pokračovanie"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Toto nie je korektná IP adresa... kliknite na Ďalej pre pokračovanie"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -495,11 +501,11 @@ msgstr ""
 "Zdá sa, že tento názov už je vo vašej konfigurácii DNS... kliknite na "
 "Pokračovať pre pokračovanie"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -507,7 +513,7 @@ msgstr ""
 "Zdá sa, že nie je v súčastnosti súčasťou vašej DNS konfigurácie... kliknite "
 "na Ďalej pre pokračovanie"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -515,71 +521,71 @@ msgstr ""
 "Zdá sa, že nebol sprievodcom nastavený žiaden DNS server. Spustite prosím "
 "DNS sprievodcu: Master DNS server."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Zdá sa, že nie toto nie je master DNS server ale slave. Preto nie je možné "
 "pridať/odstrániť meno."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Sprievodca teraz vytvorí konfiguráciu pre slave DNS"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "s touto konfiguráciou:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Klient s nasledovnou identiikáciou bol pridaný do vášho DNS."
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Meno počítača:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP adresa počítača:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Klient s nasledovnou identifikáciou bol odstránený z DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS server bol nastavený podľa nasledovnej konfigurácie"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Meno servera:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Meno domény:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Sprievodca úspešne pridal hosta do vášho DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Sprievodca úspešne odstránil meno z vášho DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Sprievodca úspešne nakonfiguroval DNS službu na vašom serveri."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Spustite znova drakwizard a skúste zmeniť niektoré nastavenia."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurovať váš sysém ako master DNS server ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurovať váš systém ako slave DNS server ..."
 
@@ -607,7 +613,7 @@ msgstr "Poštový systém"
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba server"
 
@@ -631,7 +637,7 @@ msgstr "Autofs mapa NIS servera"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux inštalačný server"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -656,7 +662,7 @@ msgstr ""
 "%s nie je nainštalovaný\n"
 "Kliknite na \"Ďalej\" pre inštaláciu, alebo \"Zruš\" pre ukončenie"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Inštalácia zlyhala"
 
@@ -898,15 +904,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Sprievodca konfiguráciou kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Je potrebné zmeniť doménové meno, nesmie byť localdomain alebo žiadne. "
-"Spustite prosím drakconnect pre jeho nastavenie."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -918,7 +916,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:59
+#: ../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 "
@@ -928,40 +926,40 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Vitajte v Sprievodcovi nastavením Kolab Groupware servera."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Vložte heslo pre manažéra konta na serveri Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Heslá sú rôzne alebo žiadne, prosím opravte ich."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Heslo (znova):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Meno servera:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "E-mailová doména:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -969,45 +967,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Inštalácia beží"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurácia Kolab servera na vašom systéme..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Sprievodca konfiguráciou samby"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Potrebujete zmeniť vaše doméhové meno. Pre LDAP server potrebujete správne "
-"doménové meno, nie localdomain alebo žiadne. Spustite drakconnect pre jeho "
-"nastavenie."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Ukázať konfiguráciu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Pridať používateľa do servera LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Vymazať konfiguráciu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1015,192 +1003,190 @@ msgstr ""
 "je to ľahkotonážny protokol umož ujúci adresárové služby, či špecifické "
 "X.500 adresárové služby"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP znamená Lightweight Directory Acces Protocol - ľahkotonážny adresárový "
 "protokol prístupu. "
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Sprievodca konfigáciou LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Musíte najprv nastaviť LDAPserver"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Vaša voľba:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Zmazať konfiguráciu: "
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Ukladanie existujúceho základu do /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP pridávanie používateľa"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Používateľ vytvorený v: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Používateľ vytvorený v: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Krstné meno:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Meno: "
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Používateľské meno:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Musíte vložiť skutočné krstné meno."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Musíte vložiť skutočné meno."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Musíte vložit skutočné meno používateľa."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP používateľské heslo"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "heslá musia byť rovnaké"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Heslo (znova):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Musíte vložiť heslo pre LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Zadané heslá nie sú rovnaké"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "Administrátor je superužívateľ s prístupom do databázy LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administrator,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Konfigurácia LDAP servera"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Meno domény: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Meno domény: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP Administrator"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP adresárový strom"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "Pridelovanie DNS záznamov používané pre definíciu LDAP adresára"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP adresár:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP Administrator:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP Heslo:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP Heslo (znova):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Musíte vložiť skutočný LDAP adresárový strom. "
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Potvrdenie vytvorenia používateľa"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Krstné meno:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Používateľské meno:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Vytvoriť v:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Potvrdzovacia informácia pre vytvorenie LDAP používateľa"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Používateľský kontajnér:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Sprievodca úspešne nakonfiguroval LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Používateľ bol úspešne pridaný"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Pri pridávaní používateľa do LDAP databázy nastala chyba"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Server už bol nakonfigurovaný"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Už ste nastavili váš LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s zlyhalo"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Chyba!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Nebolo možné pripojiť k %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Sprievodca nastavením news servera"
@@ -1337,13 +1323,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Adresár:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Cesta, ktorú ste zadali neexistuje."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontrola prístupu"
 
@@ -1397,29 +1383,21 @@ msgstr "Sieťová maska:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Sprievodca úspešne nakonfiguroval váš NFS server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Je potrebné zmeniť doménové meno. NIS server vyžaduje korektné NIS doménové "
-"meno, nie localdomain alebo žiadne."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS server s autofs mapovaním"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Nastavenie NIS servera s autofs mapovaním, auto.home a auto.master súborov"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1427,28 +1405,28 @@ msgstr ""
 "Klient dokáže automaticky pripojiť tento domovský adresár zo servera ak je "
 "prihlásený ako klient NIS siete."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Ćo si želáte vykonať?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Konfigurovať počítač ako NIS klienta"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Mali by ste zadať nis doménu a nis server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS doména:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1459,7 +1437,7 @@ msgstr ""
 "pri automatickom pripájaní domovského adresára k počítači ktorý je NIS "
 "klientom."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1467,40 +1445,40 @@ msgstr ""
 "Domovský adresár NIS: domovský adresár pre používateľov na NIS servery. "
 "Tento adresár by mal byť exportovaný cez NFS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "NIS doména: NIS doména (obyčajne rovnaká ako vaša DNS doména)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS server: meno vášho počítača."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Domovský NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS doménové meno:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Sprievodca teraz nastaví váš NIS server s autofs mapovaním"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS doména:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS doménové meno: meno NIS domény."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS server: doménové meno NIS servera."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1508,24 +1486,24 @@ msgstr ""
 "YPBIND démon vyhľadáva servre pre NIS domény a spravuje informácie o "
 "pripojení pre NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Chyba, mal by to byť adresár."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 "Chyba, nisdoména by mala byť korektná, nie 'žiadna' alebo 'localdomain'"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Upravte prosím."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Sprievodca úspešne nakonfiguroval váš systém ako klienta NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1533,15 +1511,15 @@ msgstr ""
 "Sprievodca úspešne nakonfiguroval váš systém aby používal NIS server s "
 "autofs mapovaním."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurácia vášho systému ako NIS server s Autofs mapovaním..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS s autofs mapou"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Nastaviť váš systém ako NIS klienta ..."
 
@@ -1910,7 +1888,7 @@ msgstr ""
 "vašej proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1942,6 +1920,14 @@ msgstr "Squid proxy"
 msgid "PXE Wizard"
 msgstr "PXE sprievodca"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Je potrebné zmeniť doménové meno, nesmie byť localdomain alebo žiadne. "
+"Spustite prosím drakconnect pre jeho nastavenie."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Nastaviť PXE server"
@@ -2298,24 +2284,24 @@ msgstr "Konfigurácia PXE servera na vašom systéme..."
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Sprievodca konfiguráciou samby"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s neexistuje"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Všetci - žiadne prístupové reštrikcie"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moje pravidlá - povolený a zakázany hostitelia"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2323,57 +2309,57 @@ msgstr ""
 "Samba umožňuje vášmu serveru poskytovať služby súborového a tlačového "
 "servera pre neLinuxové pracovné stanice."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Sprievodca konfiguráciou samby"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Tento sprievodca vám pomôže nakonfigurovať službu Samba na vašom serveri."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 "Samba potrebuje vedieť meno Windows pracovnej skupiny ktorú bude obsluhovať."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Skupina"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Pracovná skupina:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Zlá skupina"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Banner servera."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "Banner je možnosť ako tento server zviditeľniť na pracovnej stanici Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Banner servera nie je správne"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Prístupova úroveň:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2381,7 +2367,7 @@ msgstr ""
 "* Príklad 1: povoliť všetky IP z 150.203.*.*; okrem jednej\\nhosts allow = "
 "150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2389,14 +2375,14 @@ msgstr ""
 "* Príklad 2: povoliť hostiteľov so súhlasiacou sieťou/sieťovou maskou"
 "\\nhosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 "* Príklad 3: povoliť niekoľko hostiteľov\\nhosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2406,23 +2392,23 @@ msgstr ""
 "* Príklad 4: povoliť len hostiteľov len z NIS skupiny \"foonet\",  ale zakáž "
 "prístup z jedného z nich\\nhosts allow = @foonet\\nhosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Pamätajte že k prístupu sú stále potrebné používateľske heslá."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Povolení hostitelia:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Zakázaní hostitelia:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Povoliť samba služby"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2431,19 +2417,19 @@ msgstr ""
 "Samba môže poskytovať zdieľanú oblasť pre vaše Windows pracovné stanice a "
 "tiež môže poskytovať zdieľanie tlačiarní pripojených k tomuto serveru."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Povoliť priestor pre zdieľanie súborov"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Povoliť server pre zdieľanie tlačiarne"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Sprístupniť domovské adresáre ich vlastníkom"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2451,28 +2437,28 @@ msgstr ""
 "Nastavili ste prístup pre používateľov k ich domovským adresárom cez sambu, "
 "ale je potrebné aby si nastavili/ste im nastavili heslá."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Zdieľaný adresár:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Napíšte cestu k adresáru, ktorý chcete ponúknuť na zdieľanie."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Vytvorí zdieľaný adresár, ak neexistuje"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Nepodarilo sa vytvoriť adresár."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Práva súborov"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2481,61 +2467,61 @@ msgstr ""
 "Zoznam používateľov a skupín oddelený čiarkou (skupiny musia začínať znakom "
 "'@'), napríklad:\\nroot, fred, @users, @wheel pre každý typ práv."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "zoznam pre čítanie:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "zoznam pre zápis:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Vyberte si tlačiareň ktorú chcete poskytovať používateľom"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Povoliť všetky tlačiarne"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Konfigurácia samby"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Tento sprievodca zozbieral nasledovné parametre potrebné pre Samba "
 "konfiguráciu."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Banner servera:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Zdieľanie súborov:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Tlačový server:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Domovský adresár:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Tlačiarne:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Sprievodca úspešne nakonfiguroval váš Samba server."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Konfigurovať váš Samba server..."
 
@@ -2774,3 +2760,25 @@ msgstr "Apache server"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavovanie vášho systému ako Apache server ..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Je potrebné zmeniť vaše meno počítača."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Potrebujete zmeniť vaše doméhové meno. Pre LDAP server potrebujete "
+#~ "správne doménové meno, nie localdomain alebo žiadne. Spustite drakconnect "
+#~ "pre jeho nastavenie."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Nebolo možné pripojiť k %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Je potrebné zmeniť doménové meno. NIS server vyžaduje korektné NIS "
+#~ "doménové meno, nie localdomain alebo žiadne."
diff --git a/po/sl.po b/po/sl.po
index 51058a2b..2a565dd5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-02-05 12:23+0100\n"
 "Last-Translator: Daniel Žalar <danizmax@email.si>\n"
 "Language-Team: Slovenian <prevajanje@mandrakeprinas.org>\n"
@@ -24,31 +24,31 @@ msgstr "Nastavitveni čarovnik"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Opozorilo."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Napaka."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Čestitke"
 
@@ -89,18 +89,18 @@ msgstr "Čarovnik vam bo pomagal dodati nov odjemalec v lokalni DNS."
 msgid "(you don't need to type the domain after the name)"
 msgstr "(domena za imenom ni potrebna)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Ime odjemalca:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "Opomba: IP naslov in ime odjemalca morata biti edinstvena v omrežju."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -109,22 +109,22 @@ msgstr ""
 "Odjemalec bo na omrežju prepoznan z imenom, kot imeodjemalca.podjetje.net. "
 "Vsak računalnik mora imeti edinstven IP naslov, v značilni obliki."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Ime računalnika:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP naslov računalnika:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Opozorilo"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -133,12 +133,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Napaka"
@@ -181,12 +181,25 @@ msgstr "IP naslov odjemalca:"
 msgid "The wizard successfully added the client."
 msgstr "Čarovnik je uspešno dodal odjemalec."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Zapri"
 
@@ -277,8 +290,8 @@ msgstr "Čarovnik je zbral podatke, potrebne za nastavitev vaših DHCP servisov:
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "onemogoči"
@@ -287,8 +300,8 @@ msgstr "onemogoči"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "Omogočeno"
@@ -302,52 +315,41 @@ msgstr "Vmesnik:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Čarovnik je uspešno nastavil servise DHCP vašega strežnika."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "Omogočeno"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Podatkovni strežnik"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Strežnik NFS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -355,12 +357,12 @@ msgstr ""
 "DNS (Domain Name Server) je servis, ki pretvarja IP naslove računalnikov, v "
 "gostiteljska imena."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Čarovnik za nastavitev DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -370,91 +372,91 @@ msgstr ""
 "bo ponujala lokalne servise DNS za lokalne imena računalnikov, z nelokalnimi "
 "zahtevami, posredovane zunanjim DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Kaj želite narediti:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS strežnik"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(domena za imenom ni potrebna)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Strežnikov IP:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Zamaskirano ime domene:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "Zavrni gostiteljska imena:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Ime računalnika:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "Zunanji protokolni konverter (gateway)"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -462,117 +464,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Naslov ni veljaven... kliknite Naprej za nadaljevanje"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Naslov ni veljaven... kliknite Naprej za nadaljevanje"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Naslov ni veljaven... kliknite Naprej za nadaljevanje"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Napaka:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "s to nastavitvijo."
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Ime računalnika:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP naslov strežnika:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Ime strežnika:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Čarovnik je uspešno dodal odjemalec."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Čarovnik je uspešno nastavil servise DNS vašega strežnika."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Čarovnik je uspešno nastavil servise DNS vašega strežnika."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Nastavljam strežnik DNS"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Nastavljam strežnik DNS"
@@ -602,7 +604,7 @@ msgstr "Poštni strežnik"
 msgid "FTP server"
 msgstr "FTP strežnik"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba strežnik"
 
@@ -630,7 +632,7 @@ msgstr ""
 msgid "Mandrakelinux Install server"
 msgstr "Omogoči vse tiskalnike"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Samba strežnik"
@@ -657,7 +659,7 @@ msgstr ""
 "%s ni nameščen\n"
 "Kliknite \"Naprej\" za namestitev ali \"Prekliči\" za izhod"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Instalacija ni uspela"
 
@@ -898,13 +900,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Samba Nastavitveni Čarovnik"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -912,307 +908,296 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Čarovnik za nastavitev spletnega strežnika"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Geslo:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Čarovnik je uspešno nastavil poštne servise vašega strežnika."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Ime strežnika:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Instalacijski imenik:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Nastavljam PXE strežnik na vašem sistemu..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Nastavljam PXE strežnik na vašem sistemu..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap strežnik"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Čarovnik za nastavitev DHCP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Čarovnik za nastavitev DHCP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Čarovnik za nastavitev DHCP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Nastavi PXE strežnik."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Nastavitev časovnega strežnika shranjena"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Ime:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Geslo"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Geslo:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Gesli se ne ujemata."
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Nastavljam Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Zamaskirano ime domene:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Zamaskirano ime domene:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Uporabniški imenik:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Uporabniški imenik:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Geslo:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Geslo:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Uporabniški imenik:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Ime:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Nastavljam strežnik DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Uporabniško ime:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Čarovnik je uspešno nastavil strežnik NFS"
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Uspešno sem dodal podatke"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Čarovnik je uspešno nastavil strežnik samba"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Omogočeno"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Napaka"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Čarovnik za novice"
@@ -1353,13 +1338,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Imenik:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Vpisana pot ne obstaja."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Nadzor dostopa"
 
@@ -1412,145 +1397,139 @@ msgstr "Maska:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Čarovnik je uspešno nastavil vaš NFS Strežnik"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "Čarovnik za odjemalca DNS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Kaj želite narediti?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "Strežnik NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Domači imenik:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Zamaskirano ime domene:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Čarovnik je uspešno nastavil strežnik samba"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "Nis imenik:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Zamaskirano ime domene:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Napaka, biti mora imenik"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Čarovnik je uspešno nastavil strežnik samba"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Čarovnik je uspešno nastavil strežnik samba"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Nastavljam strežnik DNS"
@@ -1924,7 +1903,7 @@ msgstr ""
 "Čarovnik je zbral podatke, potrebne za nastavitev vašega strežnika proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1959,6 +1938,12 @@ msgstr "Čarovnik za Squid"
 msgid "PXE Wizard"
 msgstr "PXE čarovnik"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 msgid "Set PXE server"
 msgstr ""
@@ -2286,25 +2271,25 @@ msgstr "Nastavljam PXE strežnik na vašem sistemu..."
 msgid "PXE server"
 msgstr "Strežnik FTP"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba strežnik"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s ne obstaja."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Vse - Ni omejitev"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moja pravila - Vprašaj me po dovoljenih in nedovoljenih gostiteljih"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2313,36 +2298,36 @@ msgstr ""
 "strežnik, za druge računalnike, na katerih ne tečejo Linux operacijski "
 "sistemi."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba Nastavitveni Čarovnik"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Čarovnik vam bo pomagal nastaviti servise za strežnik samba."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba potrebuje ime omrežne skupine (Workgroup)."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Omrežna skupina"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Omrežna skupina (Workgroup):"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Omrežna skupina je napačna"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Opis strežnika samba."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2350,19 +2335,19 @@ msgstr ""
 "Opis strežnika samba je opis, ki je viden v računalnikih z operacijskim "
 "sistemom Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Opis:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Opis strežnika samba je nepravilen"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Stopnja dostopa:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2371,7 +2356,7 @@ msgstr ""
 "* Primer 1: dovoli vse IP naslove v 150.203.*.*; razen enega\\nhosts allow = "
 "150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2380,7 +2365,7 @@ msgstr ""
 "* Primer 2: dovoli gostiteljskim imenom, ki se ujemajo z podanim IP/masko"
 "\\nhosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
@@ -2388,7 +2373,7 @@ msgid ""
 msgstr ""
 "* Primer 3: dovoli nekaj gostiteljevj\\nhosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2400,23 +2385,23 @@ msgstr ""
 "ampak zavrni dostop od določenega gostiteljskega imena\\nhosts allow = "
 "@foonet\\nhosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Opozorilo: Za dostop je potrebno ustrezno uporabniško geslo."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Dovoli gostiteljska imena:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Zavrni gostiteljska imena:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Omogočeni servisi sambe"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2425,20 +2410,20 @@ msgstr ""
 "Samba lahko ponudi skupno rabo tiskalnika in skupni direktorij za skupno "
 "rabo."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Omogoči območje skupne rabe"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 #, fuzzy
 msgid "Enable server Printer Sharing"
 msgstr "Omogoči območje skupne rabe"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Omogoči domačim imenikom dostop njihovim lastnikom"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2446,28 +2431,28 @@ msgstr ""
 "Izbrali ste možnost, ki dovoljuje uporabnikom dostop, do svojih domačih "
 "imenikov preko sambe, vendar morajo uporabiti smbpasswd za nastavitev gesla."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Souporaben imenik:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Vpišite imenik, katerega bi radi imeli v skupni rabi."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Dovoljenja datotek"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2477,63 +2462,63 @@ msgstr ""
 "Vpišite uporabnike ali skupino ločeno s piko (skupine morajo stati za \\'@"
 "\\') naprimer: \\nroot, peter, @uporabniki, @ za vsako dovoljenje."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Seznam uporabnikov z dovoljenjem za branje:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Seznam uporabnikov z dovoljenjem za pisanje:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 #, fuzzy
 msgid "Enable all printers"
 msgstr "Omogočeni servisi sambe"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Nastavljam Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Čarovnik je zbral podatke, potrebne za nastavitev sambe"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Opis strežnika samba:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Datotečna souporaba:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 #, fuzzy
 msgid "Print server:"
 msgstr "Strežnik FTP"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Domov:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 #, fuzzy
 msgid "Printers:"
 msgstr "Seznam uporabnikov z dovoljenjem za pisanje:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Čarovnik je uspešno nastavil strežnik samba"
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Nastavljam Sambo"
@@ -2779,6 +2764,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Nastavljam strežnik DNS"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Uporabniško ime:"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Nastavljam strežnik DHCP"
 
diff --git a/po/sq.po b/po/sq.po
index 2234be66..e428936f 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drackwizard-sq\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2002-03-29 19:23+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -23,32 +23,32 @@ msgstr "Asistenti Konfigurues"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "Kujdes"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Gabim."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Urime"
 
@@ -92,11 +92,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(ju nuk keni nevojë të futni pronën mbasë emrit)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identifikimi i klientit:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -105,7 +105,7 @@ msgstr ""
 "Shënoni se numri i dhënë për IP dhe emri i klientit duhet të jenë të vetëm "
 "në rrjet."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -115,22 +115,22 @@ msgstr ""
 "emërklienti.kompani.net. Secila makinë në rrjet duhet të posedoj një adresë "
 "IP (vetiake) në sitaksë të caktuar me pika shtypëse."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Emri i makinës:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Adresa IP e makinës:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Kujdes"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -140,12 +140,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
@@ -191,12 +191,25 @@ msgstr "Klient IP:"
 msgid "The wizard successfully added the client."
 msgstr "Asistenti e ka shtuar një klient me sukses."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Mbylle"
 
@@ -293,8 +306,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "jo-aktiv"
@@ -303,8 +316,8 @@ msgstr "jo-aktiv"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "aktiv"
@@ -319,53 +332,42 @@ msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 "Asistenti i ka konfiguruar me sukses shërbimet e DHCP në serverin tuaj."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "aktiv"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "Ftues të pa autorizuar:"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -373,12 +375,12 @@ msgstr ""
 "DNS (Pronë e Emrit të Serverit) është një shërbim i cili e vendos në "
 "korrespondecë një makinë me emër ftues të internetit."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Asistenti Konfigurues DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -389,93 +391,93 @@ msgstr ""
 "lokal, me rikthimin e kërkesave tjera e jo vetëm lokale, në drejtim të një "
 "DNS të jashtëm."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(ju nuk keni nevojë të futni pronën mbasë emrit)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Emri i Serverit:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Emri i pronës llogaritëse:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "Ftues të pa autorizuar:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Emri i Pronës Llogaritëse"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurimi i Serverit DNS"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "Kalimtare e jashtme"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -483,120 +485,120 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Kjo nuk është një adresë valide... Shtypni mbi tjetri për të vazhduar"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Kjo nuk është një adresë valide... Shtypni mbi tjetri për të vazhduar"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Kjo nuk është një adresë valide... Shtypni mbi tjetri për të vazhduar"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Gabim."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Asistenti DNS (konfigurimi)"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 #, fuzzy
 msgid "Computer name:"
 msgstr "Emri i Pronës Llogaritëse"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Adresa IP e Serverit:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Emri i Serverit:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Asistenti e ka shtuar një klient me sukses."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Asistenti e ka shtuar një klient me sukses."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Asistenti i ka konfigururuar me sukses shërbimet DNS në serverit tuaj."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurimi i Serverit DNS"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurimi i Serverit DNS"
@@ -629,7 +631,7 @@ msgstr "Emri i Serverit Mail:"
 msgid "FTP server"
 msgstr "Server FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Server i Bazës së të Dhënave"
@@ -659,7 +661,7 @@ msgstr "Server i Lajmeve"
 msgid "Mandrakelinux Install server"
 msgstr "Emri i Serverit Mail:"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Server i Bazës së të Dhënave"
@@ -686,7 +688,7 @@ msgstr ""
 "%s nuk është instaluar\n"
 "Kliko mbi \"Tjetri\" për ta instaluar apo mbi \"Anulo\" për ta braktisur"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "instalimi dështoi"
@@ -927,13 +929,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Asistent Konfigurues Samba"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -941,310 +937,299 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Asistenti Konfigurues për Server Web"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Parulla:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Parulla:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, 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:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Emri Ftues"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Repertori i përdoruesit:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Konfigurimi i Serverit FTP"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurimi i Serverit FTP"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Asistenti Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Asistenti Konfigurues"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Asistenti Konfigurues"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Asistenti Konfigurues"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Server i Bazës së të Dhënave"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Konfigurimi i Serverit të kohës është regjistruar"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Shtimi i përdoruesit"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "Emri i Ftuesit:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Emri i përdoruesit:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Shtimi i përdoruesit"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Parulla:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Parulla:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Parullat nuk përputhen"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Konfigurimi Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Emri i pronës llogaritëse:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Emri i pronës llogaritëse:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Repertori i përdoruesit:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Repertori i përdoruesit:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Parulla:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Parulla:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Repertori i përdoruesit:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Emri i Ftuesit:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Emri i përdoruesit:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Konfigurimi i Serverit DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Shtimi i përdoruesit"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Asistenti e ka konfiguruar me sukses serverin proxy."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj Samba."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "aktiv"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Gabim."
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Asistenti i Lajmeve"
@@ -1386,13 +1371,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Repertori:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Shtegun të cilin e keni futur nuk ekziston."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontrolues i Hyrjeve"
 
@@ -1447,148 +1432,142 @@ msgstr "Maskë e Rrjetit:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "Server i Lajmeve"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "Klient IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "Server NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Home:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Emri i pronës llogaritëse:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj Samba."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "Repertori i përdoruesit:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Emri i pronës llogaritëse:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Repertor i Shpërndar:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj Samba."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj Samba."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurimi i Serverit DNS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Server i Lajmeve"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurimi i Serverit DNS"
@@ -1966,7 +1945,7 @@ msgstr ""
 "proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2002,6 +1981,12 @@ msgstr "Asistenti Squid"
 msgid "PXE Wizard"
 msgstr "Asistenti FTP"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2328,25 +2313,25 @@ msgstr ""
 msgid "PXE server"
 msgstr "Server NFS"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Asistenti Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s nuk ekziston."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Gjithë - Asnjë hyrje e kyfizuar"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Rregullat e mija - Më pyet për mundësit dhe ftuesit e pa autorizuar"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2354,38 +2339,38 @@ msgstr ""
 "Samba mundëson serverin tuaj të funksionoj sikur server i skedareve dhe "
 "sikur stampues i posteve të klientav që nuk e përdorin Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Asistent Konfigurues Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Ky asistent do të ju ndihmojë në konfigurmin e shërbimeve Samba në Serverin "
 "tuaj."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba ka nevojë të njoh grupin punues të shërbuer nga Windows."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grupi Punues"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grupi Punues:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Grupi Punues është i pa saktë"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Banderola Server."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2393,19 +2378,19 @@ msgstr ""
 "Banderola është një përshkrim i serverit që i furnizon klientët samba në "
 "stacionet punuese Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banderolë:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Serveri Banderolë nuk është i sakt"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nivel i Hyrjeve:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2414,7 +2399,7 @@ msgstr ""
 "* Shembull 1: autorizon të gjitha adresat IP në, 150.203.*.*;  mirëpo vetëm "
 "njërën jo \\nhosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2423,7 +2408,7 @@ msgstr ""
 "* Shembull 2: autorizon ftuesit të cilët përmbajnë në një rrjet/maskuar"
 "\\nhosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
@@ -2432,7 +2417,7 @@ msgstr ""
 "* Shembull 3: autorizon një qift të ftuesve\\nhosts allow = lapland, "
 "arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2444,24 +2429,24 @@ msgstr ""
 "ndalon hyrjen e një ftuesi të veçant \\nhosts allow = @foonet\\nhosts deny = "
 "pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Shënim hyrjet kanë nevojë gjithnjë për përdorues të nivelit dhe një parullë."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Ftues të autorizuar:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Ftues të pa autorizuar:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Sërbimet Samba të Aktivizuara"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2471,19 +2456,19 @@ msgstr ""
 "Windows në rrjetin tuaj lokal, njashtu edhe shpërndarjenë e stampuesve të "
 "lidhur në serverin tuaj."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Aktivizoje hapësirën publike shkëmbuese"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Aktivizimi i Shpërndarjes së Stampuesve"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Mundëson hyrjet në repertorin personel të pronarve përkatës"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2491,28 +2476,28 @@ msgstr ""
 "Ju keni zgjedhur lejimin e hyrjeve në repertorët personel via samba, mirëpo "
 "ju duhet të përdorni smbpasswd, për ta regjistruar një parullë samba."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Repertor i Shpërndar:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Futni shtegun e repertorit që dëshironi ta shpërndani."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Drejtësia mbi skedaret"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2523,62 +2508,62 @@ msgstr ""
 "përcillet me \\'@\\') i ndarë me presje. Për shembull:\\nroot, fred, @users, "
 "@wheel."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "drejtë leximi:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "drejtë shkrimi:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Zgjedhni stampuesit që kanë hyrje të lira për përdorues të njoftur"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Aktivzimi i të gjithë stampuesve"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Konfigurimi Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Asistenti i ka përmbledhur parametrat vijues që nevojiten në konfigurimin e "
 "Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Banderolë e Serverit:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Shpërndarja e Skedareve:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Server Stampimi:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Home:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Stampuesit:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Konfigurimi i Serverit FTP"
@@ -2837,6 +2822,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurimi i Serverit DNS"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Shtimi i përdoruesit"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Konfigurimi i Serverit DHCP"
 
diff --git a/po/sr.po b/po/sr.po
index b3c0fb8a..32d5296a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -22,33 +22,33 @@ msgstr "Чаробњак за подешавање"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "Упозорење"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 #, fuzzy
 msgid "Error."
 msgstr "Грешка у чаробњаку."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Честитке"
 
@@ -90,18 +90,18 @@ msgstr "Овај чаробњак ће Вам помоћи да додате н�
 msgid "(you don't need to type the domain after the name)"
 msgstr "(не морате да унесете domain након тог имена)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Идентификација клијента:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "Унеста IP адреса и име клијента морају да буду јединствени на мрежи."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -111,22 +111,22 @@ msgstr ""
 "net. Сваки рачунар на мрежи мора да има јединствену IP адресу, у обичном "
 "формату (четири броја раздвојених тачкама)."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Име рачунара:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP адреса рачунара:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Упозорење"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Ви сте у dhcp, сервер може да не ради уз оваква подешавања."
@@ -134,12 +134,12 @@ msgstr "Ви сте у dhcp, сервер може да не ради уз ов�
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
@@ -185,12 +185,25 @@ msgstr "Клијентски IP:"
 msgid "The wizard successfully added the client."
 msgstr "Чаробњак је успешно додао клијента."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Затвори"
 
@@ -281,8 +294,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "искључен"
@@ -291,8 +304,8 @@ msgstr "искључен"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "укључен"
@@ -306,53 +319,42 @@ msgstr "Интерфејс:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Чаробњак је успешно подесио DHCP сервисе Вашег сервера."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "укључен"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS сервер"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS сервер"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "Одбиј домаћине:"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -360,12 +362,12 @@ msgstr ""
 "DNS (Domain Name Server) је сервис који мапира IP адресу нашине са интернет "
 "именом домаћина."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Чаробњак за подешавање DNS-а"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -375,93 +377,93 @@ msgstr ""
 "подешавања ће пружити локални DNS сервис за локална имена рачунара, са не-"
 "локалним захтевима који се шаљу ван DNS-а."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS сервер"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(не морате да унесете domain након тог имена)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Име сервера:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Прпрачунато Име домена"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "Одбиј домаћине:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Прпрачунато Име домена"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Подешавање DNS сервера"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "Спољни gateway"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -469,120 +471,120 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Адреса није исправна... притисните даље да би сте наставили"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Адреса није исправна... притисните даље да би сте наставили"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Адреса није исправна... притисните даље да би сте наставили"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Грешка у чаробњаку."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS чаробњак (подешавање)"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 #, fuzzy
 msgid "Computer name:"
 msgstr "Прпрачунато Име домена"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP адреса сервера:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Име сервера:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Чаробњак је успешно додао клијента."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Чаробњак је успешно додао клијента."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Чаробњак је успешно подесио DNS сервисе за Ваш сервер."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Подешавање DNS сервера"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Подешавање DNS сервера"
@@ -612,7 +614,7 @@ msgstr "Име сервера поште:"
 msgid "FTP server"
 msgstr "FTP сервер"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Сервер бази података"
@@ -642,7 +644,7 @@ msgstr "News сервер"
 msgid "Mandrakelinux Install server"
 msgstr "Име сервера поште:"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Сервер бази података"
@@ -667,7 +669,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "Инсталација теме није успела!"
@@ -904,13 +906,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Чаробњак за подешавање Samba-е"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -918,309 +914,298 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Чаробњак за подешавање Web сервера"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Лозинка:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "Овај чаробњак је успешно подесио сервис интернет поште на Вашем серверу."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Име домаћина:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "КОриснички директоријум:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Подешавање FTP сервера"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Подешавање FTP сервера"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap чаробњак"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Чаробњак за подешавање"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Чаробњак за подешавање"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Чаробњак за подешавање"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Сервер бази података"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Сачувао сам подешавања временског сервера"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Додавање корисника"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "Име домаћина:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Корисничко име:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Додавање корисника"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Неподударност лозинки"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Подешавање Samba-е"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Прпрачунато Име домена"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Прпрачунато Име домена%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "КОриснички директоријум:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "КОриснички директоријум:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Лозинка:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "КОриснички директоријум:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Име домаћина:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Корисничко име:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Подешавање DHCP сервера"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Додавање корисника"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Чаробњак је успешно подесио ваш прокси сервер."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Овај чаробњак је успешно подесио Samba сервер."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "укључен"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Грешка у чаробњаку."
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News чаробњак"
@@ -1358,13 +1343,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Директоријум:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "ДИректоријум који сте унели не постоји."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Контрола приступа"
 
@@ -1417,148 +1402,142 @@ msgstr "Мрежна маска:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Чаробњак је успешно подесио Ваш NFS сервер"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "News сервер"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "Клијентски IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS сервер"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Кућни дир:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Прпрачунато Име домена"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Овај чаробњак је успешно подесио Samba сервер."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "КОриснички директоријум:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Прпрачунато Име домена"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Дељени директоријум:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Овај чаробњак је успешно подесио Samba сервер."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Овај чаробњак је успешно подесио Samba сервер."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Подешавање DNS сервера"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "News сервер"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Подешавање DNS сервера"
@@ -1932,7 +1911,7 @@ msgstr ""
 "подесио:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1968,6 +1947,12 @@ msgstr "Squid чаробњак"
 msgid "PXE Wizard"
 msgstr "FTP чаробњак"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2292,25 +2277,25 @@ msgstr ""
 msgid "PXE server"
 msgstr "NFS сервер"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba чаробњак"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Све - без забрани приступа"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Моја правила - Птај ме за прихваћене и одбијене домаћине"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2318,37 +2303,37 @@ msgstr ""
 "Samba дозвољава Вашем серверу да се понаша као сервер за датотеке и штампаче "
 "за оне радне станицекоје не користе Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Чаробњак за подешавање Samba-е"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Овај чаробњак ће Вам помоћи да подесите Samba сервисе на Вашем серверу."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba мора да зна за Windows радну групу коју ће да опслужује."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Радна група"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Радна група:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Радна група је погрешна"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Серверов банер."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2356,19 +2341,19 @@ msgstr ""
 "Банер предтавља начин на који ће сервер бити описан и приказан Windows "
 "радним станицама."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Банер:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Серверов Банер није исправан"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Ниво приступа:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2377,7 +2362,7 @@ msgstr ""
 "* Пример 1: дозволи свим IP-овима у 150.203.*.*, осим једном \\hosts allow = "
 "150.203 EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2386,14 +2371,14 @@ msgstr ""
 "* Пример 1: дозволи домаћинима који одговарају датој мрежи/нетмасци \\nhosts "
 "allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr "* Пример 3: дозвољава двема домаћинима\\hosts = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2405,23 +2390,23 @@ msgstr ""
 "одбиј једном специфичном домаћину\\hosts allow = @footnet\\nhosts deny = "
 "pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Приступ и даље захтева одговарајућу корисничке лозинке."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Дозволи домаћине:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Одбиј домаћине:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Samba сервиси укључени"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2430,19 +2415,19 @@ msgstr ""
 "Samba може да пружи заједнички простор за дељење датотека за Вашу Windows "
 "радну станицу, као и дељење штампача за штампаче повезане на Ваш сервер."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Укључи простор дељења датотека"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Омогући дељење сервера за штампу"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Чини корисничке (home) директоријуме доступне својим власницима"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2451,28 +2436,28 @@ msgstr ""
 "Sambe-е али они/Ви морате да користите smbpasswd како би сте подесили "
 "лозинку."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Дељени директоријум:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Унесите оутању до директоријума који желите да делите."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Дозволе над датотекама"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2483,63 +2468,63 @@ msgstr ""
 "претходи знак \\'@\\') као на примеру: \\nroot, fred, @users, @wheel за "
 "сваку врсту дозволе."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "прочитај листу:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "листа писања:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Изаберите штампаче које желите да учините доступним, а који припадају "
 "познатим корисницима"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Омогући све штампаче"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Подешавање Samba-е"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Чаробњак је сакупио следеће податке који су потребни да би се подесила Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Серверов банер:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Дељење датотека:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Сервер за штампање:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Кућни дир:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Штампачи:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Овај чаробњак је успешно подесио Samba сервер."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Подешавање FTP сервера"
@@ -2789,6 +2774,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Подешавање DNS сервера"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Додавање корисника"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Подешавање DHCP сервера"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index bd52c5ce..f982ff77 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -22,33 +22,33 @@ msgstr "Čarobnjak za podešavanje"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "Upozorenje"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 #, fuzzy
 msgid "Error."
 msgstr "Greška u čarobnjaku."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Čestitke"
 
@@ -91,18 +91,18 @@ msgstr "Ovaj čarobnjak će Vam pomoći da dodate novog klijenta lokalnom DNS-u.
 msgid "(you don't need to type the domain after the name)"
 msgstr "(ne morate da unesete domain nakon tog imena)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Identifikacija klijenta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "Unesta IP adresa i ime klijenta moraju da budu jedinstveni na mreži."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,22 +112,22 @@ msgstr ""
 "net. Svaki računar na mreži mora da ima jedinstvenu IP adresu, u običnom "
 "formatu (četiri broja razdvojenih tačkama)."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Ime računara:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP adresa računara:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Upozorenje"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -136,12 +136,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
@@ -187,12 +187,25 @@ msgstr "Klijentski IP:"
 msgid "The wizard successfully added the client."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Zatvori"
 
@@ -284,8 +297,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "isključen"
@@ -294,8 +307,8 @@ msgstr "isključen"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "uključen"
@@ -309,53 +322,42 @@ msgstr "Interfejs:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "uključen"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS server"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS server"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "Odbij domaćine:"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -363,12 +365,12 @@ msgstr ""
 "DNS (Domain Name Server) je servis koji mapira IP adresu našine sa internet "
 "imenom domaćina."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "Čarobnjak za podešavanje DNS-a"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -378,93 +380,93 @@ msgstr ""
 "podešavanja će pružiti lokalni DNS servis za lokalna imena računara, sa ne-"
 "lokalnim zahtevima koji se šalju van DNS-a."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS server"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(ne morate da unesete domain nakon tog imena)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Ime servera:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Prpračunato Ime domena"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "Odbij domaćine:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Prpračunato Ime domena"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Podešavanje DNS servera"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "Spoljni gateway"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -472,120 +474,120 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Adresa nije ispravna... pritisnite dalje da bi ste nastavili"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Adresa nije ispravna... pritisnite dalje da bi ste nastavili"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Adresa nije ispravna... pritisnite dalje da bi ste nastavili"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "Greška u čarobnjaku."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS čarobnjak (podešavanje)"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 #, fuzzy
 msgid "Computer name:"
 msgstr "Prpračunato Ime domena"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP adresa servera:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Ime servera:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Čarobnjak je uspešno podesio DNS servise za Vaš server."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Podešavanje DNS servera"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Podešavanje DNS servera"
@@ -615,7 +617,7 @@ msgstr "Ime servera pošte:"
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "Server bazi podataka"
@@ -645,7 +647,7 @@ msgstr "News server"
 msgid "Mandrakelinux Install server"
 msgstr "Ime servera pošte:"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Server bazi podataka"
@@ -670,7 +672,7 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "Instalacija teme nije uspela!"
@@ -908,13 +910,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Čarobnjak za podešavanje Samba-e"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -922,309 +918,298 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Čarobnjak za podešavanje Web servera"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Lozinka:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, 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:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Ime domaćina:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "KOrisnički direktorijum:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "Podešavanje FTP servera"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Podešavanje FTP servera"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap čarobnjak"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Server bazi podataka"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Sačuvao sam podešavanja vremenskog servera"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "Ime domaćina:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Korisničko ime:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Lozinka:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Lozinka:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Nepodudarnost lozinki"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Podešavanje Samba-e"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Prpračunato Ime domena"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Prpračunato Ime domena%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "KOrisnički direktorijum:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "KOrisnički direktorijum:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Lozinka:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Lozinka:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "KOrisnički direktorijum:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Ime domaćina:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "Korisničko ime:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Podešavanje DHCP servera"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Dodavanje korisnika"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr "Čarobnjak je uspešno podesio vaš proksi server."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "uključen"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Greška u čarobnjaku."
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News čarobnjak"
@@ -1362,13 +1347,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktorijum:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "DIrektorijum koji ste uneli ne postoji."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontrola pristupa"
 
@@ -1421,148 +1406,142 @@ msgstr "Mrežna maska:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Čarobnjak je uspešno podesio Vaš NFS server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "News server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "Klijentski IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "Kućni dir:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "Prpračunato Ime domena"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "KOrisnički direktorijum:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Prpračunato Ime domena"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "Deljeni direktorijum:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Podešavanje DNS servera"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "News server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Podešavanje DNS servera"
@@ -1937,7 +1916,7 @@ msgstr ""
 "podesio:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1973,6 +1952,12 @@ msgstr "Squid čarobnjak"
 msgid "PXE Wizard"
 msgstr "FTP čarobnjak"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2297,25 +2282,25 @@ msgstr ""
 msgid "PXE server"
 msgstr "NFS server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba čarobnjak"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Sve - bez zabrani pristupa"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moja pravila - Ptaj me za prihvaćene i odbijene domaćine"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2323,37 +2308,37 @@ msgstr ""
 "Samba dozvoljava Vašem serveru da se ponaša kao server za datoteke i "
 "štampače za one radne stanicekoje ne koriste Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Čarobnjak za podešavanje Samba-e"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Ovaj čarobnjak će Vam pomoći da podesite Samba servise na Vašem serveru."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba mora da zna za Windows radnu grupu koju će da opslužuje."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Radna grupa"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Radna grupa:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Radna grupa je pogrešna"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Serverov baner."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2361,19 +2346,19 @@ msgstr ""
 "Baner predtavlja način na koji će server biti opisan i prikazan Windows "
 "radnim stanicama."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Baner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Serverov Baner nije ispravan"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Nivo pristupa:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2382,7 +2367,7 @@ msgstr ""
 "* Primer 1: dozvoli svim IP-ovima u 150.203.*.*, osim jednom \\hosts allow = "
 "150.203 EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2391,14 +2376,14 @@ msgstr ""
 "* Primer 1: dozvoli domaćinima koji odgovaraju datoj mreži/netmasci \\nhosts "
 "allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr "* Primer 3: dozvoljava dvema domaćinima\\hosts = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2410,23 +2395,23 @@ msgstr ""
 "odbij jednom specifičnom domaćinu\\hosts allow = @footnet\\nhosts deny = "
 "pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Pristup i dalje zahteva odgovarajuću korisničke lozinke."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Dozvoli domaćine:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Odbij domaćine:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Samba servisi uključeni"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2435,19 +2420,19 @@ msgstr ""
 "Samba može da pruži zajednički prostor za deljenje datoteka za Vašu Windows "
 "radnu stanicu, kao i deljenje štampača za štampače povezane na Vaš server."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Uključi prostor deljenja datoteka"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Omogući deljenje servera za štampu"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Čini korisničke (home) direktorijume dostupne svojim vlasnicima"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2456,28 +2441,28 @@ msgstr ""
 "Sambe-e ali oni/Vi morate da koristite smbpasswd kako bi ste podesili "
 "lozinku."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Deljeni direktorijum:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Unesite outanju do direktorijuma koji želite da delite."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Dozvole nad datotekama"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2488,64 +2473,64 @@ msgstr ""
 "prethodi znak \\'@\\') kao na primeru: \\nroot, fred, @users, @wheel za "
 "svaku vrstu dozvole."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "pročitaj listu:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "lista pisanja:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Izaberite štampače koje želite da učinite dostupnim, a koji pripadaju "
 "poznatim korisnicima"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Omogući sve štampače"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Podešavanje Samba-e"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Čarobnjak je sakupio sledeće podatke koji su potrebni da bi se podesila "
 "Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Serverov baner:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Deljenje datoteka:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Server za štampanje:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Kućni dir:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Štampači:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "Podešavanje FTP servera"
@@ -2797,6 +2782,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje DNS servera"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Dodavanje korisnika"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Podešavanje DHCP servera"
 
diff --git a/po/sv.po b/po/sv.po
index d6ddb32f..224e3de4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-14 23:49+0200\n"
 "Last-Translator: Kenneth Krekula <kenneth.krekula@kiruna.se>\n"
 "Language-Team:  <sv@li.org>\n"
@@ -27,31 +27,31 @@ msgstr "konfigurationsguide"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Varning."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Fel."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Gratulerar"
 
@@ -92,18 +92,18 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(du behöver inte ange domänen efter namnet)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Klientidentifiering:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Observera att angivet IP-adress och klientnamn måste vara unika i nätverket."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -113,33 +113,33 @@ msgstr ""
 "klientnamn.företag.se. Varje dator på nätverket måste ha en unik IP-adress i "
 "den vanliga punktsyntaxen."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Datorns namn:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Datorns IP-adress:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Varning"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Du är i DHCP, servern kanske inte fungerar med din konfiguration."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Fel"
@@ -184,12 +184,32 @@ msgstr "Klient-IP:"
 msgid "The wizard successfully added the client."
 msgstr "Guiden lyckades med att lägga till klienten."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Du behöver ändra ditt domännamn. För en DNS server behöver du ett korrekt "
+"domännamn, ej localdomain eller none. Värdnamnet måste vara ett FQDN: Fully "
+"Qualified Domain Name. Kör drakconnect för att justera det."
+
+#: ../common/Wizcommon.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."
+msgstr ""
+"Du behöver ändra ditt domännamn. För en DNS server behöver du ett korrekt "
+"domännamn, ej localdomain eller none. Värdnamnet måste vara ett FQDN: Fully "
+"Qualified Domain Name. Kör drakconnect för att justera det."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Kommandot körs fortfarande. Vill du stoppa det och avsluta Guiden?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Stäng"
 
@@ -281,8 +301,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "inaktiverad"
@@ -291,8 +311,8 @@ msgstr "inaktiverad"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "aktiverad"
@@ -305,52 +325,38 @@ msgstr "Gränssnitt:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Guiden lyckades med att konfigurera DHCP tjänsterna."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Misslyckades"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Kör om drakwizard, och försök ändra några parametrar."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Du bör ändra ditt värdnamn."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Du behöver ändra ditt domännamn. För en DNS server behöver du ett korrekt "
-"domännamn, ej localdomain eller none. Värdnamnet måste vara ett FQDN: Fully "
-"Qualified Domain Name. Kör drakconnect för att justera det."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "DNS-huvudserver"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "DNS-slavserver"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Lägg till värddator i DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Ta bort värddator i DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -358,11 +364,11 @@ msgstr ""
 "DNS (Domain Name Server) är tjänsten som mappar en dators IP-adress med ett "
 "Internetvärddatornamn."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Konfigurationsguide för DNS-huvudserver"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -372,47 +378,47 @@ msgstr ""
 "här konfigurationen tillhandahåller en lokal DNS-tjänst för lokala "
 "datornamn. Icke-lokala förfrågningar vidarebefordras till en DNS på utsidan."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Vad vill du göra:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS-server"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(du behöver inte lägga till domänen efter namnet)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Server IP:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS-domännamn:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Välj den värd du vill ta bort i följande lista."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Ta bort en värd i en existerande DNS konfiguration."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Ta bort värddator:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Datornamn:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -422,11 +428,11 @@ msgstr ""
 "server, och kommer också att fungera som backupserver, utifall din primära "
 "server ej kan nås."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP Addressen för den primära DNS-servern"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -434,11 +440,11 @@ msgstr ""
 "Vidarebefordran sker endast för de förfrågningar för vilka servern inte är "
 "auktoritär och ej har svaret i sin cache."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP för din vidarebefordrare"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -446,15 +452,15 @@ msgstr ""
 "Om du behöver det och vet din IP vidarebefordrare fyll i IP addressen för "
 "den, om du inte vet lämna den tom."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Extern DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Lägg till sökdomän"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -462,7 +468,7 @@ msgstr ""
 "Domännamnet för denna server läggs till automatiskt, så du behöver inte "
 "lägga till det här."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -473,28 +479,28 @@ msgstr ""
 "lokala domänen; som default, innehåller den bara det lokala domän- namnet. "
 "Detta kan ändras genom att lista önskad domänsökväg efter söknyckelordet"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Default domänsöknamn att söka:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Detta är inte en giltig adress för din vidarebefordrare... klicka på nästa "
 "för att fortsätta"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Detta är inte en giltig Primär DNS adress... klicka på nästa för att "
 "fortsätta"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Detta är inte en giltig IP adress... klicka på nästa för att fortsätta"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -502,11 +508,11 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Fel:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -514,7 +520,7 @@ msgstr ""
 "Det verkar som om detta inte finns i din DNS konfiguration... klicka på "
 "nästa för att fortsätta"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -522,71 +528,71 @@ msgstr ""
 "Det verkar som om ingen DNS server har blivit konfigurerad via guiden. Var "
 "vänlig kör DNS guiden: Primär DNS server."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Det verkar som om du inte är primär DNS server, så du kan inte lägga till/ta "
 "bort värdar."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Guiden kommer nu att skapa din DNS slav konfiguration"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "med denna konfiguration:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Klient med denna identitet kommer att adderas till din DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Datornamn:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Datorns IP-adress:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Klient med denna identitet kommer att tas bort från din DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS servern kommer att konfigureras med denna konfiguration"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Servervärddatornamn:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domännamn:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Guiden lyckades med att lägga till klienten i din DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Guiden lyckades med att ta bort värden från din DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Guiden lyckades med att konfigurera DNS tjänsten på din server."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 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."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurerar ditt system som Primär DNS server ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurerar ditt system som Slav DNS server"
 
@@ -614,7 +620,7 @@ msgstr "E-postserver"
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba-server"
 
@@ -638,7 +644,7 @@ msgstr "NIS server autofs karta"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux Installera server"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -663,7 +669,7 @@ msgstr ""
 "%s är inte installerad.\n"
 "Klicka på \"Nästa\" för att installera eller \"Avbryt\" för att avsluta."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Installation misslyckades"
 
@@ -906,15 +912,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Konfigurationsguide för Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Du måste ändra ditt domännamn, inte till localdomain eller none. Var vänlig "
-"kör drakconnect för att justera detta."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -926,7 +924,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:59
+#: ../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 "
@@ -936,39 +934,39 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Välkommen till konfigurationsguiden för Kolab grupprogramvaruserver."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Ange lösenord för administratörens konto på Kolab servern."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Lösenord igen:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Värddatornamn:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "E-post domän:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -976,45 +974,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Installation pågår"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Installerar Kolab servern på ditt system..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Konfigurerar Kolab servern på ditt system..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Guide för Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Du behöver ändra ditt domännamn. För en LDAP server behöver du ett korrekt "
-"domännamn, ej localdomain eller none. Värdnamnet måste vara ett FQDN: Fully "
-"Qualified Domain Name. Kör drakconnect för att justera det."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Visa Ldap konfiguration"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Lägg till användare på Ldap server"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Ta bort Ldap konfiguration"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1022,190 +1010,188 @@ msgstr ""
 "Det är ett lättviktsprotokoll för att komma åt katalogtjänster, specifikt "
 "X.500-baserade katalogtjänster."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP står för Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Konfigurationsguide för Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Du måste ställa in en Ldap server först."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ditt val:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Ta bort konfiguration"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Sparar nuvarande bas i /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP Lägga till användare"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Användare skapad i: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Användare skapad i: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Förnamn:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Användarnamn:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Du måste fylla i ett korrekt förnamn."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Du måste fylla i ett korrekt namn."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Du måste fylla i ett korrekt användarnamn."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP Användarlösenord"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "lösenorden måste stämma"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Lösenord (igen):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Du måste skriva in ett lösenord för LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Du angav inte samma lösenord"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Administratör"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "Administratören är en användare med tillåt-åtkomst till LDAP databas"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Administratör,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Konfigurerar LDAP Server"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Domännamn: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Domännamn: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "LDAP Administratör"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP katalogträd"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS namngivning används för LDAP katalogträdets definition"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP katalogträd::"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP Administratör:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP Lösenord:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP Lösenord (igen):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Du måste skriva in ett giltigt LDAP katalogträd."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Bekräftelse på den användare som skall skapas"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Förnamn:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Användarnamn:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Skapad i:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Bekräftelse på informationen för att skapa en LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Behållare för användare:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Guiden lyckades med att konfigurera LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Lyckades lägga till användare"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Fel när användare skulle läggas till i Ldap databas"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Servern är redan konfigurerad"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Du har redan konfigurerat din Ldap Server"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Falerade"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Fel!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Kunde ej ansluta till %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Guide för diskussionsgrupper"
@@ -1348,13 +1334,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Sökvägen du angav finns inte."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Åtkomstkontroll"
 
@@ -1407,29 +1393,21 @@ msgstr "Nätmask: "
 msgid "The wizard successfully configured your NFS server."
 msgstr "Guiden lyckades med att konfigurera NFS-servern."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Du måste justera ditt NIS domännamn. För en NIS server behöver du ett "
-"korrect NIS domännamn, inte localdomain eller none."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS server med autofs karta"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS-klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Ställ in en NIS server med autofs karta, auto.home och auto.master filer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1437,28 +1415,28 @@ msgstr ""
 "Användarna monterar automatiskt sin hemkatalog fråm server, när de loggar in "
 "på ett NIS klientdatornätverk."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Konfigurera dator som en NIS klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Du behöver bara mata in nisdomän och nisserver."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS-server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS-domän:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1468,7 +1446,7 @@ msgstr ""
 "bygger autofs kartan, så att den gör det möjligt för NIS användaren att "
 "automatiskt montera sin hemkatalog på en NIS klientdator."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1476,41 +1454,41 @@ msgstr ""
 "Hem NIS: baskatalog för användarnas hemkataloger på NIS server. Denna "
 "katalog kommer att exporteras via NFS servern."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS domän: NIS domän som används (normalt samma som ditt DNS domännamn)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS server: namnet på din dator."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Hem NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS-domännamn:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Guiden kommer att ställa in din NIS server med autofs karta"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS katalog:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domännamn: namn på NIS domänen"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS server: värddatornamnet på NIS servern."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1518,23 +1496,23 @@ msgstr ""
 "YPBIND demonen hittar servern för NIS domänen och bibehåller NIS "
 "kopplingsinformation."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Fel: skall vara en katalog"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Fel: nisdomännamn ska inte vara 'none' eller 'localdomain'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Var vänlig korrigera detta."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Guiden lyckades med att konfigurera din maskin som en NIS klient."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1542,15 +1520,15 @@ msgstr ""
 "Guiden lyckades med att konfigurera din maskin som en NIS server med autofs "
 "karta."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurerar ditt system till att vara NIS server med Autofs karta..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS med Autofs karta"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurerar ditt system som NIS klient..."
 
@@ -1914,7 +1892,7 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera proxyn:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1946,6 +1924,14 @@ msgstr "Proxy för Squid"
 msgid "PXE Wizard"
 msgstr "PXE-guide"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Du måste ändra ditt domännamn, inte till localdomain eller none. Var vänlig "
+"kör drakconnect för att justera detta."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Välj PXE server"
@@ -2306,24 +2292,24 @@ msgstr "Konfigurerar PXE server på ditt system..."
 msgid "PXE server"
 msgstr "PXE-server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Guide för Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s finns inte."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Alla - inga åtkomstbegränsningar"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mina regler - Fråga mig för nekade/tillåtna värddatorer"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2331,36 +2317,36 @@ msgstr ""
 "Samba låter din server uppträda som en fil- och skrivarserver för "
 "arbetsstationer som kör icke-Linux-system."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Konfigurationsguide för Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Den här guiden hjälper dig att konfigurera Samba-tjänster på servern."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba behöver känna till vilken Windows-arbetsgrupp den ska tjäna."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Arbetsgrupp"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Arbetsgrupp:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Arbetsgruppen är fel"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Serverrubrik."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2368,19 +2354,19 @@ msgstr ""
 "Rubriken är sättet som den här servern kommer att beskrivas för Windows-"
 "arbetsstationer."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Rubrik:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Serverrubriken är felaktig"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Åtkomstnivå:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2388,7 +2374,7 @@ msgstr ""
 "* Exempel 1: tillåt alla IP-adresser i 150.203.*.*; utom en\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2396,7 +2382,7 @@ msgstr ""
 "* Exempel 2: tillåt värddatorer som matchar givet nätverk/nätmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2404,7 +2390,7 @@ msgstr ""
 "* Exempel 3: tillåt några värddatorer\n"
 "hosts allow = lappland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2416,23 +2402,23 @@ msgstr ""
 "hosts allow = @exnät\n"
 "hosts deny = pirat"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Observera att åtkomst fortfarande kräver lämpligt användarlösenord."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Tillåt datorer:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Neka datorer:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Aktiverade Samba-tjänster"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2441,19 +2427,19 @@ msgstr ""
 "Samba kan tillhandahålla ett allmänt filutdelningsområde för dina Windows-"
 "arbetsstationer och kan också dela ut skrivarna som är anslutna till servern."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Aktivera filutdelningsområde"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Aktivera utdelning av serverskrivare"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Gör hemkataloger tillgängliga för sina ägare"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2461,28 +2447,28 @@ msgstr ""
 "Du har valt att tillåta användare komma åt sina hemkataloger via Samba men "
 "du/dem måste använda smbpasswd för att ange ett lösenord."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Utdelad katalog:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Ange sökvägen till katalogen du vill dela ut."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Skapa en delad katalog om den ej existerar"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Kunde ej skapa katalog."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Filrättigheter"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2492,59 +2478,59 @@ msgstr ""
 "av ett '@') exempelvis:\n"
 "root, fredrik, @users, @wheel för varje behörighet."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "läslista:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fredrik, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "skrivlista:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Välj vilka skrivare som du vill att kända användare ska kunna komma åt"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Aktivera alla skrivare"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Konfigurerar Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Guiden samlade in följande parametrar för att konfigurera Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Serverrubrik:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Filutdelning:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Skrivarserver:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Hem:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Skrivare:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Guiden lyckades med att konfigurera Samba-servern."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Konfigurerar din Samba server..."
 
@@ -2782,3 +2768,25 @@ msgstr "Apache server"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerar ditt system som Apache server ..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Du bör ändra ditt värdnamn."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Du behöver ändra ditt domännamn. För en LDAP server behöver du ett "
+#~ "korrekt domännamn, ej localdomain eller none. Värdnamnet måste vara ett "
+#~ "FQDN: Fully Qualified Domain Name. Kör drakconnect för att justera det."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Kunde ej ansluta till %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Du måste justera ditt NIS domännamn. För en NIS server behöver du ett "
+#~ "korrect NIS domännamn, inte localdomain eller none."
diff --git a/po/ta.po b/po/ta.po
index 29a32b15..856fabee 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2002-09-06 00:50+0800\n"
 "Last-Translator: prabu<prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
@@ -22,33 +22,33 @@ msgstr "வடிவமைப்பு மாயாவி"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "Warning."
 msgstr "எச்சரிக்ைக"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 #, fuzzy
 msgid "Error."
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "வாழ்த்துக்கள்"
 
@@ -91,18 +91,18 @@ msgstr "இந்த மாயாவி புதிய வேண்டியை
 msgid "(you don't need to type the domain after the name)"
 msgstr "(நீங்கள் கணினியின்/வேண்டியின் பெயரையடுத்து களத்தின் பெயரைத் தர வேண்டும்)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "வேண்டியின் அடையாளம்"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "வலையமைப்பில் உள்ள ஒவ்ெவாரு கணினிக்கும் தனிப்ெபயரும், IP எண்ணும் இருக்க வேண்டும்"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,22 +112,22 @@ msgstr ""
 "company.net. அதே வகையில் ஒவ்ெவாரு கணினியும் தனி  IP முகவரியுடன் அடையாளம்  "
 "காணப்படும்."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "கணினியின் பெயர்:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "இயக்கத்தின்  IP முகவரி"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "எச்சரிக்ைக"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -136,12 +136,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Error"
@@ -188,12 +188,25 @@ msgstr "வேண்டியின் IP:"
 msgid "The wizard successfully added the client."
 msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "மூடு"
 
@@ -283,8 +296,8 @@ msgstr "உங்கள் DHCP சேவைகளை வடிவமைக்�
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "முடமாக்கப்பட்டுள்ளது"
@@ -293,8 +306,8 @@ msgstr "முடமாக்கப்பட்டுள்ளது"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "செயல்படுத்தப்பட்டுள்ளது"
@@ -308,53 +321,42 @@ msgstr "அட்ைட:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "இந்த மாயாவி உங்கள் DHCP சேவைகளை வெற்றிகரமாக வடிவமைத்துவிட்டது"
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 #, fuzzy
 msgid "Failed"
 msgstr "செயல்படுத்தப்பட்டுள்ளது"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS சேவையகம்"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS சேவையகம்"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 #, fuzzy
 msgid "Remove host in DNS"
 msgstr "கணினிகளை மறுக்கவும்"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -362,12 +364,12 @@ msgstr ""
 "DNS(Domain Name Server) என்ற சேவை முலம் தான் உலகில் உள்ள அனைத்து கணினிகளும் "
 "ஒன்றுக்ெகன்று தொடர்பு கொள்கின்றன"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 #, fuzzy
 msgid "DNS Master configuration wizard"
 msgstr "DNS  வடிவமைப்பு மாயாவி"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -377,93 +379,93 @@ msgstr ""
 "வலையமைப்பகத்தில் உள்ள கணினிகளுக்கு  DNS சேவைகளை வழங்கும். வெளியில் உள்ள வலையமைப்புகளைப் "
 "பற்றிய DNS  வினாக்களுக்கு வெளியிலுள்ள DNS சேவையகத்துக்குச் செல்லும்"
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS சேவையகம்"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(நீங்கள் கணினியின்/வேண்டியின் பெயரையடுத்து களத்தின் பெயரைத் தர வேண்டும்)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "கணினியின் பெயர்:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove host:"
 msgstr "கணினிகளை மறுக்கவும்"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 #, fuzzy
 msgid "Computer Name:"
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 #, fuzzy
 msgid "External DNS:"
 msgstr "வெளிப்புற நுழைவாயில்"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -471,120 +473,120 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "இது தவறான முகவரி...தொடர்வதற்கு அடுத்தது என்ற பொத்தானை அழுத்து"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "இது தவறான முகவரி...தொடர்வதற்கு அடுத்தது என்ற பொத்தானை அழுத்து"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "இது தவறான முகவரி...தொடர்வதற்கு அடுத்தது என்ற பொத்தானை அழுத்து"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 #, fuzzy
 msgid "Error:"
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS மாயாவி (வடிவமைப்பு)"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 #, fuzzy
 msgid "Computer name:"
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "கணினி முகவரி"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "கணினியின் பெயர்:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 #, fuzzy
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "மாயாவி உங்கள் DNS சேவைகளை வெற்றிகரமாக வடிவமைத்தது"
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
@@ -615,7 +617,7 @@ msgstr "மின்னஞ்சல் சேவையகத்தின் ப�
 msgid "FTP server"
 msgstr "FTP சேவையகம்"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Samba server"
 msgstr "தரவுத்தளச் சேவையகம்"
@@ -645,7 +647,7 @@ msgstr "செய்தியஞ்சல் சேவையகம்"
 msgid "Mandrakelinux Install server"
 msgstr "மின்னஞ்சல் சேவையகத்தின் பெயர்:"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "தரவுத்தளச் சேவையகம்"
@@ -673,7 +675,7 @@ msgstr ""
 "\"அடுத்து\" என்றால் நிறுவப்படும்,\n"
 "இல்ைலயெனில் \"தவிர்\" என்றால் நிறுவப்படாமல் வெளிச்ெசல்லும்"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 #, fuzzy
 msgid "Installation failed"
 msgstr "உருகருக்கள் நிறுவுதல் வெற்றியடையவில்ைல"
@@ -910,13 +912,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "சம்பா வடிவமைப்பு மாயாவி"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -924,311 +920,300 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "வலையத்தளச் சேவையக வடிவமைப்பு மாயாவி"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr ""
 "இந்த மாயாவி மின்னஞ்சல் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக "
 "வடிவமைத்துவிட்டது"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "கணினிப்ெபயர்"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "பயனர் அடைவு:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "சம்பா மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "தரவுத்தளச் சேவையகம்"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "நேரச் சேவையக வடிவமைப்பு மாயாவி"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "பயனர் சேர்க்ைக"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 #, fuzzy
 msgid "First Name:"
 msgstr "கணினிப்ெபயர்"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "பயனரின்ெபயர்:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "பயனர் சேர்க்ைக"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "கடவுச்ெசால்:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "கடவுச்ெசால்:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "கடவுச்ெசாற்கள் இரண்டும் பொருந்தவில்ைல"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "சம்பா வடிவமைக்கப்படுகிறது"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "பயனர் அடைவு:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "பயனர் அடைவு:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "கடவுச்ெசால்:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "கடவுச்ெசால்:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "பயனர் அடைவு:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "கணினிப்ெபயர்"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 #, fuzzy
 msgid "User Name:"
 msgstr "பயனரின்ெபயர்:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "பயனர் சேர்க்ைக"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 #, fuzzy
 msgid "The wizard successfully configured the LDAP."
 msgstr ""
 "இந்த மாயாவி பினாமிச் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக வடிவமைத்தது"
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "செயல்படுத்தப்பட்டுள்ளது"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "செய்தியஞ்சல் மாயாவி"
@@ -1365,13 +1350,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "அடைவு:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "தாங்கள் ெகாடுத்த பாைத காணப்படவில்ைல"
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "அணுகல் கட்டுப்பாடு"
 
@@ -1425,148 +1410,142 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "இந்த மாயாவி NFS சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 #, fuzzy
 msgid "NIS server with autofs map"
 msgstr "செய்தியஞ்சல் சேவையகம்"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "வேண்டியின் IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 #, fuzzy
 msgid "NIS server:"
 msgstr "NFS சேவையகம்"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 #, fuzzy
 msgid "Home NIS:"
 msgstr "இல்லம்:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname:"
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 #, fuzzy
 msgid "NIS directory:"
 msgstr "பயனர் அடைவு:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 #, fuzzy
 msgid "Error: should be a directory."
 msgstr "பகிர்ந்துள்ள அைடவு"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 #, fuzzy
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 #, fuzzy
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "செய்தியஞ்சல் சேவையகம்"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
@@ -1928,7 +1907,7 @@ msgid ""
 msgstr "உங்கள் பினாமியை வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1966,6 +1945,12 @@ msgstr "சுகுயிட் மாயாவி"
 msgid "PXE Wizard"
 msgstr "FTP மாயாவி"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 #, fuzzy
 msgid "Set PXE server"
@@ -2291,25 +2276,25 @@ msgstr ""
 msgid "PXE server"
 msgstr "NFS சேவையகம்"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "சம்பா மாயாவி"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "அனைத்தும்- எந்த கட்டுபாடும் இல்ைல"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "என்னுைடய சட்டங்கள்- அனுமதிக்கப்பட்ட, மறுக்கப்பட்ட கணினிகள்"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2317,54 +2302,54 @@ msgstr ""
 "சம்பா மூலம் உங்கள் கணினியை ஒரு , வின்டோஸ் கணினிகளுக்கான கோப்பு மற்றும் அச்சுப்ெபறி "
 "சேவையகமாக மாற்ற முடியும்"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "சம்பா வடிவமைப்பு மாயாவி"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைக்க உதவும்"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "சம்பாவிற்கு தான் பரிமாறப்ேபாகும் வின்டோஸ் பணிக்குழுவின் பெயர் தெரியவேண்டும்"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "பணிக்குழு"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "பணிக்குழு:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "பணிக்குழுவில் பிழை உள்ளது"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "சேவையகத்தின் பட்டப்ெபயர்"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "பட்டப்ெபயர் மூலமாகவே இந்த சேவையகம், வின்டோஸில் அழைக்கப்படும்"
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "பட்டப்ெபயர்:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "சேவையகத்தின் பட்டப்ெபயர் தவறாக உள்ளது"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "அணுகல் நிலை:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2373,7 +2358,7 @@ msgstr ""
 " Example 1: allow all IP in 150.203.*.*; except one\\nhosts allow = 150.203. "
 "EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2382,14 +2367,14 @@ msgstr ""
 "* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
 "= 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr "* உதாரனம் 3: அனுமதிக்கப்பட்ட கணினிகள்\\nhosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2400,23 +2385,23 @@ msgstr ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "எல்லா அணுகலுக்கும்  சரியான பயனர் கடவுச்ெசால்லும் ேவண்டும் "
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "கணினிகளை அனுமதி"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "கணினிகளை மறுக்கவும்"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "சம்பா சேவைகளை செயல்படுத்து"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2425,19 +2410,19 @@ msgstr ""
 "சம்பா மூலம் உங்கள் கணினியை ஒரு , வின்டோஸ் கணினிகளுக்கான கோப்பு மற்றும் அச்சுப்ெபறி "
 "சேவையகமாக மாற்ற முடியும்"
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "பகிர்தலைச் ெசயல்படுத்து"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "உங்கள் சேவையகத்தில் அச்சுப்ெபறியை பகிர்"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "அனைத்து பயனருக்கும் அவரவர் இல்ல அடைவை உருவாக்கவும்"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2445,28 +2430,28 @@ msgstr ""
 "நீங்கள் அணுமதித்த பயனர்கள் சம்பாவை பயன்படுத்த நீங்கள் மேலும் அவர்களுக்கு smbpasswd என்ற "
 "கட்டளை மூலம் கடவுச்ெசால்ைல உருவாக்க வேண்டும்"
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "பகிர்ந்துள்ள அைடவு"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "பகிர்ந்துள்ள அைடவின் பாதையை ெகாடுக்கவும்"
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "ேகாப்பு அனுமதிகள்"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2476,60 +2461,60 @@ msgstr ""
 "Type users or groups separated by a comma (groups must be preceded by a \\'@"
 "\\') like this:\\nroot, fred, @users, @wheel for each kind of permission."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "பட்டியலை வாசி"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "பட்டியலை எழுது:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "ெதரிந்த பயனர்கள் அைனவரும் பயன்படுத்தக்கூடிய அச்சுப்ெபாறிகள்"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "அைனத்து அச்சுப்ெபாறிகளையும் செயல்படுத்து"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "சம்பா வடிவமைக்கப்படுகிறது"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "உங்கள் சம்பா  சேவையகளை வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "சேவையகத்தின் பட்டப்ெபயர்:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "பகிர்தல்"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "அச்சு சேவையகம்:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "இல்லம்:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "அச்சுப்ெபாறிகள்:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 #, fuzzy
 msgid "Configuring your Samba server..."
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
@@ -2776,6 +2761,10 @@ msgid "Configuring your system as Apache server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
 #, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "பயனர் சேர்க்ைக"
+
+#, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
 
diff --git a/po/tg.po b/po/tg.po
index d647b476..32e021ad 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:34+0100\n"
-"PO-Revision-Date: 2004-10-26 19:00+0000\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
+"PO-Revision-Date: 2004-12-04 07:49+0000\n"
 "Last-Translator: Abrorova <H_Abrorova@rambler.ru>\n"
 "Language-Team: Tajik\n"
 "MIME-Version: 1.0\n"
@@ -28,31 +28,31 @@ msgstr "устоди ба танзимдарорӣ"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Огоҳӣ."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Хатогӣ."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Табрик мекунем"
 
@@ -94,11 +94,11 @@ msgstr "Барои мизоҷи навро ба DNS дохилкардан ин
 msgid "(you don't need to type the domain after the name)"
 msgstr "Баъд аз ном domain-ро дохил накунед"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Шиносонидани Мизоҷ"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -106,7 +106,7 @@ msgstr ""
 "Дар хотир доред, ки IP суроға ва номи мизоҷи додашуда бояд дар шабака нодир "
 "бошанд."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -116,21 +116,21 @@ msgstr ""
 "company.net. Ҳамаи мошинаҳо дар шабака бояд IP суроға (ягона) дощта бошанд, "
 "дар ситаксиси нуқтадори оддӣ"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Номи мошина"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP суроғаи мошина"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Огоҳ"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Шумо дар dhcp мебошед, эҳтимол хидматрасон бо ин танзимдарорӣ кор намекунад."
@@ -138,12 +138,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Хатогӣ"
@@ -188,14 +188,36 @@ msgstr "Мизоҷи IP"
 msgid "The wizard successfully added the client."
 msgstr "Устод боммувофикият мизоҷро дохил кард."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Шумо бояд номи домини худро ислоҳ кунед. Барои хидматрасони DNS шумо бояд "
+"номи доминро ислоҳ кунед, ки ба localdomain ё қиммати холӣ баробар нест. "
+"Номи соҳиб бояд FQDN бошад: Номи Пурраю Муайяни Домен. Барои ислоҳи он "
+"drakconnect-ро сар диҳед."
+
+#: ../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."
+msgstr ""
+"Шумо бояд номи домини худро ислоҳ кунед. Барои хидматрасони DNS шумо бояд "
+"номи доминро ислоҳ кунед, ки ба localdomain ё қиммати холӣ баробар нест. "
+"Номи соҳиб бояд FQDN бошад: Номи Пурраю Муайяни Домен. Барои ислоҳи он "
+"drakconnect-ро сар диҳед."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "Фармон дар иҷроиш аст. Оё мехоҳед, ки онро нест кунед ва кори устодро ба "
 "итмом расонед?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Пӯшидан"
 
@@ -288,8 +310,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "хомўш"
@@ -298,8 +320,8 @@ msgstr "хомўш"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "дар гиронида"
@@ -312,53 +334,38 @@ msgstr "Интерфейс:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Устод бо муваффақият DHCP хидматрасонро танзим кард."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Бо нокомӣ анҷомид"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Drakwizard-ро бозоғоз намоед ва баъзе гузаришҳоро тағир намоед."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Шумо бояд номи соҳибии худро ислоҳ кунед."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Шумо бояд номи домини худро ислоҳ кунед. Барои хидматрасони DNS шумо бояд "
-"номи доминро ислоҳ кунед, ки ба localdomain ё қиммати холӣ баробар нест. "
-"Номи соҳиб бояд FQDN бошад: Номи Пурраю Муайяни Домен. Барои ислоҳи он "
-"drakconnect-ро сар диҳед."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Хидматрасони соҳиби DNS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Хидматрасони фармонбари DNS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Соҳибро ба DNS илова кунед"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Соҳибро аз DNS хориҷ кунед"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -366,11 +373,11 @@ msgstr ""
 "(номи шабака) хадамоти ки харитаи IP адресҳои мошинабо номи хидматкори "
 "Интернет"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Устоди танзими соҳиби DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -380,47 +387,44 @@ msgstr ""
 "шабака. Ин танзим дарори ба танзим даровардани шабакаи DNS барои номи "
 "кампютератонбарои қабул кардани DNS-ни беруни"
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Чӣ кор кардан мехоҳед:"
 
-#: ../dns_wizard/Bind.pm:126
-#, fuzzy
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
-msgstr "DNS хидматрасон"
+msgstr "Интерфейси DNS хидматрасон"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Ба шумо лозим нест, ки баъди ном доминро илова кунед)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
-#, fuzzy
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
-msgstr "Хидматрасони IP:"
+msgstr "Хидматрасон:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
-#, fuzzy
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
-msgstr "Номи домени NIS:"
+msgstr "Номи Домени DNS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Соҳиберо, ки аз рӯйхати зерин хориҷ кардан мехоҳед, интихоб намоед."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Аз танзимоти DNS-и мавҷуда соҳибро хориҷ кунед."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Соҳибро хориҷ кунед:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Номи Компютер:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -430,11 +434,11 @@ msgstr ""
 "ибтидоӣноми шумо мегирад ва ҳамчун хидматрасони захиравӣ ҳангоми дастрас "
 "набудани хидматрасони соҳиб амал мекунад."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP Суроғаи хидматрасони соҳиби DNS:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -442,11 +446,11 @@ msgstr ""
 "Бозсуроғакунӣ танҳо бо он дархостҳо ба амал меояд, ки барои онҳо хидматрасон "
 "эътибор надорад ва ҷавобро дар ҳофизаи ниҳонии худ надорад."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP - ин форворди шумо"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -454,15 +458,15 @@ msgstr ""
 "Агар ба шумо ин лозим бошад ва шумо IP-и форвордери худро донед, номи IP - "
 "суроғаи онро ворид кунед ва агар онро надонед, онро холӣ монед"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS-и берунӣ:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Домини ҷустуҷӯиро илова кунед"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -470,7 +474,7 @@ msgstr ""
 "Номи димини ин хидматрасон ба таври худкор илова шудааст, ва ба шумо лозим "
 "нест, ки онро дар ин ҷо илова кунед."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -482,27 +486,27 @@ msgstr ""
 "мегирад. Он метавонад бо рӯйхати домини дилхоҳи ҷустуҷӯӣ бо роҳи ҷустуҷӯ, ки "
 "аз паси гузарвожа меояд, иваз шавад."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Номи домин бо нобаёнӣ барои ҷустуҷӯ:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Ин IP суроғаи нодуруст барои форварди шумо аст... барои идомадиҳӣ Оянда-ро "
 "пахш кунед"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Ин Master DNS IP суроғаи нодуруст аст... барои идомадиҳӣ Оянда-ро пахш кунед"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Ин IP суроғаи нодуруст аст... барои идомадиҳӣ Оянда-ро пахш кунед"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -510,11 +514,11 @@ msgstr ""
 "Эҳтимолан ин соҳиб аллакай дар танзимоти DNS-и шумо ҳаст... барои идомадиҳӣ "
 "Оянда-ро пахш кунед"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Хатогӣ:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -522,7 +526,7 @@ msgstr ""
 "Эҳтимолан он дар танзимоти DNS-и шумо мавҷуд нест... барои идомадиҳӣ Оянда-"
 "ро пахш кунед"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -530,73 +534,73 @@ msgstr ""
 "Эҳтимолан DNS хидматрасон аз тарафи устод барпо нашудааст. Марҳамат карда "
 "Устоди DNS-ро корандозӣ кунед. Хидматрасони соҳибии DNS."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Эҳтимолан шумо хидматрасони соҳиби DNS набуда, балки танҳо фармонбар ҳастед. "
 "Бинобар ин ман соҳибро илова/хориҷ карда наметавонам."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Ҳоло устод танзими DNS-и фармонбари шуморо месозад."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "бо ин танзимдарорӣ:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Мизоҷ бо ин шиноса аз DNS-и шумо илова карда мешавад"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Номи компютер:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP суроғаи компютер:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Мизоҷ бо ин шиноса аз DNS-и шумо хориҷ карда мешавад"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS хидматрасон бо танзимдарориҳои зерин танзим мешавад"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Номи Соҳиби Хидматрасон:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Номи домен:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Устод бо мувофикият соҳибро ба DNS-и шумо илова кард."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Устод бо мувофикият соҳибро аз DNS-и шумо хориҷ кард."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Устод бо мувофикият хадамоти DNS-и хидматрасони шуморо танзим кард."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Drakwizard-ро дубора сар диҳед, ва кӯшиш намоед, ки баъзе параметрҳоро тағир "
 "диҳед."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Танзими системаи шумо ҳамчун DNS хидматрасони соҳиб ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Танзими системаи шумо ҳамчун DNS хидматрасони фармонбар ..."
 
@@ -624,7 +628,7 @@ msgstr "Хидматрасонро фиристодан"
 msgid "FTP server"
 msgstr "Хидматрасони FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Хидматрасони Samba"
 
@@ -648,7 +652,7 @@ msgstr "NIS хидматрасон ба харитаи autofs"
 msgid "Mandrakelinux Install server"
 msgstr "Хидматрасони Коргузории Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Хидматрасони Kolab"
 
@@ -674,7 +678,7 @@ msgstr ""
 "Пахш намоед \"Оянда\" барои насб намудан ё ин ки \"Бекор кардан\" барои "
 "хориҷшавӣ"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Коргузорӣ бо нокомӣ анҷомид"
 
@@ -935,16 +939,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Устоди батанзимдарории Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Шумо бояд номи домени худро дубора ислоҳ кунед, ки набояд қисмати "
-"localdomain ё холӣ-ро дошта бошад. Барои ислоҳкунии он drakconnect- ро сар "
-"диҳед."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -956,7 +951,7 @@ msgstr ""
 "бо пуштибонии китобҳои mailbox, инчунин алоқаҳо ва дастёбӣ ба пост ба "
 "воситаи POP3 инчунин IMAP4(rev1)"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -966,40 +961,40 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Устод нусхаи захиравии ҳамаи файлҳои "
 "танзимкуниро барои ин хидматҳо мекунад."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Марҳамат намоед ба Устоди танзими хидматрасонии Kolab Groupware."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Барои ҳисоби мудири хидматрасони Kolab гузарвожаро ворид кунед."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 "Гузарвожа мувофиқат намекунад ё мавҷуд нест, марҳамат карда ислоҳ кунед."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "гузарвожа"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Бори дигар гузарвожа:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Устод хидматрасони Kolab-ро бо параметрҳои зерин танзим мекунад"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Номи Соҳиб:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Пости домен:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -1008,46 +1003,35 @@ msgstr ""
 "'мудир' бо гузарвожаи воридкардаатон дар https://127.0.0.1/kolab/admin/, "
 "ворид шавед."
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Коргузорӣ иҷро шуда истодааст"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Ба танзим даровардани хидматрасони FTP"
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Танзимкунии хидматрасони Kolab дар системаи шумо..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Устоди Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Шумо бояд номи домини худро ислоҳ кунед. Барои хидматрасони LDAP шумо бояд "
-"номи доминро ислоҳ кунед, ки ба localdomain ё қиммати холӣ баробар нест. "
-"Номи соҳиб бояд FQDN бошад: Номи Пурраю Муайяни Домен. Барои ислоҳи он "
-"drakconnect-ро сар диҳед."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Намоиш додани танзимоти Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Иловакунии корванд ба хидматрасони Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Нобуд кардани танзимоти Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1055,194 +1039,192 @@ msgstr ""
 "Ин қарордоди сабук барои дастрасии хизматҳои феҳрист,махсусан барои "
 "хизматҳои феҳристи дар асоси X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP маънои Қарордоди Сабуки Дастрасии Феҳристро (Lightweight Directory "
 "Access Protocol) дорад."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "устоди батанзимдарории Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Дар авваал шумо бояд Ldap хидматрасонро барпо созед."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Интихоби шумо:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Нобуд кардани танзимот"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Захиракунии манбаъи мавҷуда /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Илвакунии Корванди LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Корванд Офарида шудааст дар: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Корванд Офарида шудааст дар: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Номи Аввала:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Ном:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Вориди Корванд:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Шумо бояд Номи Аввали дурустро ворид кунед."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Шумо бояд Номи дурустро ворид кунед."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Шумо бояд Номи дурусти Корвандро ворид кунед."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP Гузарвожаи Корванд"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "гузарвожаҳо бояд мувофиқат кунанд"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Гузарвожа (бори дигар):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Шумо бояд барои LDAP гузарвожаро ворид кунед."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Гузарвожаҳо мувофиқ нестанд"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Идоракунандаи"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Идоракунанда ин корванди пуриқтидор бо дастрасии зиёд ба манъбаи додаҳои "
 "LDAP "
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Идоракунандаи,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Хидматрасони LDAP Танзим шуда истодааст"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Номи домен: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Номи домен: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Идоракунандаи LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP феҳристи дарахтӣ"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS номгузорӣ барои муайянсозиифеҳристи дарахтии LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP феҳристи дарахтӣ:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "LDAP Идоракунанда:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Гузарвожаи LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Гузарвожаи LDAP (бори дигар):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Шумо бояд LDAP феҳристи дарахтии дурустро ворид кунед."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Тасдиқоти корванд барои офариниш"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Ном аввала:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Номи Корванд:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Офаридан дар:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Ахборот барои тасдиқоти офаридани хидматрасони LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Контейнери Корвандон:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Устод бо муваффақият LDAP-ро танзим кард."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Корвандон бо муваффақият илова карда шуданд"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Хатогӣ ҳангоми иловакунии корванд ба манъбаи додаҳои Ldap"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Хидматрасон аллакай танзим шудааст"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Шумо аллакай Хидматрасони LDAP-и худро танзим кардаед"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s Бо Нокомӣ Анҷомид"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Хатогӣ!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Пайвастшавӣ ба %s ғайри имкон аст"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Хабарҳои устод"
@@ -1382,13 +1364,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "феҳрист"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Роҳи Ки шумо дохил кардед вуҷуд надорад"
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Идораи пайвастшавӣ"
 
@@ -1440,30 +1422,22 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "устод бомуввафақатиян хидматрасони NFS ба танзим дароварда шуд"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Шумо бояд номи домени NIS-и худро ислоҳ кунед. Барои NIS ба шумо номи домени "
-"дурусти NIS лозим аст, ки ба localdomain ё қиммати холӣ баробар нест."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Хидматрасони NIS ба харитаи autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Мизоҷи NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Барпосозии хидматрасони NIS бо харитаи autofs, файлҳои auto.home ва auto."
 "master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1471,28 +1445,28 @@ msgstr ""
 "Корвандон метавонанд феҳристҳои хонагии худро ба таври худкор насб кунанд, "
 "ҳангоми воридшавӣ ба шабакаи компютерии мизоҷони NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Чӣ кор кардан мехоҳед?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Танзими компютер ҳамчун мизоҷи NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Шумо бояд танҳо nisдомен ва nisхидматрасонро ворид кунед."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Хидматрасони NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Домени NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1503,7 +1477,7 @@ msgstr ""
 "имконияти худнасбкунии феҳристҳои хонагии онҳоро дар мошинаҳои мизоҷии NIS "
 "медиҳад."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1511,42 +1485,42 @@ msgstr ""
 "Феҳристи хонагии NIS: феҳристи хонагӣ барои корвандони хидматрасони NIS. Ин "
 "феҳрист аз тарафи хидматрасони NFS содир карда мешавад."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS домен: NIS домен барои истифодабарӣ (умуман ба номи домени DNS-и шумо "
 "саҳеҳ аст)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS хидматрасон: номи компютери шумо."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS Хонигӣ:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Номи домени NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Устод NIS хидматрасони шуморо бо харитаи autofs барпо месозад"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Феҳристи NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS номи домен: номи домени NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS хидматрасон: номи соҳиби NIS хидматрасон."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1554,23 +1528,23 @@ msgstr ""
 "Азозили YPBIND хидматрасонро бо NIS доменҳо ҷустуҷӯ мекунад, ва маълумоти "
 "пайвастаи NIS-ро ҳамроҳӣ мекунад."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Хатогӣ, бояд феҳрист бошад."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Хатогӣ, номи домени nis 'none' ё 'localdomain' буда наметавонад"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Илтимос, онро танзим кунед."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Устод бо муваффақият мошинаи шуморо ҳамчун мизоҷи NIS танзим кард."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1578,15 +1552,15 @@ msgstr ""
 "Устод бо муваффақият мошинаи шуморо ҳамчун мизоҷи NIS бо харитаи autofs "
 "танзим кард."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Танзими системаи шумо ҳамчун хидматрасони NIS бо харитаи Autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS бо харитаи Autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Системаи шумо ҳамчун мизоҷи NIS танзим шуда истодааст ..."
 
@@ -1952,7 +1926,7 @@ msgid ""
 msgstr "Устод параметрҳои зеринро барои танзими proxyи Шумо ҷамъ кард:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1984,6 +1958,15 @@ msgstr "Squid proxy"
 msgid "PXE Wizard"
 msgstr "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."
+msgstr ""
+"Шумо бояд номи домени худро дубора ислоҳ кунед, ки набояд қисмати "
+"localdomain ё холӣ-ро дошта бошад. Барои ислоҳкунии он drakconnect- ро сар "
+"диҳед."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXE хидматрасонро барпо созед"
@@ -2351,24 +2334,24 @@ msgstr ""
 msgid "PXE server"
 msgstr "Хидматрасони Ftp"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Устоди Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s вуҷуд надорад."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Ҳама- маҳдудияти роҳ нест"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Қоидаҳои ман - Аз ман Соҳибони иҷозатшуда ва инкоргударо пурсед"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2376,56 +2359,56 @@ msgstr ""
 "Samba ба хидматрасони Шумо имконият медиҳад ки ҳамчун файл амал карда барои "
 "чопихидматрасон дар стансияҳои кории ғайри Linux истифода бурда мешавад."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Устоди Танзими Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Ин устод барои танзими хадамоти Samba дар хидматрасони Шумо ёрӣ мерасонад."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba бояд Гурўҳи кории Windowsе, ки ба он хидмат хоҳад кард, донад."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Гурўҳи корӣ"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Гурўҳи корӣ:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Гурўҳи корӣ нодуруст"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Сарлавҳаи Хидматрасон."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "Бо сарлавҳа ин хидматрасон дар стансияҳои кории Windows муайян карда мешавд."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Сарлавҳа"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Сарлавҳаи Хидмтрасон нодуруст."
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Дараҷаи пайвастшавӣ:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2433,7 +2416,7 @@ msgstr ""
 "* Мисоли 1:ба ҳамаиIP-ҳо дар 150.203 иҷозат медиҳад.*.*; ба ғайр азяк\n"
 "соҳибон иҷозат медиҳанд = 150.203. БА ҒАЙР АЗ 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2442,14 +2425,14 @@ msgstr ""
 "шабакавӣмувофиқат мекунад\n"
 "соҳибон иҷозат медиҳанд = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 "* Намунаи 3: иҷозат ба ҷуфти соҳибон\\nhosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2461,25 +2444,25 @@ msgstr ""
 "соҳибон иҷозат медиҳанд ба = @foonet\n"
 "соҳибон рад менамоянд = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Дар назар доред ки ҳуқуқи дохилшавӣ ҳоло ҳам гузарвожаҳои дараҷаи корвандро "
 "талаб мекунад."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Соҳибони иҷозатшуда:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Инкори соҳибҳо:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Хадамоти Samba-и фаъол"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2489,19 +2472,19 @@ msgstr ""
 "Шумо таъмин кунадва инчунин тақсимоти чопгаронро барои чопгарҳои ба "
 "хидматрасони Шумо пайвастро таъмин кунад."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Маҳалли тақсими файлро дар гирон"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Фаъолкунии Тақсими Чопгари Хидматрасон"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Феҳристони хонагиро барои соҳибонаш дастрас кунед"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2510,28 +2493,28 @@ msgstr ""
 "пайвастбошанд вале Шумо/онҳо бояд барои гузоштани гузарвожа smbpasswd "
 "истифода баранд."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Феҳристи тақсим карда:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Феҳристики шумо мехоҳед тақсим кардан роҳашро нависед"
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Офаридани феҳристи муштарак, агар он мавҷуд набошад"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Офаридани феҳрист бо нокомӣ анҷомид."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Рухсатҳои файл"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2541,62 +2524,62 @@ msgstr ""
 "тарафи  a '@'пеш ояд ба монандӣ ин:\n"
 "root, fred, @users, @чарх барои як иҷозатнома."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "рўйхати хониш:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "рўйхати навиштаҷот:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Чопгарҳое ки Шумо аз дигар корвандҳои маълум дастрас кардан мехоҳед интихоб "
 "кунед"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Ҳамаи чопгарҳоро ба кор андозед"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Танзими Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Устод параметрҳои зеринро барои ба танзим даровардани Samba ҷамъ намуд."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Сарлавҳаи Хидматрасон:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Тақсими файл:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Хидматрасони Чопӣ:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Хона:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Чопгарҳо:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Устод Samba хидматрасони Шуморо муваффақатан танзим дод."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Хидматрасони Samba-и шумо ба танзим дароварда шуда истодааст..."
 
@@ -2849,903 +2832,35 @@ msgstr ""
 "Системаи шумо ҳамчун хидматрасони Apache ба танзим дороварда шуда "
 "истодааст ..."
 
-#~ msgid "Configure OpenLDAP Server "
-#~ msgstr "Ба Танзимдароии Хидматрасони OpenLDAP"
-
-#~ msgid "Configure OpenLDAP server"
-#~ msgstr "Ба танзимдароии хидматрасони OpenLDAP"
-
-#~ msgid "OpenLDAP configuration wizard"
-#~ msgstr "Устоди батанзимдарории OpenLDAP"
-
-#~ msgid "Setup an OpenLDAP server."
-#~ msgstr "OpenLDAP хидматрасонро барпо созед."
-
-#~ msgid "Save an existing configuration"
-#~ msgstr "Захиракунии танзимоти мавҷуда"
-
-#~ msgid ""
-#~ "LDAP Suffix:\n"
-#~ " ex: dc=example,dc=com\n"
-#~ msgstr ""
-#~ "Пасванди LDAP:\n"
-#~ " мисол: dc=example,dc=com\n"
-
-#~ msgid ""
-#~ "LDAP Administrator:\n"
-#~ " ex: cn=admin,dc=example,dc=com\n"
-#~ msgstr ""
-#~ "Идоракунандаи LDAP:\n"
-#~ " мисол: cn=admin,dc=example,dc=com\n"
-
-#~ msgid "You must enter a suffix for LDAP."
-#~ msgstr "Шумо бояд пасвандро барои LDAP ворид кунед."
-
-#~ msgid "Organisation LDAP:"
-#~ msgstr "Ташкилоти LDAP:"
-
-#~ msgid "The wizard successfully added a user in LDAP"
-#~ msgstr "Устод бо муваффақият корвандро ба LDAP илова кард"
-
-#~ msgid ""
-#~ "PXE name: the name displayed in PXE menu (please provide an ASCII word or "
-#~ "a number, without spaces)"
-#~ msgstr ""
-#~ "Номи PXE: номе, ки дар менюи PXE намоиш дода мешавад (марҳамат карда "
-#~ "калима ё рақамро бе фазо нависед)"
-
-#~ msgid "Add option to the PXE boot disk"
-#~ msgstr "Хосиятро барои диски боркунии PXE илова кунед"
-
-#~ msgid "Server - Set configuration of LDAP server"
-#~ msgstr "Хидматрасон - Барпосозии танзими хидматрасони LDAP"
-
-#~ msgid "Apache web server"
-#~ msgstr "Хидматрасони Apache web"
-
-#~ msgid "Copying data to destination directory, can take a while...."
-#~ msgstr ""
-#~ "Нусхабардории додаҳо ба феҳристи мақсад мӯҳлати муайяни вақтро мегирад..."
-
-#~ msgid "Install Server"
-#~ msgstr "Хидматрасони Коргузорӣ"
-
-#~ msgid "Setup a ldap server."
-#~ msgstr "Хидматрасони ldap-ро барпо созед."
-
-#~ msgid "which operation on LDAP:"
-#~ msgstr "ки дар LDAP амал мекунад:"
-
-#~ msgid "Add data in LDAP"
-#~ msgstr "Ба LDAP додаҳоро илова кунед"
-
-#~ msgid "uid, gid, home directory, "
-#~ msgstr "uid, gid, феҳристи хонагӣ, "
-
-#~ msgid "Last Name:"
-#~ msgstr "Насаб:"
-
-#~ msgid "Home Directory:"
-#~ msgstr "Феҳристи Хонагӣ:"
-
-#~ msgid "Login shell:"
-#~ msgstr "Умед:"
-
-#~ msgid "uid number:"
-#~ msgstr "рақами uid:"
-
-#~ msgid "Group ID:"
-#~ msgstr "ID Гурӯҳ:"
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Шумо бояд номи соҳибии худро ислоҳ кунед."
 
 #~ msgid ""
-#~ "LDAP RootDSE\n"
-#~ "\n"
-#~ "example:\n"
-#~ "obelx.nux.com\n"
-#~ "\n"
-#~ "will be in ldap config:\n"
-#~ "\n"
-#~ "dc=obelx,dc=nux,dc=com\n"
-#~ "\n"
-#~ "RootDN is the manager of your ldap server."
+#~ "You need to readjust your domainname. For an LDAP 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 ""
-#~ "LDAP RootDSE\n"
-#~ "\n"
-#~ "мисол:\n"
-#~ "obelx.nux.com\n"
-#~ "\n"
-#~ "дар ldap танзим хоҳад буд:\n"
-#~ "\n"
-#~ "dc=obelx,dc=nux,dc=com\n"
-#~ "\n"
-#~ "RootDN ин мудири хидматрасони ldap-и шумо мебошад."
+#~ "Шумо бояд номи домини худро ислоҳ кунед. Барои хидматрасони LDAP шумо "
+#~ "бояд номи доминро ислоҳ кунед, ки ба localdomain ё қиммати холӣ баробар "
+#~ "нест. Номи соҳиб бояд FQDN бошад: Номи Пурраю Муайяни Домен. Барои ислоҳи "
+#~ "он drakconnect-ро сар диҳед."
 
-#~ msgid "RootDSE"
-#~ msgstr "RootDSE"
+#~ msgid "User Created in: "
+#~ msgstr "Корванд Офарида шудааст дар: "
 
-#~ msgid "RootDN"
-#~ msgstr "RootDN"
+#~ msgid "Administrator"
+#~ msgstr "Идоракунандаи"
 
-#~ msgid "Default OU"
-#~ msgstr "OU бо нобаёнӣ"
+#~ msgid "Domain name: "
+#~ msgstr "Номи домен: "
 
-#~ msgid "Ok Now add entry in LDAP"
-#~ msgstr "Ok Ҳозир дохил кунед ба LDAP"
-
-#~ msgid "Home directory:"
-#~ msgstr "Феҳристи хонагӣ:"
-
-#~ msgid "shadowMax:"
-#~ msgstr "shadowMax:"
-
-#~ msgid "shadowMin:"
-#~ msgstr "shadowMin:"
-
-#~ msgid "shadowWarning:"
-#~ msgstr "shadowWarning:"
-
-#~ msgid "shadowInactive:"
-#~ msgstr "shadowInactive:"
-
-#~ msgid "shadowExpire:"
-#~ msgstr "shadowExpire:"
-
-#~ msgid "objectClass:"
-#~ msgstr "objectClass:"
-
-#~ msgid "Ok Now building your LDAP configuration"
-#~ msgstr "Ok Ҳоло танзими LDAP-и шумо бунёд шуда истодааст"
-
-#~ msgid "Error in Home directory"
-#~ msgstr "Хатогӣ дар феҳристи Хонагӣ:"
-
-#~ msgid "Error, pass could not be empty"
-#~ msgstr "Хатогӣ, гузарвожа холӣ буда наметавонад"
-
-#~ msgid "Error in Login shell"
-#~ msgstr "Хатогӣ дар Ҷилд"
-
-#~ msgid "Please choose a correct one"
-#~ msgstr "Марҳамат карда қиммати дурустро интихоб намоед"
-
-#~ msgid "Please Should be a number"
-#~ msgstr "Илтимос, Бояд рақам бошад"
-
-#~ msgid "The wizard successfully configured your NFS server"
-#~ msgstr "устод бомуввафақатиян хидматрасони NFS ба танзим дароварда шуд"
-
-#~ msgid "The wizard successfully configured the DHCP services of your server."
-#~ msgstr "Манъаи DHCP серверо устод бомуввафақият б танзим двроварда шуд "
-
-#~ msgid "FTP Server"
-#~ msgstr "Хидматрасони FTP"
-
-#~ msgid "News Server"
-#~ msgstr "Хабарҳои хидматрасон"
-
-#~ msgid "NFS Server"
-#~ msgstr "хидматрасони NFS"
-
-#~ msgid "Document Root:"
-#~ msgstr "Решаи Ҳуҷҷат:"
-
-#~ msgid "Configuring the Internet Mail"
-#~ msgstr "Танзими Internet Пост"
-
-#~ msgid "Masquerade not good!"
-#~ msgstr "Ивазкунӣ нағз нест!"
-
-#~ msgid "Choose a country:"
-#~ msgstr "Мамлакатро интихоб намудан:"
-
-#~ msgid "Don't check any box if you don't want to activate your FTP Server."
-#~ msgstr ""
-#~ "Барои хидматрасони FTPро кор нафамудан ягоне аз қутиҳоро озмоиш накунед"
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Пайвастшавӣ ба %s ғайри имкон аст"
 
 #~ msgid ""
-#~ "Warning\n"
-#~ "You are in dhcp, server may not work with your configuration."
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
 #~ msgstr ""
-#~ "Огоҳӣ\n"
-#~ "Шумо дар dhcp мебошед, бо ин танзимдарорӣ эҳтимол хидматрасони шумо кор "
-#~ "накунад."
-
-#~ msgid ""
-#~ "A client of your local network is a machine connected to the network "
-#~ "having its own name and IP number."
-#~ msgstr ""
-#~ "Мизоҷи шабакаи маҳали ки мошина ба шабака пайваст кардаастНом ва IP "
-#~ "номери худро дорад."
-
-#~ msgid ""
-#~ "Note that the given IP number and client name should be unique in the "
-#~ "network."
-#~ msgstr "IP адрес ва номи мизоҷ бояд агона бошад дар Шабака"
-
-#~ msgid "IP number of the machine:"
-#~ msgstr "IP рақами мошина"
-
-#~ msgid "Dhcp server"
-#~ msgstr "Хидматрасони Dhcp"
-
-#~ msgid "Ftp server"
-#~ msgstr "хидматрасони Ftp"
-
-#~ msgid "DNS Configuration Wizard"
-#~ msgstr "Ба танзим даровардани устоди DNS"
-
-#~ msgid "DNS Server Addresses"
-#~ msgstr "Адресҳои шабакаи DNS"
-
-#~ msgid ""
-#~ "DNS will allow your network to communicate with the Internet using "
-#~ "standard internet host names.  In order to configure DNS, you must "
-#~ "provide the IP address of primary and secondary DNS server; usually this "
-#~ "address are given by your Internet provider."
-#~ msgstr ""
-#~ "шабакаи DNS бо Интернет алокаи стандартирои киномҳои хидматрасони "
-#~ "Интернет. Барои ба танзим даровардани DNS, шумо бояд IP-и адреси якум ва "
-#~ "дуюмро ба шабакаи DNS дошта бошед; ин адресҳоро бисёртарбо таҳиягари "
-#~ "интернет"
-
-#~ msgid "IP addresses are a dotted list of four numbers smaller than 256"
-#~ msgstr "Суроғаҳои IP рӯйхати ишорашудаи чаҳор рақам буда аз 256 хурдтар аст"
-
-#~ msgid "Primary DNS Address"
-#~ msgstr "Суроғаи асосии DNSа"
-
-#~ msgid "Secondary DNS Address:"
-#~ msgstr "Адресҳои дуюмаи DNS "
-
-#~ msgid "You have entered an empty address for the DNS server."
-#~ msgstr "шумо адреси холиро ба шабакаи DNS даровардед."
-
-#~ msgid ""
-#~ "Your setting could be accepted, but you will not be able to identify "
-#~ "machine names outside your local network."
-#~ msgstr ""
-#~ "Танзим дарори қабул карда мешад, лекин шумо наметавонид мошинаи худро "
-#~ "ефтаномҳо берун аз шабакаи маҳали"
-
-#~ msgid "Press next to leave these values empty, or back to enter a value."
-#~ msgstr ""
-#~ "Барои қимматиҳоро холи мондан Давомро зер кунед ё қимматиҳоро даровардан "
-#~ "пўшро зер кунед"
-
-#~ msgid ""
-#~ "The wizard collected the following parameters needed to configure your "
-#~ "DNS service:"
-#~ msgstr "манъаи DNS серверо устод ба танзим двроварда шуд"
-
-#~ msgid "Primary DNS Address:"
-#~ msgstr "DNS адреси ҳизира"
-
-#~ msgid "Dns (add client)"
-#~ msgstr "Dns (мизоҷро илова намоед)"
-
-#~ msgid "Cancel"
-#~ msgstr "Бекор кардан"
-
-#~ msgid "Next"
-#~ msgstr "Навбатӣ"
-
-#~ msgid "Previous"
-#~ msgstr "Гузашта"
-
-#~ msgid "Filesystem            Size  Used Avail Use% Mounted on"
-#~ msgstr "Файлсистем         Андозаи Истиф Истиф Фои% Васлшуда ба"
-
-#~ msgid "OK"
-#~ msgstr "ОК"
-
-#~ msgid "Quit"
-#~ msgstr "Баромадан"
-
-#~ msgid "Configure"
-#~ msgstr "Ба танзим даровардан"
-
-#~ msgid ""
-#~ "You have to configure the basic network parameters before launching this "
-#~ "wizard."
-#~ msgstr ""
-#~ "Шумо бояд параметри шабакаи оддиро ба танзим дароред пеш аз сардиҳииустод"
-
-#~ msgid "You have entered a machine name or an IP number already used."
-#~ msgstr "Ном ва IP рақами дохил карда шуда истифода бурдашкудагиаст"
-
-#~ msgid "You need to be root to run this wizard"
-#~ msgstr "Шумо бояд рут бошед барои корандози кардани устод"
-
-#~ msgid ""
-#~ "Press next if you want to change the already existing value, or back to "
-#~ "correct your choice."
-#~ msgstr ""
-#~ "Агар шумо қимматиҳоро дигар қунед давомро зер қунед ё қафоро "
-#~ "бароиислоҳигии интихоб кардагиатон"
-
-#~ msgid "Network not configured yet"
-#~ msgstr "Шабака ба танзим дароварда нашудааст"
-
-#~ msgid ""
-#~ "If you choose to configure now, you will automatically continue with the "
-#~ "Client configuration"
-#~ msgstr ""
-#~ "Агар шумо ҳозир ба танзим дароварданро интихоб кунед, шумо автоматики бо "
-#~ "Мизоҷи ба танзим дарори давом медиҳед."
-
-#~ msgid ""
-#~ "Press next to configure these parameters now, or Cancel to exit this "
-#~ "wizard."
-#~ msgstr ""
-#~ "Барои ҳозир ба танзим даровардани параметрҳо навбатиро пахш кунед, ё "
-#~ "барои аз ин устод баромадан Бекор карданро"
-
-#~ msgid "Please enter a username and password to add a user"
-#~ msgstr "Барои корванд илова кардан номи корвандро ва гузарвожа нависед"
-
-#~ msgid "MySQL Database wizard"
-#~ msgstr " манъаи MySQL устод "
-
-#~ msgid "Note: This user will have all permissions"
-#~ msgstr ":ин корванд ҳама рухсатҳо дорад"
-
-#~ msgid "Add"
-#~ msgstr "илова кардан"
-
-#~ msgid "The wizard successfully configured your MySQL Database Server"
-#~ msgstr "манъаи MySQL серверо устод бомуввафақият ба танзим двроварда шуд."
-
-#~ msgid "To run your server, you first need to specify a root password"
-#~ msgstr ""
-#~ "шумо бояд аввал гузарвожаи рутро маълум кунед барои корандози кардани "
-#~ "шабака"
-
-#~ msgid "Please type a password for the root user:"
-#~ msgstr "гузарвожаро ҳуруфчини кунед барои корванди рут"
-
-#~ msgid "MySQL Database Server"
-#~ msgstr "Манъаи MySQL сервер"
-
-#~ msgid "Configuring the MySQL Database Server"
-#~ msgstr "манъаи MySQL серверро ба танзим даровардан"
-
-#~ msgid ""
-#~ "The wizard collected the following parameters needed to configure your "
-#~ "MySQL Database Server"
-#~ msgstr ""
-#~ "Барои параметраи MySQLро ба тазим даровардан устод бояд инро ҷам "
-#~ "кунадМанъаи сервер"
-
-#~ msgid ""
-#~ "To accept this value, and configure your server, click on \\qConfirm\\q "
-#~ "or use the Back button to correct them."
-#~ msgstr ""
-#~ "барои қабулкадани қимматиҳо ва ба танзим даровардани хидматрасон, инро "
-#~ "зер кунед \"тасдиқ кардан\" ё барои ислоҳ кардан дагмаи қафоро истифода "
-#~ "баред."
-
-#~ msgid ""
-#~ "This wizard will help you configuring the MySQL Database Server for your "
-#~ "network."
-#~ msgstr ""
-#~ "Устод ба шумо ёри медиҳад ба танзим дарории MySQL-ии Манъаи серверШабака"
-
-#~ msgid ""
-#~ "If you choose to configure now, you will automatically continue with the "
-#~ "MySQL Database configuration"
-#~ msgstr ""
-#~ "Агар шумо ҳозир ба танзим даровардана интихоб кунид, шумо автоматики боБа "
-#~ "танзим дарории манъаи MySQL давом дорад"
-
-#~ msgid "Confirm"
-#~ msgstr "тасдиқ кардан "
-
-#~ msgid "DHCP Configuration Wizard"
-#~ msgstr "DHCP устоди ба танзим дарори"
-
-#~ msgid "Fix it"
-#~ msgstr "Дуруст кардан"
-
-#~ msgid "Is the server authoritative? Ask your system administrator."
-#~ msgstr "шабакаи шум бо эътибор? Раиси системаро пурсед."
-
-#~ msgid ""
-#~ "The firewall can be configured to offer different levels of protection; "
-#~ "choose the level that corresponds to your needs.  If you don't know, the "
-#~ "Medium level is usually the most appropriate."
-#~ msgstr ""
-#~ "барои ба танзим даровардани Firewall шумо метонед дигар дараҷаҳои "
-#~ "нигоҳдоштанро интихоб кунед.дараҷаҳоро интихоб кунед Ки ба шумо мувофиқ "
-#~ "бошад. Агар шумо надонед, инмиёна биёртар истифода бурдашудааст."
-
-#~ msgid "Fix It"
-#~ msgstr "дуруст кардан"
-
-#~ msgid "Firewall Network Device"
-#~ msgstr "дастгоҳи шабакаи Firewall"
-
-#~ msgid ""
-#~ "The firewall needs to know how your server is connected to Internet; "
-#~ "choose the device you are using for the external connection."
-#~ msgstr ""
-#~ "Firewall  донистан мехоҳад шабакаи шумо чихел ба Интернет пайваст шудаед; "
-#~ "интихоб кунеддастгоҳики шумо истифода бурда истодаед пайвасти беруниаст."
-
-#~ msgid "Firewall wizard"
-#~ msgstr "устоди Firewall"
-
-#~ msgid "Device"
-#~ msgstr "дастгоҳ"
-
-#~ msgid "Medium - web, ftp and ssh shown to outside"
-#~ msgstr "миёнаи- web,ftp ва ssh ба берун нишон додашудааст."
-
-#~ msgid "This wizard will help you configuring your server firewall."
-#~ msgstr ""
-#~ "Ин устод ба шумо ёри мерасонад ба танзим даровардани шабакаи Firewall"
-
-#~ msgid "Configuring the Firewall"
-#~ msgstr "Ба танзим даровардани Firewall"
-
-#~ msgid "None - No protection"
-#~ msgstr "ягон- нигоҳдоштан нест"
-
-#~ msgid ""
-#~ "The firewall protects your internal network from unauthorized accesses "
-#~ "from the Internet."
-#~ msgstr "Firewall шуморо аз даромадани иҷозат нашуда нигоҳ дошт аз Интернет"
-
-#~ msgid "The wizard successfully configured your server firewall."
-#~ msgstr "Устод боммувафақатиян шабакаи Firewallро ба танзим даровард."
-
-#~ msgid "Something terrible happened"
-#~ msgstr "Ягон чизе нохуши рўй дода аст."
-
-#~ msgid "Exit"
-#~ msgstr "хуруҷ"
-
-#~ msgid "Low - Light filtering, standard services available"
-#~ msgstr "Паст- полудани сабук, хадамоти стандарти дастгир аст."
-
-#~ msgid "Firewall Configuration Wizard"
-#~ msgstr "устоди ба танзим дарории Firewall"
-
-#~ msgid "Protection Level"
-#~ msgstr "дараҷаи ҳифозат"
-
-#~ msgid "Protection Level:"
-#~ msgstr "Дараҷаи ҳифозат:"
-
-#~ msgid "The device name is not correct"
-#~ msgstr "номи дастгоҳ нодуруст"
-
-#~ msgid "Internet Network Device:"
-#~ msgstr "дастгоҳи шабакаи интернет"
-
-#~ msgid ""
-#~ "The wizard collected the following parameters needed to configure your "
-#~ "firewall:"
-#~ msgstr ""
-#~ "Устод ба танзим даровардан ба мизоҷ инро дохил кардан даркорFirewall"
-
-#~ msgid "Strong - no outside visibility, users limited to web"
-#~ msgstr ""
-#~ "Сахт- аз берун дида намешавад, карвандони web истифода бурда намешавад."
-
-#~ msgid ""
-#~ "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-#~ "example, if your provider is \\qprovider.com\\q, the internet news server "
-#~ "is usually \\qnews.provider.com\\q."
-#~ msgstr ""
-#~ "Номи хидматгори Интернет бояд дар варақа бошад\"host.domain.domaintype\"; "
-#~ "барои намуна, агар таҳиягари шумо \"provider.com\",  Хидматрасони "
-#~ "хабарҳои интернетбисёртар \"news.provider.com\"."
-
-#~ msgid ""
-#~ "You can select the kind of address that outgoing mail will show in the "
-#~ "\\qFrom:\\q and \\qReply-to\\q field."
-#~ msgstr ""
-#~ "Шумо метавонед намуди суроғаро дар пости рафтаистода дар майдони \"From:"
-#~ "\" and \"Reply-to\" интихоб кунед."
-
-#~ msgid "Hmmm"
-#~ msgstr "Hmmm"
-
-#~ msgid ""
-#~ "If you choose to configure now, you will automatically continue with the "
-#~ "POSTFIX configuration"
-#~ msgstr ""
-#~ "Агар Шумо ҳозир танзим доданро интихоб кунед, Шумо ба таври автоматикӣ бо "
-#~ "танзими POSTFIX давом медиҳед"
-
-#~ msgid "There seems to be a problem..."
-#~ msgstr "праблема буромадаги..."
-
-#~ msgid "Do It"
-#~ msgstr "Инро кунед"
-
-#~ msgid ""
-#~ "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-#~ "example, if your provider is \\qprovider.com\\q, the internet mail server "
-#~ "is usually \\qsmtp.provider.com\\q."
-#~ msgstr ""
-#~ "Номи соҳибони Internet бояд дар намуди \"host.domain.domaintype\" бошад; "
-#~ "масалан, агар таҳиягари Шумо \"provider.com\" бошад, одатан хидматрасони "
-#~ "пости internet \"smtp.provider.com\" аст."
-
-#~ msgid "Mail Address:"
-#~ msgstr "Суроғаи постӣ"
-
-#~ msgid ""
-#~ "You can safely select \\qNo upper level proxy\\q if you don't need this "
-#~ "feature."
-#~ msgstr ""
-#~ "Агар ба шумо ин хосият зарур набошад Шумо метавонед \"бе proxy дараҷаи "
-#~ "болоӣ\"-ро интихоб кунед. "
-
-#~ msgid "/etc/services:"
-#~ msgstr "хадамоти /etc/:"
-
-#~ msgid ""
-#~ "Enter the qualified hostname (like \\qcache.domain.net\\q) and the port "
-#~ "of the proxy to use."
-#~ msgstr ""
-#~ "Номи соҳиби qualified дохил кунед (ба монанди \"cache.domain.net\") ва "
-#~ "бандари proxy барои истифода."
-
-#~ msgid ""
-#~ "If you choose to configure now, you will automatically continue with the "
-#~ "Proxy configuration."
-#~ msgstr ""
-#~ "Агар Шумо ҳозир танзим доданро интихоб кунед, Шумо ба таври автоматикӣ бо "
-#~ "танзими Proxy давом медиҳед "
-
-#~ msgid ""
-#~ "You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q "
-#~ "or a text format like \\q.domain.net\\q"
-#~ msgstr ""
-#~ "Шумо метавонед ё шакли рақамӣ ба монанди \"192.168.1.0/255.255.255.0\" ё "
-#~ "шакли матниро ба монанди \".domain.net\" истифода баред"
-
-#~ msgid "This Wizard needs to run as root"
-#~ msgstr "Ин Устод бояд ҳамчун root корандозӣ шавад"
-
-#~ msgid ""
-#~ "* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny "
-#~ "access from one particular host\\nhosts allow = @foonet\\nhosts deny = "
-#~ "pirate"
-#~ msgstr ""
-#~ "* Намунаи 4: танҳо соҳибҳои дар NIS шабакагурўҳи \"foonet\", буда иҷозат "
-#~ "дода,пайвастшавиро аз соҳиби муайяни host\\nhosts рад кун @foonet\\nhosts "
-#~ "иҷозат роҳзан=рад"
-
-#~ msgid ""
-#~ "If you choose to configure now, you will automatically continue with the "
-#~ "SAMBA configuration"
-#~ msgstr ""
-#~ "Агар Шумо ҳозир танзим доданро интихоб кунед, шумо ба таври автоматикӣ бо "
-#~ "танзимдарориSAMBA корро давом медиҳед"
-
-#~ msgid "The host name is not correct"
-#~ msgstr "Номи соҳиб нодуруст"
-
-#~ msgid ""
-#~ "Devices are presented with the Linux name and, if known, with the card "
-#~ "description."
-#~ msgstr ""
-#~ "Дастгоҳҳо бо номи Linux нишон дода шудаанд ва агар маълум бошад, бо "
-#~ "маълумот оид ба карт."
-
-#~ msgid ""
-#~ "Host names must be in the form \\qhost.domain.domaintype\\q; if your "
-#~ "server will be an Internet server, the domain name should be the name "
-#~ "registered with your provider. If you will only have intranet any valid "
-#~ "name is OK, like \\qcompany.net\\q."
-#~ msgstr ""
-#~ "Номи соҳиб бояд дар намуди зерин бошад \"host.domain.domaintype\"; агар "
-#~ "хидматрасони Шумо хидматрасони Internet бошад, номи хидматрасони маҳаллӣ "
-#~ "бояд номи бо таҳиягари шумо руйхат шуда бошад. Агар шумо танҳо шабакаи "
-#~ "дохилӣ доштанӣ бошед ҳама ном дуруст аст, ба монанди \"company.net\"."
-
-#~ msgid "net device"
-#~ msgstr "дастгоҳи шабака"
-
-#~ msgid "Network Address"
-#~ msgstr "Суроғаи Шабаки"
-
-#~ msgid "Gateway device:"
-#~ msgstr "Дастгоҳи асосӣ:"
-
-#~ msgid "Device:"
-#~ msgstr "Дастгоҳ:"
-
-#~ msgid ""
-#~ "You should not run any other applications while running this wizard and "
-#~ "at the end of the wizard you should exit your session and login again."
-#~ msgstr ""
-#~ "Шумо бояд ягон замимаи дигарро ҳангоми корандозии ин устод кор андозед ва "
-#~ "дарохири кори устод шумо бояд корро тамом карда аз нав дароед."
-
-#~ msgid "Basic Network Configuration Wizard"
-#~ msgstr "Устоди Танзими Асосии Шабака"
-
-#~ msgid ""
-#~ "In regards to these wizards, your computer is seen as a server managing "
-#~ "his own local network (C class network)."
-#~ msgstr ""
-#~ "Ба назари ин устод, компутери шумо ҳамчун хидматрасоне, ки шабакаи "
-#~ "маҳаллии худро идоракунанда дида мешавад (хидматрасони синфи C)"
-
-#~ msgid "Network Address:"
-#~ msgstr "Суроғаи шабака:"
-
-#~ msgid "Server Address"
-#~ msgstr "Суроғаи Хидматрасон"
-
-#~ msgid "Note about networking"
-#~ msgstr "Доир ба шабакакунӣ диққат андозед"
-
-#~ msgid "Wizard Error."
-#~ msgstr "Хатогии Устод."
-
-#~ msgid "IP net address:"
-#~ msgstr "IP суроғаи шабака:"
-
-#~ msgid ""
-#~ "Note: the gateway IP address should be non empty if you want an access to "
-#~ "outside world."
-#~ msgstr ""
-#~ "Дар назар доред: IP суроғаи дарвоза набояд холӣ бошад агар шумо хоҳед ки "
-#~ "бо ҷаҳони беруна пайваст бошед."
-
-#~ msgid "Server Address:"
-#~ msgstr "Суроғаи Хидматрасон:"
-
-#~ msgid "Server Wizard"
-#~ msgstr "Устоди Хидматрасон"
-
-#~ msgid "This wizard will set the basic networking parameters of your server."
-#~ msgstr ""
-#~ "Ин устод параметрҳои шабакавии асосии хидматрасони шуморо кор мегузорад."
-
-#~ msgid ""
-#~ "External connection is a network from which the computer is client "
-#~ "(Internet or upstream network), connected using another network card or a "
-#~ "modem."
-#~ msgstr ""
-#~ "Пайвастшавии беруна ин шабакаест, ки аз он компутер мизоҷ аст (Internet ё "
-#~ "шабакаи болои), ки бо истифодаи дигар шабака ё модем пайваст мешавад."
-
-#~ msgid "The network address is wrong"
-#~ msgstr "Суроғаи шабака нодуруст"
-
-#~ msgid ""
-#~ "The server IP address is a number identifing your server in your network; "
-#~ "the proposed value designed for a private network , with no internet "
-#~ "visibility, or connected using IP masquerading; unless you know what you "
-#~ "are doing, accept the default value."
-#~ msgstr ""
-#~ "Раками IP хидматрасон ин ракмамест, ки хидматрасони шуморо дар шабакаи "
-#~ "шумо шинохта мешавад; раками пешниҳод шуда барои шабакаи шахсӣ, бе биниши "
-#~ "Internet, ё бо ивази IP пайвастшуда, сохта шудааст; агар шумо чи кор "
-#~ "карданро надонед, раками пешниҳодшударо интихоб кунед."
-
-#~ msgid ""
-#~ "This page computes the default server address; it should be invisible."
-#~ msgstr "Ин саҳифа суроғаи хидматрасонро меёбад; он бояд ноаён бошад."
-
-#~ msgid "This page computes the domainname; it should be invisible"
-#~ msgstr ""
-#~ "Ин саҳифа номи хидматрасони маҳаллиро ҳисоб мекунад; он бояд ноаён бошад"
-
-#~ msgid ""
-#~ "This wizard will help you in configuring the basic networking services of "
-#~ "your server."
-#~ msgstr ""
-#~ "Ин устод барои танзим додани хадамоти шабакавии асосии хидматрасони шумо "
-#~ "ёрӣ мерасонад"
-
-#~ msgid "Server IP address:"
-#~ msgstr "IP суроғаи хидматрасон"
-
-#~ msgid ""
-#~ "Choose the network device (usually a card) the server should use to "
-#~ "connect to your network. It's the device for the local network, probably "
-#~ "not the same device used for internet access."
-#~ msgstr ""
-#~ "Дастгоҳи шабакаеро ки онро хидматрасон барои пайвастшави ба шабакаи шумо "
-#~ "истифода мебарад интихоб кунед (одатан карт). Он дастгоҳест, ки барои "
-#~ "шабакаи дохилӣ, вале мумкин аст на барои пайвастшавии Internet истифода "
-#~ "бурда мешавад."
-
-#~ msgid ""
-#~ "The hostname is the name under which your server will be known from the "
-#~ "other workstations in your network and maybe on the Internet (depending "
-#~ "of your upstream configuration)."
-#~ msgstr ""
-#~ "Номи соҳиб номест, ки бо он хидматрасони шумо аз дигар компутерҳо дар "
-#~ "шабакаи шумо ва мумкин аст аз Internet (вобаста ба танзимҳои болоии шумо) "
-#~ "шинохта мешавад."
-
-#~ msgid "The Server IP address is incorrect"
-#~ msgstr "IP суроғаи хидматрасон нодуруст"
-
-#~ msgid ""
-#~ "The network address is a number identifying your network; the proposed "
-#~ "value is designed for a configuration not connected to Internet, or "
-#~ "connected using IP masquerading; unless you know what you are doing, "
-#~ "accept the default value."
-#~ msgstr ""
-#~ "Рақами шабака ин рақамест, ки шабакаи шуморо шинос мекунад; қиммати "
-#~ "пешкашшудабарои танзими бе пайвастшавии Internet ё пайвастшави бо ивази "
-#~ "IP сохта шудааст;агар шумо чи кор карданро надонед, қиммати пешкашшударо "
-#~ "интихоб кунед."
-
-#~ msgid "Configuring your network"
-#~ msgstr "Танзимдарории шабакаи шумо"
-
-#~ msgid ""
-#~ "(you can change here these values if you know exactly what you're doing)"
-#~ msgstr ""
-#~ "(шумо метавонед ин қимматҳоро инҷо иваз кунед, агар ҳақиқатан чи кор "
-#~ "карданро донед)"
-
-#~ msgid ""
-#~ "The wizard successfully configured the basic networking services of your "
-#~ "server."
-#~ msgstr ""
-#~ "Устод мувафаққатона хадамоти асосии хидматрасони шуморо танзим даровард."
-
-#~ msgid ""
-#~ "The wizard collected the following parameters needed to configure your "
-#~ "network"
-#~ msgstr ""
-#~ "Устод параметрҳои зерине, ки барои танзим додани шабака заруранд ҷамъ кард"
-
-#~ msgid ""
-#~ "So, it's very probable that domain name and IP adresses for this local "
-#~ "network are DIFFERENT from the server \\qexternal\\q connection."
-#~ msgstr ""
-#~ "Барои ҳамин ҳам мумкин аст, ки номи хидматрасони маҳаллӣ ва IP суроғаҳо "
-#~ "барои иншабака аз пайвастшавии хидматрасони \"external\" ДИГАР бошад."
-
-#~ msgid ""
-#~ "Here is your current value for the external gateway (value specified "
-#~ "during the initial installation). The device (network card or modem) "
-#~ "should be different from the one used for the internal network."
-#~ msgstr ""
-#~ "Ин қиммати ҷории шумо барои дарвозаи беруна (қимате, ки ҳангоми "
-#~ "коргузории дохилӣ маълум карда шуд). Дастгоҳ (карти шабака ё модем) бояд "
-#~ "аз дастгоҳе, ки барои шабакаи дохилӣ кор фармуда мешавад фарқ кунад."
-
-#~ msgid ""
-#~ "Network addresses are a list of four numbers smaller than 256, separated "
-#~ "by dots; the last number of the list must be zero."
-#~ msgstr ""
-#~ "Суроғаҳои шабака ин рўйхати иборат аз 4 рақамҳои аз 256 хурде, ки бо "
-#~ "нуқтаҳо ҷудошудаанд; рақами охирини рўйхат бояд сифр бошад."
-
-#~ msgid "Computer Science Department, University of Wisconsin-Madison"
-#~ msgstr "Кафедраи Илмхои Компутерӣ, Университети Висконсин-Мэдисон"
-
-#~ msgid "Fukuoka university, Fukuoka, Japan"
-#~ msgstr "Fukuoka university, Fukuoka, Japan"
-
-#~ msgid "University of Manchester, Manchester, England"
-#~ msgstr "University of Manchester, Manchester, England"
-
-#~ msgid "Baylor College of Medicine, Houston, Tx"
-#~ msgstr "Коллеҷи тиббии Бейлор, Хьюстон, Тх"
-
-#~ msgid "University of Adelaide, South Australia"
-#~ msgstr "University of Adelaide, South Australia"
-
-#~ msgid "CISM, Lyon, France"
-#~ msgstr "CISM, Lyon, France"
-
-#~ msgid "Altea (Alicante/SPAIN)"
-#~ msgstr "Altea (Alicante/SPAIN)"
-
-#~ msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
-#~ msgstr ""
-#~ "Кафедраи Фаннҳои Компутерӣ, Strathclyde University, Glasgow, Scotland "
-
-#~ msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-#~ msgstr "Scientific Center in Chernogolovka, Moscow region, Russia"
-
-#~ msgid "Swiss Fed. Inst. of Technology"
-#~ msgstr "Swiss Fed. Inst. of Technology"
-
-#~ msgid "University of Oslo, Norway"
-#~ msgstr "Университети Осло, Норвеж"
-
-#~ msgid "Trinity College, Dublin, Ireland"
-#~ msgstr "Trinity College, Dublin, Ireland"
-
-#~ msgid "Inet, Inc., Seoul, Korea"
-#~ msgstr "Inet, Inc., Seoul, Korea"
-
-#~ msgid "LAAS/CNRS, Toulouse, France"
-#~ msgstr "LAAS/CNRS, Toulouse, France"
-
-#~ msgid "CRIUC, Universite de Caen, France"
-#~ msgstr "CRIUC, Universite de Caen, France"
-
-#~ msgid "Singapore"
-#~ msgstr "Singapore"
-
-#~ msgid "MIT Information Systems, Cambridge, MA"
-#~ msgstr "МИТ Системҳои ахбори, Кэмбридж, МА"
-
-#~ msgid "University of Regina, Regina, Saskatchewan, Canada"
-#~ msgstr "University of Regina, Regina, Saskatchewan, Canada"
-
-#~ msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
-#~ msgstr "National Research Council of Canada, Ottawa, Ontario, Canada"
-
-#~ msgid "UNLV College of Engineering, Las Vegas, NV"
-#~ msgstr "UNLV College of Engineering, Las Vegas, NV"
-
-#~ msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-#~ msgstr "CRI, Campus d'Orsay, Universite Paris Sud, France"
-
-#~ msgid "Penn State University, University Park, PA"
-#~ msgstr "Университети Пен Стейт, Юниверсити Парк, ПА"
-
-#~ msgid "University of Oklahoma, Norman, Oklahoma, USA"
-#~ msgstr "University of Oklahoma, Norman, Oklahoma, USA"
-
-#~ msgid "SCI, Universite de Limoges, France"
-#~ msgstr "SCI, Universite de Limoges, France"
-
-#~ msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-#~ msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-
-#~ msgid "WARNING"
-#~ msgstr "ОГОҲ"
-
-#~ msgid "(please, choose servers in your geographical area)"
-#~ msgstr ""
-#~ "(лутфан, хидматрасонҳое, ки дар минтақаи географии Шумо ҳаст интихоб "
-#~ "кунед)"
-
-#~ msgid "Loria, Nancy, France"
-#~ msgstr "Loria, Nancy, France"
-
-#~ msgid "Washington State University Tri-Cities, Richland, Wa"
-#~ msgstr "Washington State University Tri-Cities, Richland, Wa"
-
-#~ msgid "The Chinese University of Hong Kong"
-#~ msgstr "The Chinese University of Hong Kong"
-
-#~ msgid "activate user module"
-#~ msgstr "фаъолкунии модули корванд"
-
-#~ msgid ""
-#~ "To accept this value, and configure your server, click on \"Confirm\" or "
-#~ "use the Back button to correct them."
-#~ msgstr ""
-#~ "барои қабулкадани қимматиҳо ва ба танзим даровардани хидматрасон, инро "
-#~ "зер кунед \"тасдиқ кардан\" ё барои ислоҳ кардан дагмаи қафоро истифода "
-#~ "баред."
-
-#~ msgid ""
-#~ "So, it's very probable that domain name and IP adresses for this local "
-#~ "network are DIFFERENT from the server \"external\" connection."
-#~ msgstr ""
-#~ "Барои ҳамин ҳам мумкин аст, ки номи хидматрасони маҳаллӣ ва IP суроғаҳо "
-#~ "барои иншабака аз пайвастшавии хидматрасони \"external\" ДИГАР бошад."
-
-#~ msgid ""
-#~ "Host names must be in the form \"host.domain.domaintype\"; if your server "
-#~ "will be an Internet server, the domain name should be the name registered "
-#~ "with your provider. If you will only have intranet any valid name is OK, "
-#~ "like \"company.net\"."
-#~ msgstr ""
-#~ "Номи соҳиб бояд дар намуди зерин бошад \"host.domain.domaintype\"; агар "
-#~ "хидматрасони Шумо хидматрасони Internet бошад, номи хидматрасони маҳаллӣ "
-#~ "бояд номи бо таҳиягари шумо руйхат шуда бошад. Агар шумо танҳо шабакаи "
-#~ "дохилӣ доштанӣ бошед ҳама ном дуруст аст, ба монанди \"company.net\"."
-
-#~ msgid "Public directory:"
-#~ msgstr "Феҳристи умуми"
+#~ "Шумо бояд номи домени NIS-и худро ислоҳ кунед. Барои NIS ба шумо номи "
+#~ "домени дурусти NIS лозим аст, ки ба localdomain ё қиммати холӣ баробар "
+#~ "нест."
diff --git a/po/tl.po b/po/tl.po
index b5543d4e..bbbb088f 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-04-09 00:08+0800\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@list.comitus.net>\n"
@@ -22,31 +22,31 @@ msgstr "configuration wizard"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Babala."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Error."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Maligayang bati"
 
@@ -89,11 +89,11 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(hindi mo kailangang i-type ang domain pagkatapos ng pangalan)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Client identification:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -101,7 +101,7 @@ msgstr ""
 "Tandaan na ang binigay na IP address at pangalan ng client ay dapat unique o "
 "walang kapareho sa iyong network."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -111,21 +111,21 @@ msgstr ""
 "sa pangalanngclient.kumpanya.net. Bawat makina sa network ay dapat may "
 "(unique) na IP address, katulad ng dating syntax na may tuldok."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Pangalan ng makina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP address ng makina:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Babala"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Ikaw ay nasa dhcp, ang server ay maaaring hindi gagana gamit ang "
@@ -134,12 +134,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Error"
@@ -184,12 +184,33 @@ msgstr "IP ng client:"
 msgid "The wizard successfully added the client."
 msgstr "Matagumpay na naidagdag ng wizard ang client."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Kailangan mong i-adjust muli ang domainname mo. Para sa DNS server kailangan "
+"mo ng tamang domainname, na hindi pareho sa localdomain o none (wala). "
+"Ilunsad ang drakconnect para i-adjust ito."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+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 ""
+"Kailangan mong i-adjust muli ang domainname mo. Para sa DNS server kailangan "
+"mo ng tamang domainname, na hindi pareho sa localdomain o none (wala). "
+"Ilunsad ang drakconnect para i-adjust ito."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Isara"
 
@@ -284,8 +305,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "naka-disable"
@@ -294,8 +315,8 @@ msgstr "naka-disable"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "naka-enable"
@@ -308,53 +329,38 @@ msgstr "Interface:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Matagumpay na na-configure ng wizard ang mga DHCP service."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Nabigo"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Ilunsad muli ang drakwizard, at subukang baguhin ang ilang parameter."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Kailangan mong i-adjust muli ang hostname mo."
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"Kailangan mong i-adjust muli ang domainname mo. Para sa DNS server kailangan "
-"mo ng tamang domainname, na hindi pareho sa localdomain o none (wala). "
-"Ilunsad ang drakconnect para i-adjust ito."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Master DNS server"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Slave DNS server"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Magdagdag ng host sa DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Mag-alis ng host sa DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -362,11 +368,11 @@ msgstr ""
 "DNS (Domain Name Server) ay ang service na nagma-map ng IP address ng isang "
 "makina sa isang pangalan ng internet host."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "DNS Master configuration wizard"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -377,47 +383,47 @@ msgstr ""
 "local na pangalan ng mga computer, na ang mga hindi local na hiling ay "
 "ipinapadala sa DNS sa labas."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Ano ang gusto mong gawin:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS server"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(hindi mo kailangang idagdag ang domain pagkatapos ng pangalan)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Server IP:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS domainname:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Piliin ang host na gusto mong alisin sa sumusunod na talaan."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Mag-alis ng host sa mayroon nang DNS configuration."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Alisin ang host:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Pangalan ng Computer:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -426,11 +432,11 @@ msgstr ""
 "Ang slave name server ay magpapagaan ng pasan ng primary name server, at "
 "aandar bilang backup na server, kung sakaling hindi maabot ang master server."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP Address ng master DNS server:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -438,11 +444,11 @@ msgstr ""
 "Nangyayari lang ang forwarding (pagpapasa) sa mga query (tanong) na walang "
 "kapangyarihan ang server at  walang sagot sa cache nito."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP ng forwarder mo"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -450,15 +456,15 @@ msgstr ""
 "Kung kailangan mo ito at alam mo ang IP ng forwarder mo ipasok ang IP "
 "address nito, kung hindi mo alam iwanang blangko ito"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Panglabas na DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Magdagdag ng search domain"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -466,7 +472,7 @@ msgstr ""
 "Ang domainname nitong server ay automatic na idinadagdag, at hindi mo na "
 "kailangang idagdag ito dito."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -479,29 +485,29 @@ msgstr ""
 "pamamagitan ng paglista ng nais na domain search path na sumusunod sa search "
 "na keyword."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Default na domain name na hahanapan:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Hindi ito balidong IP address para sa forwarder mo... pindutin ang 'Kasunod' "
 "para magpatuloy"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Hindi ito balidong IP address ng Master DNS... pindutin ang 'Kasunod' para "
 "magpatuloy"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 "Hindi ito balidong IP address... pindutin ang 'Kasunod' para magpatuloy"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -509,11 +515,11 @@ msgstr ""
 "Tila itong host ay nasa DNS configuration mo na... pindutin ang 'Kasunod' "
 "para magpatuloy"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Error:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -521,7 +527,7 @@ msgstr ""
 "Tila wala ito sa kasalukuyang DNS configuration mo... pindutin ang 'Kasunod' "
 "para magpatuloy"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -529,72 +535,72 @@ msgstr ""
 "Tila walang nai-set na DNS server sa pamamagitan ng wizard. Patakbuhin ang "
 "DNS wizard: Master DNS server."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Tila ikaw ay hindi isang master DNS server, pero isang slave. Kaya hindi ako "
 "makapagdagdag/makapag-alis ng host."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Bubuuin Ngayon ng wizard ang iyong DNS slave configuration"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "gamit itong configuration:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Ang client na may ganitong identification ay idadagdag sa DNS mo"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Pangalan ng computer:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP address ng computer:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Ang client na may ganitong identification ay aalisin mula sa DNS mo"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Ang DNS server ay ico-configure gamit ang sumusunod na configuration"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Server Hostname:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Domainname:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Matagumpay na naidagdag ng wizard ang host sa DNS mo."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Matagumpay na naalis ng wizard ang host mula sa DNS mo."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Matagumpay na na-configure ng wizard ang DNS service ng server mo."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 "Pakilunsad muli ang drakwizard, at subukang baguhin ang ilang parameter."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Kino-configure ang sistema mo bilang Master DNS server ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Kino-configure ang sistema mo bilang Slave DNS server ..."
 
@@ -622,7 +628,7 @@ msgstr "Mail server"
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba server"
 
@@ -647,7 +653,7 @@ msgstr "NIS server autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrake Install server"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -673,7 +679,7 @@ msgstr ""
 "%s ay hindi naka-install\n"
 "I-click ang \"Kasunod\" para i-install o ang \"I-cancel\" para hindi tumuloy"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Nabigo ang pag-i-install"
 
@@ -928,15 +934,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab configuration wizard"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Kailangan mong i-adjust muli ang domainname mo, na hindi pareho sa "
-"localdomain o none (wala). Pakilunsad ang drakconnect para i-adjust ito."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -948,7 +946,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:59
+#: ../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 "
@@ -959,40 +957,40 @@ msgstr ""
 "backup ng lahat ng mga dati mong mga configuration file para sa mga service "
 "na ito."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Maligayang pagdating sa Kolab Groupware server configuration Wizard."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Magpasok ng password para sa account ng manager ng Kolab server."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Password di-magkatugma, o null password, pakitama."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Password:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Password ulit:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Mail domain:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -1001,260 +999,245 @@ msgstr ""
 "'manager', gamit ang password na ipinasok mo, sa https://127.0.0.1/kolab/"
 "admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Tumatakbo ang pag-i-install"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Kino-configure ang Kolab server sa iyong sistema..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap wizard"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Kailangan mong i-adjust muli ang domainname mo. Para sa LDAP server "
-"kailangan mo ng tamang domainname, na hindi pareho sa localdomain o none "
-"(wala). Ilunsad ang drakconnect para i-adjust ito."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "LDAP configuration wizard"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "Magdagdag - magdagdag ng entry sa LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "LDAP configuration wizard"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "LDAP configuration wizard"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Mag-set ng PXE server."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Install server configuration"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Pangalan ng User:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Unang Pangalan:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Pangalan ng User:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Password"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Password ulit:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Hindi pareho ang mga password"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Kino-configure ang Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Domainname:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Domainname:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Directory ng TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Directory ng TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Password:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Password ulit:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Directory ng TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Unang Pangalan:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Pangalan ng User:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Kino-configure ang DHCP server"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Container:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Matagumpay na na-configure ng wizard ang LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Matagumpay na naidagdag ang data"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Magdagdag - magdagdag ng entry sa LDAP server"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Matagumpay na na-configure ng wizard ang Samba server mo."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Nabigo"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Error"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "News Wizard"
@@ -1398,13 +1381,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Ang path (landas) na ipinasok mo ay wala."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Kontrol ng access"
 
@@ -1459,30 +1442,21 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Matagumpay na na-configure ng wizard ang iyong NFS server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Kailangan mong i-adjust muli ang NIS domainname mo. Para sa isang NIS server "
-"kailangan mo ng tamang NIS domainname, na hindi pareho sa localdomain o none "
-"(wala)."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "NIS server na may autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS client"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Mag-setup ng NIS server na may autofs map, auto.home at auto.master file."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1490,28 +1464,28 @@ msgstr ""
 "Automatic na mina-mount ng mga user ang kanilang directory mula sa server, "
 "kung sila ay magla-login sa isang NIS client computer network."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Ano ang gusto mong gawin?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "I-configure ang computer na maging NIS client"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Dapat ka lang maglagay ng nisdomain at nisserver."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS server:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS domain:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1522,7 +1496,7 @@ msgstr ""
 "sa mga NIS user na i-automount ang kanilang home directory sa isang NIS "
 "client computer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1530,41 +1504,41 @@ msgstr ""
 "Home NIS: home base directory para sa mga user sa NIS server. Itong "
 "directory ay i-e-export sa pamamagitan ng NFS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS domain: NIS domain na gagamitin (karaniwang pareho sa DNS domainname mo)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS server: pangalan ng computer mo."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS domainname:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Ise-set ng wizard ang NIS server mo na may autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS directory:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domainname: pangalan ng NIS domain."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS server: hostname ng NIS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1572,24 +1546,24 @@ msgstr ""
 "Hinahanap ng YPBIND daemon ang server para sa mga NIS domain at mini-"
 "maintain ang inpormasyon tungkol sa NIS binding."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Error: dapat ay isang directory."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Error: nisdomainname ay hindi dapat 'none' o 'localdomain'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Paki-adjust ito."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "Matagumpay na na-configure ng wizard ang iyong makina na maging NIS client."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1597,16 +1571,16 @@ msgstr ""
 "Matagumpay na na-configure ng wizard ang iyong makina na maging NIS server "
 "na may autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 "Kino-configure ang sistema mo na maging NIS server na may Autofs map..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS na may Autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Kino-configure ang sistema mo na maging NIS client ..."
 
@@ -1979,7 +1953,7 @@ msgstr ""
 "configure ng iyong proxy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2011,6 +1985,14 @@ msgstr "Squid proxy"
 msgid "PXE Wizard"
 msgstr "PXE Wizard"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Kailangan mong i-adjust muli ang domainname mo, na hindi pareho sa "
+"localdomain o none (wala). Pakilunsad ang drakconnect para i-adjust ito."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "I-set ang PXE server"
@@ -2382,26 +2364,26 @@ msgstr "Kino-configure ang PXE server sa iyong sistema..."
 msgid "PXE server"
 msgstr "PXE server"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba wizard"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s ay wala."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Lahat - walang pagpigil ng access"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 "Mga rule ko - tanungin ako sa mga pinayagan (allowed) at tinanggihan "
 "(denied) na host"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2409,39 +2391,39 @@ msgstr ""
 "Ang Samba ay nagpapahintulot sa server mo na umakto bilang file at print "
 "server para sa mga workstation na nagpapatakbo ng sistemang hindi Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba configuration wizard"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Itong wizard ay tutulong sa iyo na i-configure ang mga Samba service ng "
 "server mo."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 "Kailangan ng Samba na malaman ang Windows Workgroup na pagsisilbihan nito."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Workgroup"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Workgroup:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Ang Workgroup ay mali"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Server banner."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2449,19 +2431,19 @@ msgstr ""
 "Ang banner ay ang paraan na mailalarawan itong server sa mga Windows "
 "workstation."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Ang server banner ay hindi tama"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Level ng access:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2469,7 +2451,7 @@ msgstr ""
 "* Halimbawa 1: payagan lahat ng IP sa 150.203.*.*; maliban sa isa\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2478,7 +2460,7 @@ msgstr ""
 "netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2486,7 +2468,7 @@ msgstr ""
 "* Halimbawa 3: pahintulutan ang dalawang host\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2498,25 +2480,25 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Tandaan na ang access ay nangangailangan pa rin ng nababagay na mga user-"
 "level password."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Payagan ang host:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Tanggihan ang host:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Mga gumaganang service ng Samba"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2527,19 +2509,19 @@ msgstr ""
 "workstation; at (2) makapagbibigay din ng pagbabahagi ng printer para sa mga "
 "printer na nakakabit sa server mo."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Paganahin ang file sharing area"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Paganahin ang server Printer Sharing"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Gawing available ang mga directory para sa mga may-ari sa kanila"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2547,28 +2529,28 @@ msgstr ""
 "Napili mong payagan ang access ng user sa kanilang mga home directory via "
 "samba pero ikaw/sila ay dapat gumamit ng 'smbpasswd' para i-set ang password."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Directory na ipinamahagi:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "I-type ang path ng directory na gusto mong ipamahagi."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Mga permission ng file"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2578,62 +2560,62 @@ msgstr ""
 "dapat simulan ng '@') gaya nito:\n"
 "root, fred, @users, @wheel para sa bawat klase ng permission."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Talaan ng babasa:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Talaan ng susulat:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Piliin kung aling mga printer ang gusto mong ma-access mula sa mga kilalang "
 "user"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Paganahin lahat ng printer"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Kino-configure ang Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Naipon ng wizard ang mga sumusunod na parameter para ma-configure ang Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Server banner:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "File sharing:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Print server:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Home:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Mga printer:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Matagumpay na na-configure ng wizard ang Samba server mo."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Kino-configure ang Samba server mo..."
 
@@ -2886,6 +2868,31 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Kino-configure ang sistema mo bilang Apache server ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Kailangan mong i-adjust muli ang hostname mo."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Kailangan mong i-adjust muli ang domainname mo. Para sa LDAP server "
+#~ "kailangan mo ng tamang domainname, na hindi pareho sa localdomain o none "
+#~ "(wala). Ilunsad ang drakconnect para i-adjust ito."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Pangalan ng User:"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Kailangan mong i-adjust muli ang NIS domainname mo. Para sa isang NIS "
+#~ "server kailangan mo ng tamang NIS domainname, na hindi pareho sa "
+#~ "localdomain o none (wala)."
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Kino-configure ang DHCP server"
diff --git a/po/tr.po b/po/tr.po
index f74873c3..de737d78 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-03-01 11:43+0200\n"
 "Last-Translator: S. Alp ŞENYER <ssenyer@linux-sevenler.org>\n"
 "Language-Team: Turkish <Kde-i18n-tr@kde.org>\n"
@@ -28,31 +28,31 @@ msgstr "yapılandırma sihirbazı"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Uyarı."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Hata."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Tebrikler"
 
@@ -93,18 +93,18 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(isimden sonra alanı yazmanız gerekmez)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "İstemci tanımı:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Verilen IP adresi ve istemci adının ağda tek olması gerektiğini unutmayın."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -114,33 +114,33 @@ msgstr ""
 "tanınacak. Ağda bulunan her bilgisayarın kendine has bir IP adresi olmak "
 "zorundadır."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Bilgisayarın adı:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Bİlgisayarın IP adresi:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Uyarı"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "dhcp kullanıyorsunuz, sunucu bu yapılandırmanızla çalışmayabilir."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Hata"
@@ -185,12 +185,33 @@ msgstr "İstemci IP'si:"
 msgid "The wizard successfully added the client."
 msgstr "Sihirbaz, istemciyi başarılı bir şekilde ekledi."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Alanadınızı yeniden düzenlemeniz gerekiyor. Bir DNS sunucusu için doğru bir "
+"alanadı belirtmeniz gerekir ve bu localdomain ya da none olmamalıdır. "
+"Ayarlamak için drakconnect'i çalıştırın."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+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 ""
+"Alanadınızı yeniden düzenlemeniz gerekiyor. Bir DNS sunucusu için doğru bir "
+"alanadı belirtmeniz gerekir ve bu localdomain ya da none olmamalıdır. "
+"Ayarlamak için drakconnect'i çalıştırın."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Kapat"
 
@@ -284,8 +305,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "Pasif"
@@ -294,8 +315,8 @@ msgstr "Pasif"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "Etkin"
@@ -310,53 +331,38 @@ msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 "Sihirbaz, sunucunuz için DHCP servislerini başarılı bir şekilde yapılandırdı."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Başarısız"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Drakwizard'ı kapatıp açın ve bazı parametreleri değiştirmeyi deneyin."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Makine adınızı yeniden düzenlemeniz gerekiyor."
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"Alanadınızı yeniden düzenlemeniz gerekiyor. Bir DNS sunucusu için doğru bir "
-"alanadı belirtmeniz gerekir ve bu localdomain ya da none olmamalıdır. "
-"Ayarlamak için drakconnect'i çalıştırın."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Ana DNS sunucusu"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "İkincil DNS sunucusu"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "DNS'e makine adı ekle"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "DNS'te makina adını kaldır"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -364,11 +370,11 @@ msgstr ""
 "DNS(Domain Name Server=Alan Adı Sunucusu) internet bilgisayar adıyla makina "
 "arasında bağ kuran servistir."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "DNS Ana Yapılandırma Sihirbazı"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -379,48 +385,48 @@ msgstr ""
 "yönlendirme ile yerel bilgisayar isimleri için yerel bir DNS hizmeti "
 "sağlayacak."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Ne yapmak istiyorsunuz:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS sunucusu"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(isimden sonra alanı yazmanız gerekmez)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Sunucu IP'si:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS alan adı:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Aşağıdaki listeden kaldırmak istediğiniz makine adını seçin."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Varolan dns yapılandırmasından bir makine adını kaldır."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Makina ismi kaldır:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Bilgisayar adı:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -430,11 +436,11 @@ msgstr ""
 "yükümlülüğe sahip olacaktır ve aynı zamanda ana sunucunuz erişelemez "
 "olduğunda yedek sunucu olarak işlev görecektir."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Ana DNS sunucusunun IP adresi:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -442,11 +448,11 @@ msgstr ""
 "Yönlendirme ancak sunucunun yetkili olmadığı ve cevabın saklı belleğinde yer "
 "almadığı sorgulamalarda meydana gelir."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Yönlendiricinizin IP'si"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -454,15 +460,15 @@ msgstr ""
 "O halde eğer ihtiyacınız varsa ve ip yönlendiricinizi biliyorsanız, IP "
 "adresini giriniz, eğer bilmiyorsanız boş bırakınız"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Dış DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Arama alanı ekle"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -470,7 +476,7 @@ msgstr ""
 "Bu sunucunun alanadı otomatik olarak eklendi, böylece bu alanadını buraya "
 "eklemenize gerek bulunmamaktadır."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -482,27 +488,27 @@ msgstr ""
 "alanadını içerir. Bu değer arama anahtar kelimesini izleyen istenen alan "
 "arama adımını listeleyerek değiştirilebilir."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Aranacak olan ön tanımlı alan adı:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Bu yönlendiriciniz için geçerli bir IP adresi değil... devam etmek için "
 "İleri'ye basın."
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Bu geçerli bir Ana DNS IP adresi değil... devam etmek için İleri'ye basın."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Bu geçerli bir IP adresi değil... devam etmek için İleri'ye basın."
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -510,11 +516,11 @@ 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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Hata:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -522,7 +528,7 @@ msgstr ""
 "Bu sizin DNS yapılandırmanızda mevcut değil... devam etmek için 'İleri'ye "
 "basın"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -530,7 +536,7 @@ msgstr ""
 "Sihirbaz aracılığı ile hiçbir DNS sunucusu ayarlanmamış. Lütfen DNS "
 "sihirbazını çalıştırın: Ana DNS sunucusu."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 #, fuzzy
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
@@ -538,67 +544,67 @@ msgstr ""
 "Görünen o ki siz ana DNS sunucusu değil, ikincil bir sunucusunuz. Bu halde "
 "makine adı ekleme/kaldırma işlemi yapamıyorum."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Tamam. Şimdi ikincil DNS yapılandırmanız gerçekleştiriliyor"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "bu yapılandırma ile:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Bu kimlikteki istemci DNS'inize eklenecek"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Bilgisayar adı:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Bilgisayar IP adresi:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Bu kimlikteki istemci DNS'inize taşınacak"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS sunucusu aşağıdaki yapılandırma ile yapılandırılacak"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Sunucu Makine İsmi:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Alanadı:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Sihirbaz, makina adını başarılı bir şekilde DNS'inize ekledi."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Sihirbaz,makineyi DNS nizden başarı ile sildi."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 "Sihirbaz, sunucunuzun DNS servislerini başarılı bir şekilde yapılandırdı."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 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."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Sisteminiz ana DNS Sunucusu olarak yapılandırılıyor ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Sisteminiz ikincil DNS Sunucusu olarak yapılandırılıyor ..."
 
@@ -626,7 +632,7 @@ msgstr "Posta sunucusu"
 msgid "FTP server"
 msgstr "FTP sunucusu"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba sunucusu"
 
@@ -651,7 +657,7 @@ msgstr "NIS sunucusu autofs haritası"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrake Kurulum sunucusu"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Samba sunucusu"
@@ -679,7 +685,7 @@ msgstr ""
 "\"Sonraki\" tuşuna basarak kurulumu başlatabilirsiniz veya\n"
 "\"İptal\" tuşuna basarak yüklemekten vazgeçebilirsiniz"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Kurulum başarısız oldu"
 
@@ -950,15 +956,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "yapılandırma sihirbazı"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Alanadınızı yeniden düzenlemeniz gerekiyor. Bu değer localdomain ya da boş "
-"olamaz. Lütfen Drakconnect'i çalıştırarak alanadını düzeltiniz."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -966,314 +964,299 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Web Sunucusu Yapılandırma Sihirbazı"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Parola:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "Parola:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, 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:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "Bİlgisayar Adı"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS Alan:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "Kurulum dizini:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap sihibazı"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Alanadınızı yeniden düzenlemeniz gerekiyor. Bir LDAP sunucusu için doğru bir "
-"alanadı belirtmeniz gerekir ve bu localdomain ya da none olmamalıdır. "
-"Ayarlamak için drakconnect'i çalıştırın."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "LDAP yapılandırma sihirbazı"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "Ekle - LDAP sunucusuna veri ekle"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "LDAP yapılandırma sihirbazı"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "LDAP yapılandırma sihirbazı"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "PXE sunucusu kur."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Kurulum sunucusu yapılandırması"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Kullanıcı eklenmesi"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "İsim:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Kullanıcı Adı:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Kullanıcı eklenmesi"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Parola"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Parola:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Parolalar uyuşmuyor"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Samba Yapılandırılıyor"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Alanadı:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Alanadı:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "TFTP dizini:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "TFTP dizini:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Parola:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Parola:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "TFTP dizini:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "İsim:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Kullanıcı Adı:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "DHCP Sunucusu yapılandırılıyor"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Kullanıcı eklenmesi"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Sihirbaz, LDAP sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Veri ekleme başarılı"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Ekle - LDAP sunucusuna veri ekle"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Sihirbaz, vekil sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Başarısız"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Hata"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Haber Sihirbazı"
@@ -1423,13 +1406,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Dizin:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Girmiş olduğunuz yol bulunmamaktadır."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Erişim denetimi"
 
@@ -1485,32 +1468,23 @@ msgstr "Ağ maskesi:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Sihirbaz, NFS sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"NIS alanadınızı yeniden düzenlemeniz gerekiyor. Bir NIS sunucusu için doğru "
-"bir NIS alanadı belirtmeniz gerekir ve bu localdomain ya da none "
-"olmamalıdır. "
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Autofs haritası içeren NIS sunucu"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "NIS client"
 msgstr "NIS İstemcisi"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Autofs haritası içeren bir NIS sunucu kur, otomatik ev ve otomatik yönetici "
 "dosyaları"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 #, fuzzy
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
@@ -1519,36 +1493,36 @@ msgstr ""
 "Kullanıcılar NIS istemci bilgisayar ağına giriş yaptıklarında ev dizinleri "
 "sunucudan otomatik olarak bağlanır."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Ne yapmak istiyorsunuz?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Bilgisayarı bir NIS istemcisi olarak yapılandır."
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Sadece nis alanadı ve nis sunucusu eklemelisiniz."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS Sunucusu:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 #, fuzzy
 msgid "NIS domain:"
 msgstr "NIS Alan:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1556,65 +1530,65 @@ msgstr ""
 "NIS ev dizini: NIS sunucusu kullanıcılarının ev dizini. Bu dizin NFS sunucu "
 "üzerinden aktarılacaktır."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "NIS alanı: Kullanılacak NIS alanadı (genellikle DNS alanadınızla aynıdır)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS sunucu: bilgisayarınızın adı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS ev dizini:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS alan adı:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Sihirbaz, NIS sunucunuzu autofs haritasıyla birlikte kuracak"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS dizini:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS alan adı: NIS alanının adı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS sunucu: NIS sunucunun adı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Hata bir dizin belirtmelisiniz."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Hata nis alanadı 'localdomain' ya da 'boş' olmamalı "
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Lütfen düzeltiniz."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "Sihirbaz, makinenizi bir NIS istemci olarak başarılı bir şekilde "
 "yapılandırdı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1622,16 +1596,16 @@ msgstr ""
 "Sihirbaz, makinenizi autofs haritası destekleyen bir NIS sunucusu olarak "
 "başarılı bir şekilde yapılandırdı."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Sisteminiz Autofs destekli bir NIS sunucu olarak yapılandırılıyor..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 #, fuzzy
 msgid "NIS with Autofs map"
 msgstr "Autofs haritalı NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 #, fuzzy
 msgid "Configuring your system as NIS client ..."
 msgstr "Sisteminiz NIS istemcisi olarak yapılandırılıyor ..."
@@ -2002,7 +1976,7 @@ msgstr ""
 "şekilde belirledi:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -2034,6 +2008,14 @@ msgstr "Squid vekil sunucu"
 msgid "PXE Wizard"
 msgstr "PXE sihirbazı"
 
+#: ../pxe_wizard/Pxe.pm:78
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"Alanadınızı yeniden düzenlemeniz gerekiyor. Bu değer localdomain ya da boş "
+"olamaz. Lütfen Drakconnect'i çalıştırarak alanadını düzeltiniz."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXE sunucu kur"
@@ -2391,26 +2373,26 @@ msgstr "Sisteminizde PXE sunucu yapılandırılıyor..."
 msgid "PXE server"
 msgstr "PXE sunucusu"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba sihibazı"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s mevcut değil."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "Hepsi - Erişim kısıtlaması yok"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 #, fuzzy
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Benim Kurallarım - Makinelerin izinli veya yasaklı olmalarını bana sor"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2418,59 +2400,59 @@ msgstr ""
 "Samba, sunucunuzun Linux çalıştırmayan işistasyonlarına dosya ve yazıcı "
 "sunucusu olabilmesini sağlar."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 #, fuzzy
 msgid "Samba configuration wizard"
 msgstr "Samba Yapılandırma Sihirbazı"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Bu sihirbaz sunucunuzun Samba hizmeti yapılandırmanızda size yardımcı olacak."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba, sunum yapacağı Windows Çalışmagrubunu bilmek zorunda."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Çalışma Grubu"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Çalışma Grubu:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Çalışmagrubu yanlış"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 #, fuzzy
 msgid "Server banner."
 msgstr "Sunucu Başlığı."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "Başlık, sunucunun Windows iş istasyonlarında nasıl tanınacağını gösterir."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Başlık:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 #, fuzzy
 msgid "The server banner is incorrect"
 msgstr "Sunucu Başlığı yanlış"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Erişim seviyesi:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
@@ -2479,7 +2461,7 @@ msgstr ""
 "* Örnek 1: tüm 150.203.*.* içindeki bir tanesi dışındakilere izin ver\\nhost "
 "= allow 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
@@ -2488,7 +2470,7 @@ msgstr ""
 "* Örnek 2: verilen ağ/ağmaskesine uyan tüm makinelere izin vermek \n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 3: allow a couple of hosts\n"
@@ -2497,7 +2479,7 @@ msgstr ""
 "* Örnek 3: birkaç sunucuya birden izin verme hosts\\nhosts allow= lapand, "
 "arvids jaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 #, fuzzy
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
@@ -2509,24 +2491,24 @@ msgstr ""
 "fakat birtek belli bir makineyi yasaklamak için \\nhosts allow= @foonet"
 "\\nhosts deny = korsan"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Not: Bu erişim hala uygun bir kullanıcı-seviyesi şifreye ihtiyacı var."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "İzin verilen Makineler:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Reddedilmiş makinalar:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 #, fuzzy
 msgid "Enabled Samba services"
 msgstr "Etkin Samba Servisleri"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2535,20 +2517,20 @@ msgstr ""
 "Samba, Windows işistasyonunuza genel bir dosya paylaşım alanı ve ayrıca "
 "sunucunuza bağlı yazıcılar için yazıcı paylaşımı sunabilir."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Dosya paylaşım alanını etkinleştir"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 #, fuzzy
 msgid "Enable server Printer Sharing"
 msgstr "Yazıcı Paylaşımını etkinleştir"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Sahipleri için ev dizinlerini erişilebilir yap"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2556,28 +2538,28 @@ msgstr ""
 "Kullanıcıların ev dizinlerine samba vasıtasıyla erişebileceğini seçtiğiniz "
 "ama sizin/onların smbpassword ile bir parola belirlemesi gerekli."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Paylaşılmış Dizin:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Paylaştırmak istediğiniz dizinin yolunu giriniz."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Dosya izinleri(hakları)"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 #, fuzzy
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
@@ -2588,68 +2570,68 @@ msgstr ""
 "(gruplar \\'@\\' ile başlamalıdır) örn Her türlü izin için:\\nroot, omer, "
 "@users, @wheel"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 #, fuzzy
 msgid "Read list:"
 msgstr "okuma listesi:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 #, fuzzy
 msgid "Write list:"
 msgstr "yazma listesi:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Bilinen kullanıcılara erişilebilinir yapılması istediğiniz yazıcıları seçiniz"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Tüm yazıcıları etkinleştir"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Samba Yapılandırılıyor"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 #, fuzzy
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Samba'yı yapılandırmak için gereken parametreleri sihirbaz şu şekilde "
 "belirledi:"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 #, fuzzy
 msgid "Server banner:"
 msgstr "Sunucu Başlığı:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 #, fuzzy
 msgid "File sharing:"
 msgstr "Dosya Paylaşımı:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 #, fuzzy
 msgid "Print server:"
 msgstr "Yazıcı Sunucusu:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Ev:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Yazıcılar:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Sihirbaz, Samba sunucunuzu başarılı bir şekilde yapılandırdı."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Samba sunucunuz yapılandırılıyor....."
 
@@ -2905,6 +2887,31 @@ msgstr "Apache web sunucusu"
 msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Apache Web Sunucu olarak yapılandırılıyor ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Makine adınızı yeniden düzenlemeniz gerekiyor."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Alanadınızı yeniden düzenlemeniz gerekiyor. Bir LDAP sunucusu için doğru "
+#~ "bir alanadı belirtmeniz gerekir ve bu localdomain ya da none olmamalıdır. "
+#~ "Ayarlamak için drakconnect'i çalıştırın."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Kullanıcı eklenmesi"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "NIS alanadınızı yeniden düzenlemeniz gerekiyor. Bir NIS sunucusu için "
+#~ "doğru bir NIS alanadı belirtmeniz gerekir ve bu localdomain ya da none "
+#~ "olmamalıdır. "
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "DHCP Sunucusu yapılandırılıyor"
diff --git a/po/uk.po b/po/uk.po
index 200a6600..e00e9b77 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.96 2004-11-08 12:23:37 fisher Exp $
+# $Id: uk.po,v 1.97 2005-01-03 08:37:38 pablo Exp $
 # Ukrainian translation of drakwizard
 # Copyright (C) 2003, 2004 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-11-08 14:20+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -26,31 +26,31 @@ msgstr "Помічник налаштування"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Попередження."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Помилка."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Поздоровляємо"
 
@@ -90,11 +90,11 @@ msgstr "Цей Помічник допоможе додати нового кл�
 msgid "(you don't need to type the domain after the name)"
 msgstr "(Вам не потрібно вказувати домен після назви)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Ідентифікація клієнта:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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."
@@ -102,7 +102,7 @@ msgstr ""
 "Зауважте, що задані IP-адреса та ім'я клієнта мають бути унікальними в "
 "мережі."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,33 +112,33 @@ msgstr ""
 "company.net. Кожна машина в мережі повинна мати свою (унікальну) IP-адресу в "
 "звичайному синтаксисі з крапками."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Назва машини:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "IP-адреса машини:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Попередження"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Ви знаходитесь в dhcp, сервер може не працювати з Вашою конфігурацією."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Помилка"
@@ -183,11 +183,33 @@ msgstr "IP-адреса клієнта:"
 msgid "The wizard successfully added the client."
 msgstr "Помічник успішно додав клієнта."
 
-#: ../common/Wizcommon.pm:86
-msgid "The command is still running. Do you want to kill it and quit the Wizard?"
-msgstr "Команда все ще виконується. Ви хочете припинити її і вийти з Помічника?"
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Вам потрібно виправити назву домена. Для сервера DNS потрібно вказати "
+"правильну назву домену, не таку саму, як назва локального домена, і не "
+"порожню. Виконайте drakconnect, щоб виправити."
+
+#: ../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."
+msgstr ""
+"Вам потрібно виправити назву домена. Для сервера DNS потрібно вказати "
+"правильну назву домену, не таку саму, як назва локального домена, і не "
+"порожню. Виконайте drakconnect, щоб виправити."
+
+#: ../common/Wizcommon.pm:98
+msgid ""
+"The command is still running. Do you want to kill it and quit the Wizard?"
+msgstr ""
+"Команда все ще виконується. Ви хочете припинити її і вийти з Помічника?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Закрити"
 
@@ -281,8 +303,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "вимкнено"
@@ -291,8 +313,8 @@ msgstr "вимкнено"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "увімкнено"
@@ -305,62 +327,49 @@ msgstr "Інтерфейс:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Помічник успішно налаштував сервіси DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Збій"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Перезапустіть drakwizard і спробуйте змінити деякі параметри."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Вам потрібно виправити назву машини."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Вам потрібно виправити назву домена. Для сервера DNS потрібно вказати "
-"правильну назву домену, не таку саму, як назва локального домена, і не "
-"порожню. Виконайте drakconnect, щоб виправити."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Головний сервер DNS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Підлеглий сервер DNS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Додати машину в DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Вилучити машину з DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
-msgstr "DNS (Domain Name Server) - це сервіс, який надає машині назву в Інтернеті."
+msgstr ""
+"DNS (Domain Name Server) - це сервіс, який надає машині назву в Інтернеті."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Помічник налаштування головного DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -370,44 +379,44 @@ msgstr ""
 "конфігурація надасть локальний сервіс DNS для локальних назв комп'ютерів, а "
 "нелокальні запити відішле до зовнішнього DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Що Ви хочете зробити:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "Інтерфейс сервера DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Вам не потрібно вказувати домен після назви)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "Назва домена DNS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Виберіть із списку машину, яку Ви хочете вилучити."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Вилучити машину з існуючої конфігурації DNS."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Вилучити машину:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Назва комп'ютера:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -416,11 +425,11 @@ msgstr ""
 "Підлеглий сервер DNS бере на себе частину роботи головного сервера і також "
 "працює в ролі резервного сервера, якщо головний сервер недоступний."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "IP-адреса головного сервера DNS:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -428,11 +437,11 @@ msgstr ""
 "Випередження стаються тільки для тих запитів, для яких сервер не "
 "авторизовано і немає відповіді у кеші."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP передавача даних"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -440,15 +449,15 @@ msgstr ""
 "Якщо це Вам потрібно і Ви знаєте IP-адресу передавача даних, введіть її, в "
 "інакшому випадку залишіть її порожньою"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Зовнішній DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Додати домен для пошуку"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -456,7 +465,7 @@ msgstr ""
 "Назву домена цього сервера додано автоматично і не потрібно знову робити це "
 "тут."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -468,25 +477,27 @@ msgstr ""
 "Цей спосіб може бути змінено шляхом вводу бажаного шляху домена з допомогою "
 "пошуку по ключовому полі"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Типова назва домена для пошуку:"
 
-#: ../dns_wizard/Bind.pm:182
-msgid "This is not a valid IP address for your forwarder... press next to continue"
-msgstr "Це неправильна адреса для передавача... натисніть \"Далі\", щоб продовжити"
+#: ../dns_wizard/Bind.pm:176
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
+msgstr ""
+"Це неправильна адреса для передавача... натисніть \"Далі\", щоб продовжити"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Це неправильна IP-адреса для головного DNS-сервера... натисніть \"Далі\", "
 "щоб продовжити"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Це неправильна IP-адреса... натисніть \"Далі\", щоб продовжити"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -494,11 +505,11 @@ msgstr ""
 "Здається, ця машина вже є конфігурації DNS... натисніть \"Далі\" для "
 "продовження"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Помилка:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -506,7 +517,7 @@ msgstr ""
 "Здається, що цього немає в конфігурації DNS... натисніть \"Далі\" для "
 "продовження"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -514,69 +525,72 @@ msgstr ""
 "Здається, не було встановлено DNS-сервер з допомогою Помічника. Будь ласка, "
 "запустіть Помічника DNS: Головний сервер DNS."
 
-#: ../dns_wizard/Bind.pm:217
-msgid "It seems that you are not a master DNS server, so I can't add/remove host."
+#: ../dns_wizard/Bind.pm:211
+msgid ""
+"It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Здається, Ви є не головним DNS сервером, а підлеглим. Тому я не можу "
 "додавати/вилучати машини."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Помічник зараз створить конфігурацію підлеглого DNS"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "з цією конфігурацією:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Клієнта з цією ідентифікацією буде додано до DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Назва комп'ютера:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "IP-адреса комп'ютера:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Клієнта з цим кодом буде вилучено з DNS"
 
-#: ../dns_wizard/Bind.pm:249
-msgid "The DNS server is about to be configured with the following configuration"
+#: ../dns_wizard/Bind.pm:243
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "DNS-сервер буде налаштовано з наступною конфігурацією"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Назва сервера:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Назва домена:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Помічник успішно додав машину до DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Помічник успішно вилучив машину з DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Помічник успішно налаштував служби DNS на Вашому сервері."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
-msgstr "Будь ласка, перезапустіть drakwizard і спробуйте змінити деякі параметри."
+msgstr ""
+"Будь ласка, перезапустіть drakwizard і спробуйте змінити деякі параметри."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Система налаштовується як головний DNS-сервер..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Система налаштовується як підлеглий DNS-сервер..."
 
@@ -604,7 +618,7 @@ msgstr "Поштовий сервер"
 msgid "FTP server"
 msgstr "Сервер FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Сервер самба"
 
@@ -628,7 +642,7 @@ msgstr "Сервер NIS autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Сервер встановлення Мандрейклінакса"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Сервер Kolab"
 
@@ -653,7 +667,7 @@ msgstr ""
 "%s не встановлено\n"
 "Натисніть \"Далі\", щоб встановити, або \"Скасувати\", щоб вийти"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Встановлення завершилося невдало"
 
@@ -713,7 +727,8 @@ msgstr "Параметри сервера FTP Proftpd"
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "Permit root login: allow root to log on FTP server."
-msgstr "Permit root login: дозволяти реєструватися на сервері FTP як адміністратор."
+msgstr ""
+"Permit root login: дозволяти реєструватися на сервері FTP як адміністратор."
 
 #: ../ftp_wizard/Proftpd.pm:96
 msgid "Admin email:"
@@ -814,7 +829,8 @@ msgstr "Помічник успішно налаштував Ваш інтран
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:154
 #: ../pxe_wizard/Pxe.pm:332
 msgid "Please relaunch drakwizard, and try to change some parameters."
-msgstr "Будь ласка, перезапустіть drakwizard і спробуйте змінити деякі параметри. "
+msgstr ""
+"Будь ласка, перезапустіть drakwizard і спробуйте змінити деякі параметри. "
 
 #: ../installsrv_wizard/Installsrv.pm:53
 msgid "Configure a Mandrakelinux install server (via NFS and http)"
@@ -894,16 +910,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Помічник налаштування Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Вам потрібно виправити назву домена, вона не повинна бути така сама, як "
-"локальний домен, і не порожньою. Будь ласка, запустіть drakconnect, щоб "
-"зробити виправлення."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -915,7 +922,7 @@ msgstr ""
 "адрес з доступом і контактами для користувачів mailbox, з доступом до пошти "
 "по POP3 і IMAP4 (rev1)"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -925,39 +932,40 @@ msgstr ""
 "Proftpd, LDAP, Cyrus, Postfix, Imap, Saslauth. Помічник зробить резервну "
 "копію попередніх конфігураційних файлів для цих сервісів."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
-msgstr "Ласкаво просимо до помічника налаштування сервера групової розробки Kolab."
+msgstr ""
+"Ласкаво просимо до помічника налаштування сервера групової розробки Kolab."
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Введіть пароль для менеджера рахунку сервера Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Пароль не співпадає або порожній, будь ласка, виправте."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Пароль ще раз:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Помічник зараз налаштує сервер Kolab з цими параметрами"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Назва машини:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Головний домен:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -965,45 +973,35 @@ msgstr ""
 "Сервер kolab налаштовано і запущено. Зареєструйтеся з ім'ям 'manager' і "
 "паролем, який Ви ввели, за адресою https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Встановлення в процесі"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Встановлюється сервер kolab на Вашій системі..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Налаштовується сервер kolab на Вашій системі..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Помічник Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Вам потрібно виправити назву домена. Для сервера LDAP потрібно вказати "
-"правильну назву домену, не таку саму, як назва локального домена, і не "
-"порожню. Виконайте drakconnect, щоб виправити."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Показати налаштування Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Додати користувача в сервер Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Очистити налаштування Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1011,192 +1009,190 @@ msgstr ""
 "Це простий протокол для доступу до утиліт роботи з теками, зокрема основаних "
 "на утилітах на основі X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP означає Lightweight Directory Access Protocol (простий протокол для "
 "доступу до тек)."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Помічник налаштування Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Спочатку потрібно встановити сервер Ldap."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Ваш вибір:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Очистити налаштування"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Існуюча база зберігається /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Додавання користувача LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Користувача створено в: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Користувача створено в: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Ім'я:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Ім'я:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Ім'я користувача:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Потрібно ввести правильне ім'я."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Потрібно ввести правильну назву."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Потрібно ввести правильне ім'я користувача."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Пароль користувача LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "паролі повинні співпадати"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Пароль ще раз:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Вам потрібно вести пароль для LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Паролі не співпадають"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Адміністратор"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "Адміністратор - це користувач із повним доступом до бази LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Адміністратор,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Налаштовується сервер LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Назва домена:"
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Назва домена:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Адміністратор LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Дерево тек LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "Для генерування дерева тек LDAP використовується DNS"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Дерево тек LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Адміністратор LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Пароль LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Пароль LDAP ще раз:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Потрібно ввести правильне дерево тек LDAP."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Підтвердження створення користувача"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Ім'я:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Ім'я користувача:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Створити в:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Підтвердження інформації про створення сервера LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Контейнер користувачів:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Помічник успішно налаштував LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Користувача додано успішно"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Помилка при додаванні користувача в базу Ldap"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Сервер вже налаштовано"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Сервер Ldap вже було налаштовано"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "Збій %s"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Помилка!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Неможливо під'єднатися до %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Помічник новин"
@@ -1205,7 +1201,8 @@ msgstr "Помічник новин"
 msgid ""
 "This wizard will help you configuring the Internet News services for your "
 "network."
-msgstr "Помічник допоможе Вам налаштувати сервіси інтернет-новин для Вашої мережі."
+msgstr ""
+"Помічник допоможе Вам налаштувати сервіси інтернет-новин для Вашої мережі."
 
 #: ../news_wizard/Inn.pm:44
 msgid "Welcome to the News Wizard"
@@ -1296,7 +1293,8 @@ msgid "Polling interval:"
 msgstr "Інтервал опитування:"
 
 #: ../news_wizard/Inn.pm:95
-msgid "The wizard successfully configured your Internet News service of your server."
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "Помічник успішно налаштував Ваш сервер інтернет-новин."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1332,13 +1330,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Тека:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Шляху, який Ви ввели, не існує."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Контроль доступу"
 
@@ -1392,28 +1390,20 @@ msgstr "Маска:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Помічник успішно налаштував Ваш NFS-сервер"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Вам потрібно виправити назву домена NIS. Потрібно ввести правильну назву, не "
-"таку саму, як локального домена, і не порожню."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Сервер NIS з autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Клієнт NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Встановити сервер NIS з autofs map, файлами auto.home і auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1421,28 +1411,28 @@ msgstr ""
 "Користувачі автоматично монтують свої домашні теки, коли реєструються в "
 "мережі клієнтів NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Що Ви хочете зробити?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Налаштувати комп'ютер як клієнт NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Вам тільки потрібно ввести назву домена і сервера NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Сервер NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Домен NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1453,7 +1443,7 @@ msgstr ""
 "надає можливість користувачу NIS автоматично монтувати свою домашню теку на "
 "комп'ютері NIS клієнт."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1461,42 +1451,42 @@ msgstr ""
 "Домівка NIS: основна домашня тека для користувачів сервера NIS. Ця тека "
 "експортується через сервер NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Домен NIS: домен NIS для використання (переважно те саме, що назва домену "
 "DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS server: назва Вашого комп'ютера."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Домівка NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Назва домена NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Помічник встановить сервер NIS з картою autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Тека NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Назва домена NIS: назва домена NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Сервер NIS: назва комп'ютера з сервером NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1504,39 +1494,40 @@ msgstr ""
 "Служба YPBIND шукає сервер з доменами NIS і підтримує інформацію, пов'язану "
 "з NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Помилка: повинна бути тека."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 "Помилка: назва домена NIS не може бути порожньою або такою самою, як "
 "локального домена."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Будь ласка, виправте."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Помічник успішно налаштував Ваш комп'ютер в якості клієнта NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
-msgstr "Помічник успішно налаштував Ваш комп'ютер в якості сервера NIS з autofs map."
+msgstr ""
+"Помічник успішно налаштував Ваш комп'ютер в якості сервера NIS з autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Налаштування Вашої системи в якості сервера NIS з Autofs map..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS з картою autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Налаштовується Ваша система як клієнт NIS..."
 
@@ -1769,7 +1760,8 @@ msgid "Proxy port:"
 msgstr "Порт проксі:"
 
 #: ../proxy_wizard/Squid.pm:83
-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 ""
 "Натисніть Далі, якщо хочете зберегти це значення, або Назад, щоб виправити "
 "його."
@@ -1787,7 +1779,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Вам потрібно вибрати порт, більший за 1024 і менший за 65535"
 
 #: ../proxy_wizard/Squid.pm:94
-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 ""
 "Диск-кеш - це певна кількість простору, який може бути використаний для "
 "кешування диску."
@@ -1876,7 +1869,8 @@ msgstr ""
 msgid ""
 "Enter the qualified hostname (like \"cache.domain.net\") and the port of the "
 "proxy to use."
-msgstr "Введіть повну назву машини (наприклад \"cache.domain.net\") і порт проксі."
+msgstr ""
+"Введіть повну назву машини (наприклад \"cache.domain.net\") і порт проксі."
 
 #: ../proxy_wizard/Squid.pm:144 ../proxy_wizard/Squid.pm:156
 msgid "Upper level proxy hostname:"
@@ -1891,11 +1885,13 @@ msgid "Configuring the Proxy"
 msgstr "Налаштування проксі"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-msgid "The wizard collected the following parameters needed to configure your proxy:"
-msgstr "Помічник зібрав наступні параметри, які потрібні для налаштування проксі:"
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr ""
+"Помічник зібрав наступні параметри, які потрібні для налаштування проксі:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1927,6 +1923,15 @@ msgstr "Проксі Squit"
 msgid "PXE Wizard"
 msgstr "Помічник 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."
+msgstr ""
+"Вам потрібно виправити назву домена, вона не повинна бути така сама, як "
+"локальний домен, і не порожньою. Будь ласка, запустіть drakconnect, щоб "
+"зробити виправлення."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Встановити сервер PXE"
@@ -2037,7 +2042,8 @@ msgstr ""
 "хоче завантажуватися через PXE."
 
 #: ../pxe_wizard/Pxe.pm:153
-msgid "Please choose the PXE boot image you want to remove from the PXE server."
+msgid ""
+"Please choose the PXE boot image you want to remove from the PXE server."
 msgstr ""
 "Будь ласка, вкажіть образ завантаження PXE, який Ви хочете вилучити з "
 "сервера PXE."
@@ -2068,7 +2074,8 @@ 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, який Ви хочете "
 "змінити"
@@ -2082,7 +2089,8 @@ msgid "Add option to the PXE boot image"
 msgstr "Додати параметр до диску завантаження PXE"
 
 #: ../pxe_wizard/Pxe.pm:170
-msgid "Install directory: the full path to Mandrakelinux install server directory"
+msgid ""
+"Install directory: the full path to Mandrakelinux install server directory"
 msgstr "Тека встановлення: повний шлях до сервера встановлення Мандрейклінакса"
 
 #: ../pxe_wizard/Pxe.pm:170
@@ -2123,7 +2131,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "Ramsize: adjust the ramsize parameter on boot image."
-msgstr "Ramsize: підберіть параметр ramsize (розмір ПЗП) на диску завантаження."
+msgstr ""
+"Ramsize: підберіть параметр ramsize (розмір ПЗП) на диску завантаження."
 
 #: ../pxe_wizard/Pxe.pm:180
 msgid "VGA option: if you encounter any problem with VGA, please adjust. "
@@ -2182,7 +2191,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:200
 msgid "We need an all.rdz or a network.img image. Please add one."
-msgstr "Нам потрібний all.rdz або образ network.img. Будь ласка, вкажіть такий."
+msgstr ""
+"Нам потрібний all.rdz або образ network.img. Будь ласка, вкажіть такий."
 
 #: ../pxe_wizard/Pxe.pm:208
 msgid ""
@@ -2208,7 +2218,8 @@ 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'."
@@ -2281,24 +2292,24 @@ msgstr "Налаштування сервера PXE на Вашій систем
 msgid "PXE server"
 msgstr "Сервер PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Помічник Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s не існує."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Все - без обмеження доступу"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Мої правила - Запитувати мене про дозволені і заборонені машини"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2306,35 +2317,37 @@ msgstr ""
 "Samba дає змогу Вашому серверу бути файл-сервером і сервером друку для "
 "робочих станцій на не-лінакс системах."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Помічник налаштування Samba"
 
-#: ../samba_wizard/Samba.pm:72
-msgid "This wizard will help you configuring the Samba services of your server."
+#: ../samba_wizard/Samba.pm:76
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr "Цей Помічник допоможе Вам налаштувати сервіси Samba на Вашому сервері."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Samba необхідно знати робочу групу Windows, яка буде використовуватися."
+msgstr ""
+"Samba необхідно знати робочу групу Windows, яка буде використовуватися."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Робоча група"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Робоча група:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Робоча група неправильна"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Банер сервера."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2342,19 +2355,19 @@ msgstr ""
 "Банер - це спосіб, яким цей сервер буде описуватися для робочих станцій "
 "Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Банер:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Банер сервера невірний"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Рівень доступу:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2362,7 +2375,7 @@ msgstr ""
 "* Приклад 1: дозволити всі IP в 150.203.*.*; за винятком однієї\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2370,7 +2383,7 @@ msgstr ""
 "* Приклад 2: дозволити машини, які відповідають даній мережі/масці\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2378,7 +2391,7 @@ msgstr ""
 "* Приклад 3: дозволити кілька машин\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2390,23 +2403,24 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
-msgstr "Майте на увазі, що доступ потребує паролів користувача відповідного рівня."
+msgstr ""
+"Майте на увазі, що доступ потребує паролів користувача відповідного рівня."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Дозволити машини:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Заборонити машини:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Увімкнути сервіси Samba"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2415,19 +2429,19 @@ msgstr ""
 "Samba може надати доступ до файлів робочій станції під Windows, а також "
 "надати спільний доступ для друкарок, які під'єднані до Вашого сервера."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Увімкнути область спільного використання"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Дозволити розподілений доступ до сервера друку"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Зробити домашні теки доступними для їхніх власників"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2435,28 +2449,28 @@ msgstr ""
 "Ви вибрали дозволяти користувачам доступ до їхніх домівок через samba, але "
 "Ви/вони повинні використовувати smbpasswd, щоб встановити пароль."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Спільна тека:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Введіть шлях до теки, доступ до якої хочете зробити спільним."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Створити теку для спільного доступу, якщо такої не існує"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Помилка при створенні теки."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Права доступу до файла"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2466,61 +2480,62 @@ msgstr ""
 "\\'@\\'), наприклад:\n"
 "root, fred, @users, @wheel для кожного типу дозволу."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "список читання:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "список запису:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Виберіть друкарки відомих користувачів, які Ви хочете, щоб бути доступні для "
 "Вас"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Увімкнути всі друкарки"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Налаштування Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
-msgstr "Помічник зібрав наступні параметри, які потрібні для налаштування Samba."
+msgstr ""
+"Помічник зібрав наступні параметри, які потрібні для налаштування Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Банер сервера:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Спільний доступ до файла:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Сервер друку:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Домівка:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Друкарки:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Помічник успішно налаштував Ваш сервер Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Налаштування сервера Samba..."
 
@@ -2758,6 +2773,28 @@ msgstr "Сервер Апачі"
 msgid "Configuring your system as Apache server ..."
 msgstr "Налаштовую Вашу систему в якості сервера Апачі..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Вам потрібно виправити назву машини."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Вам потрібно виправити назву домена. Для сервера LDAP потрібно вказати "
+#~ "правильну назву домену, не таку саму, як назва локального домена, і не "
+#~ "порожню. Виконайте drakconnect, щоб виправити."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Неможливо під'єднатися до %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Вам потрібно виправити назву домена NIS. Потрібно ввести правильну назву, "
+#~ "не таку саму, як локального домена, і не порожню."
+
 #~ msgid "Configure Ldap server"
 #~ msgstr "Налаштувати сервер Ldap"
 
@@ -2956,4 +2993,3 @@ msgstr "Налаштовую Вашу систему в якості серве�
 #~ msgstr ""
 #~ "* Модуль користувача: дозволяє користувачам мати теку в домівці, доступну "
 #~ "на Вашому http-сервері через http://www.yourserver.com/~user."
-
diff --git a/po/uz.po b/po/uz.po
index 959f7764..9c2f5569 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-10 22:36+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -22,32 +22,32 @@ msgstr "мослаш учун ёрдамчи"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Диққат."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Хато."
 
 # M:
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Табриклаймиз"
 
@@ -88,39 +88,39 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "Клиентнинг номи ва IP рақами тармоқда ягона бўлиши шарт."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Компьютернинг номи:"
 
 # M:
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Компьютернинг IP рақами:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Диққат"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Сиз DHCP'дан фойдаланаяпсиз, сервер бу мосламалар билан ишламаши мумкин."
@@ -128,12 +128,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Хато"
@@ -179,12 +179,25 @@ msgstr "Клиентнинг IP рақами:"
 msgid "The wizard successfully added the client."
 msgstr "Ёрдамчи клиентни муваффақиятли қўшди."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Ёпиш"
 
@@ -268,8 +281,8 @@ msgstr "DHCP хизматини мослаш учун ёрдамчи қуйид�
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "ўчирилган"
@@ -278,8 +291,8 @@ msgstr "ўчирилган"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "ёқилган"
@@ -292,147 +305,136 @@ msgstr "Интерфейс:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Ёрдамчи DHCP хизматларини муваффақиятли мослади."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Муваффақиятсиз тугади"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Асосий DNS сервери"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Иккиламчи DNS сервери"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "DNS'га хостни қўшиш"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "DNS'дан хостни олиб ташлаш"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Асосий DNS хизматини мослаш учун ёрдамчи"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Сиз нима қилмоқчисиз:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS сервери"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Сервернинг IP рақами:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Олиб ташлаш учун қуйидаги рўйхатдан хостни танланг."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Хостни олиб ташлаш:"
 
 # M:
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Компьютернинг номи:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Асосий DNS серверининг IP рақами:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Ташқи DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -440,111 +442,111 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Хато:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Компьютернинг номи:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Компьютернинг IP рақами:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Сервернинг номи:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
 # M:
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Ёрдамчи клиентни муваффақиятли DNS'га қўшди."
 
 # M:
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Ёрдамчи клиентни муваффақиятли DNS'дан олиб ташлади."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Ёрдамчи серверингизнинг DNS хизматини муваффақиятли мослади."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Тизим асосий DNS сервер сифатида мосланмоқда..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Тизим иккиламчи DNS сервер сифатида мосланмоқда..."
 
@@ -572,7 +574,7 @@ msgstr "Хат-хабар сервери"
 msgid "FTP server"
 msgstr "FTP сервери"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba сервери"
 
@@ -597,7 +599,7 @@ msgstr ""
 msgid "Mandrakelinux Install server"
 msgstr "Mandrake ўрнатиш сервери"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab сервери"
 
@@ -623,7 +625,7 @@ msgstr ""
 "%s ўрнатилмаган\n"
 "Ўрнатиш учун \"Кейинги\" ёки чиқиш учун \"Бекор қилиш\" тугмасини босинг"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Ўрнатиш муваффақиятсиз тугади"
 
@@ -850,13 +852,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab серверини мослаш учун ёрдамчи"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -864,294 +860,285 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Махфий сўз:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Махфий сўз (яна):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Ёрдамчи Kolab серверини қуйидаги параметрлар билан мослайди"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Компьютернинг номи:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Ўрнатиш давом этмоқда"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Kolab сервери мосланмоқда..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab сервери мосланмоқда..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 #, fuzzy
 msgid "Ldap wizard"
 msgstr "Samba ёрдамчиси"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Samba серверини мослаш учун ёрдамчи"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Ташқи хат-хабар серверини мослаш учун ёрдамчи"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "мослаш учун ёрдамчи"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "LDAP серверини ўрнатиш."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Ўрнатиш сервернинг мосламаси"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Исми:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Номи:"
 
 # M:
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Фойдаланувчи:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Махфий сўз"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "passwords must match"
 msgstr "Махфий сўзлар мос келмайди"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Махфий сўз (яна):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Махфий сўзлар мос келмайди"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "LDAP сервери мослаш"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Директория:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Директория:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP махфий сўз:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP махфий сўз (яна):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "LDAP серверини ўрнатиш."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Исми:"
 
 # M:
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Фойдаланувчи:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr ""
 
 # M:
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Фойдаланувчи:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Ёрдамчи LDAP серверини муваффақиятли мослади."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Фойдаланувчи муваффақиятли қўшилди"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Ёрдамчи Samba серверингизни муваффақиятли мослади."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Муваффақиятсиз тугади"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Хато"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Янгликлар ёрдамчиси"
@@ -1279,13 +1266,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Директория:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Сиз киритган йўл мавжуд эмас."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr ""
 
@@ -1337,136 +1324,130 @@ msgstr "Тармоқ маскаси:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Ёрдамчи NFS серверни муваффақиятли мослади."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr ""
 
 # M:
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS клиенти"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Сиз нима қилмоқчисиз?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Компьютерни NIS клиенти сифатида мослаш"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS сервери:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS директорияси:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Ёрдамчи компьютерингизни NIS клиент сифатида муваффақиятли мослади."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Тизим NIS клиенти сифатида мосланмоқда..."
 
@@ -1797,7 +1778,7 @@ msgstr ""
 "Прокси серверингизни мослаш учун ёрдамчи қуйидаги параметрларни аниқлади:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1830,6 +1811,12 @@ msgstr "Squid прокси"
 msgid "PXE Wizard"
 msgstr "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."
+msgstr ""
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "PXE серверини ўрнатиш"
@@ -2143,96 +2130,96 @@ msgstr ""
 msgid "PXE server"
 msgstr "PXE сервери"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba ёрдамчиси"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s мавжуд эмас."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Ҳамма - ҳаммага рухсат"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba серверини мослаш учун ёрдамчи"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Бу ёрдамчи серверингизнинг Самба хизматларини мослашда сизга ёрдам беради."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Ишчи гуруҳ"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Ишчи гуруҳ:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Ишчи гуруҳи нотўғри"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2240,128 +2227,128 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Samba хизматларини ёқиш"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Файл ҳуқуқлари"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Ҳамма принтерларни ёқиш"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Samba сервери мосланмоқда"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Samba серверини мослаш учун ёрдамчи қуйидаги параметрларни аниқлади."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Босиб чиқариш сервери:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Уй:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Принтерлар:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Ёрдамчи Samba серверингизни муваффақиятли мослади."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Samba сервери мосланмоқда..."
 
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index b7efc189..1d8564a7 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-10 22:36+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <kmashrab@uni-bremen.de>\n"
@@ -22,32 +22,32 @@ msgstr "moslash uchun yordamchi"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Diqqat."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Xato."
 
 # M:
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Tabriklaymiz"
 
@@ -89,39 +89,39 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "Klientning nomi va IP raqami tarmoqda yagona bo'lishi shart."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Kompyuterning nomi:"
 
 # M:
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Kompyuterning IP raqami:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Diqqat"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Siz DHCP'dan foydalanayapsiz, server bu moslamalar bilan ishlamashi mumkin."
@@ -129,12 +129,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Xato"
@@ -182,12 +182,25 @@ msgstr "Klientning IP raqami:"
 msgid "The wizard successfully added the client."
 msgstr "Yordamchi klientni muvaffaqiyatli qo'shdi."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+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."
+msgstr ""
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Yopish"
 
@@ -273,8 +286,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "o'chirilgan"
@@ -283,8 +296,8 @@ msgstr "o'chirilgan"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "yoqilgan"
@@ -297,147 +310,136 @@ msgstr "Interfeys:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Yordamchi DHCP xizmatlarini muvaffaqiyatli mosladi."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Muvaffaqiyatsiz tugadi"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr ""
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Asosiy DNS serveri"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Ikkilamchi DNS serveri"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "DNS'ga xostni qo'shish"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "DNS'dan xostni olib tashlash"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Asosiy DNS xizmatini moslash uchun yordamchi"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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 ""
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Siz nima qilmoqchisiz:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS serveri"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "Serverning IP raqami:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Olib tashlash uchun quyidagi ro'yxatdan xostni tanlang."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Xostni olib tashlash:"
 
 # M:
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Kompyuterning nomi:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Asosiy DNS serverining IP raqami:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Tashqi DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -445,111 +447,111 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Xato:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Kompyuterning nomi:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Kompyuterning IP raqami:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Serverning nomi:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr ""
 
 # M:
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 #, fuzzy
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Yordamchi klientni muvaffaqiyatli DNS'ga qo'shdi."
 
 # M:
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Yordamchi klientni muvaffaqiyatli DNS'dan olib tashladi."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Yordamchi serveringizning DNS xizmatini muvaffaqiyatli mosladi."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Tizim asosiy DNS server sifatida moslanmoqda..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Tizim ikkilamchi DNS server sifatida moslanmoqda..."
 
@@ -577,7 +579,7 @@ msgstr "Xat-xabar serveri"
 msgid "FTP server"
 msgstr "FTP serveri"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba serveri"
 
@@ -602,7 +604,7 @@ msgstr ""
 msgid "Mandrakelinux Install server"
 msgstr "Mandrake o'rnatish serveri"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab serveri"
 
@@ -629,7 +631,7 @@ msgstr ""
 "O'rnatish uchun \"Keyingi\" yoki chiqish uchun \"Bekor qilish\" tugmasini "
 "bosing"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi"
 
@@ -858,13 +860,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab serverini moslash uchun yordamchi"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -872,294 +868,285 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Maxfiy so'z:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Maxfiy so'z (yana):"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Yordamchi Kolab serverini quyidagi parametrlar bilan moslaydi"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Kompyuterning nomi:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "O'rnatish davom etmoqda"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Kolab serveri moslanmoqda..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Kolab serveri moslanmoqda..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 #, fuzzy
 msgid "Ldap wizard"
 msgstr "Samba yordamchisi"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Samba serverini moslash uchun yordamchi"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Tashqi xat-xabar serverini moslash uchun yordamchi"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "moslash uchun yordamchi"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "LDAP serverini o'rnatish."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "O'rnatish serverning moslamasi"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Ismi:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Nomi:"
 
 # M:
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Maxfiy so'z"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "passwords must match"
 msgstr "Maxfiy so'zlar mos kelmaydi"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Maxfiy so'z (yana):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Maxfiy so'zlar mos kelmaydi"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "LDAP serveri moslash"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr ""
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Direktoriya:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Direktoriya:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP maxfiy so'z:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP maxfiy so'z (yana):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "LDAP serverini o'rnatish."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Ismi:"
 
 # M:
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Foydalanuvchi:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr ""
 
 # M:
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Foydalanuvchi:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Yordamchi LDAP serverini muvaffaqiyatli mosladi."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Foydalanuvchi muvaffaqiyatli qo'shildi"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Yordamchi Samba serveringizni muvaffaqiyatli mosladi."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Muvaffaqiyatsiz tugadi"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Xato"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Yangliklar yordamchisi"
@@ -1290,13 +1277,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Direktoriya:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Siz kiritgan yo'l mavjud emas."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr ""
 
@@ -1348,136 +1335,130 @@ msgstr "Tarmoq maskasi:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Yordamchi NFS serverni muvaffaqiyatli mosladi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr ""
 
 # M:
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS klienti"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Siz nima qilmoqchisiz?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Kompyuterni NIS klienti sifatida moslash"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS serveri:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS direktoriyasi:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Yordamchi kompyuteringizni NIS klient sifatida muvaffaqiyatli mosladi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Tizim NIS klienti sifatida moslanmoqda..."
 
@@ -1809,7 +1790,7 @@ msgstr ""
 "Proksi serveringizni moslash uchun yordamchi quyidagi parametrlarni aniqladi:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1843,6 +1824,12 @@ msgstr "Squid proksi"
 msgid "PXE Wizard"
 msgstr "PXE yordamchi"
 
+#: ../pxe_wizard/Pxe.pm:78
+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
 msgid "Set PXE server"
 msgstr "PXE serverini o'rnatish"
@@ -2156,97 +2143,97 @@ msgstr ""
 msgid "PXE server"
 msgstr "PXE serveri"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba yordamchisi"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s mavjud emas."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Hamma - hammaga ruxsat"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba serverini moslash uchun yordamchi"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Bu yordamchi serveringizning Samba xizmatlarini moslashda sizga yordam "
 "beradi."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Ishchi guruh"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Ishchi guruh:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Ishchi guruhi noto'g'ri"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2254,129 +2241,129 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Samba xizmatlarini yoqish"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Fayl huquqlari"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Hamma printerlarni yoqish"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Samba serveri moslanmoqda"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Samba serverini moslash uchun yordamchi quyidagi parametrlarni aniqladi."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Bosib chiqarish serveri:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Uy:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Printerlar:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Yordamchi Samba serveringizni muvaffaqiyatli mosladi."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Samba serveri moslanmoqda..."
 
diff --git a/po/vi.po b/po/vi.po
index f6424c18..21514791 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-05 18:12+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -26,31 +26,31 @@ msgstr "đồ thuật cấu hình"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Cảnh báo."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Lỗi."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Chúc mừng"
 
@@ -91,18 +91,18 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(bạn không cần nhập miền sau tên)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Nhận biết máy khách:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Lưu ý là địa chỉ IP và tên máy khách nên là duy nhất (không đổi) trong mạng."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,21 +112,21 @@ msgstr ""
 "company.net ; Mọi máy tính trong mạng phải có một địa chỉ IP đơn nhất, theo "
 "cú pháp được phân cách bởi dấu chấm."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Tên máy tính:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Địa chỉ IP của máy tính:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Cảnh báo"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Bạn đang trong DHCP, máy chủ có thể không hoạt động với cấu hình của bạn."
@@ -134,12 +134,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Lỗi"
@@ -184,12 +184,32 @@ msgstr "IP máy khách:"
 msgid "The wizard successfully added the client."
 msgstr "Đồ thuật bổ sung thành công máy khách."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"Bạn cần hiệu chỉnh lại domainname. Với máy chủ DNS, bạn cần có domainname "
+"đúng, không tương đương với localdomain hay không có gì. Hostname phải là "
+"FQDN: Fully Qualified Domain Name. Hãy chạy drakconnect để hiệu chỉnh."
+
+#: ../common/Wizcommon.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."
+msgstr ""
+"Bạn cần hiệu chỉnh lại domainname. Với máy chủ DNS, bạn cần có domainname "
+"đúng, không tương đương với localdomain hay không có gì. Hostname phải là "
+"FQDN: Fully Qualified Domain Name. Hãy chạy drakconnect để hiệu chỉnh."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "Lệnh vẫn đang chạy. Bạn muốn dừng lệnh và thoát khỏi đồ thuật không?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Đóng"
 
@@ -280,8 +300,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "Tắt"
@@ -290,8 +310,8 @@ msgstr "Tắt"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "bật"
@@ -304,52 +324,38 @@ msgstr "Giao tiếp:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Đồ thuật cấu hình thành công các dịch vụ DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Lỗi"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Khởi chạy lại drakwizard và thử thay đổi một vài tham số."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Bạn cần hiệu chỉnh lại hostname của bạn."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Bạn cần hiệu chỉnh lại domainname. Với máy chủ DNS, bạn cần có domainname "
-"đúng, không tương đương với localdomain hay không có gì. Hostname phải là "
-"FQDN: Fully Qualified Domain Name. Hãy chạy drakconnect để hiệu chỉnh."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Máy chủ DNS chính"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Máy chủ DNS phụ"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Thêm host vào DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Bỏ host khỏi DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -357,11 +363,11 @@ msgstr ""
 "DNS (Máy Chủ Tên Miền) là dịch vụ đặt một máy tính tương xứng với một tên "
 "chủ Internet."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Đồ thuật cấu hình DNS chính"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -371,47 +377,47 @@ msgstr ""
 "cung cấp dịch vụ DNS cục bộ cho các tên máy tính cục bộ, với các yêu cầu bên "
 "ngoài được chuyển tiếp đến một DNS bên ngoài."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Cái bạn muốn làm là:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Máy chủ DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Không cần nhập thêm miền sau tên)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP máy chủ:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS domainname:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Chọn host mà bạn muốn bỏ khỏi danh sách sau đây."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Bỏ một host khỏi cấu hình DNS hiện thời."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Bỏ host:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Tên máy tính:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -421,11 +427,11 @@ msgstr ""
 "chức năng làm máy chủ sao lưu, trong trường hợp không truy cập được master "
 "server."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Địa chỉ IP của máy chủ DNS chính:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -433,11 +439,11 @@ msgstr ""
 "Forwarding chỉ xảy ra trên các tra vấn đó để làm cho máy chủ không được xác "
 "thực và không có trả lời trong cache của nó."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP của forwarder"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -445,15 +451,15 @@ msgstr ""
 "Do đó bạn cần nó và biết IP Forwarder của bạn, hãy nhập địa chỉ IP của nó. "
 "Nếu bạn không biết, hãy để trống."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS ngoài:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Thêm miền tìm kiếm"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -461,7 +467,7 @@ msgstr ""
 "Domainname của máy chủ này được tự động thêm vào, nên bạn không cần phải "
 "thêm nó tại đây."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -473,45 +479,45 @@ msgstr ""
 "thay đổi việc này bằng cách liệt kê đường dẫn tìm kiếm miền mong muốn theo "
 "từ khóa"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Tên miền mặc định để tìm:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Địa chỉ IP này không hợp lệ cho forwarder... nhấn Tiếp Theo (next) để tiếp "
 "tục"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Địa chỉ IP này của DNS chính không hợp lệ... nhấn Tiếp Theo (next) để tiếp "
 "tục"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Địa chỉ IP này không hợp lệ... nhấn Tiếp Theo (next) để tiếp tục"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "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:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Lỗi:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 "Có vẻ như host đó không có trong cấu hình DNS... nhấn Tiếp Theo để tiếp tục"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -519,70 +525,70 @@ msgstr ""
 "Chưa thiết lập máy chủ DNS bằng đồ thuật. Hãy chạy đồ thuật DNS: Máy chủ DNS "
 "chính."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Hình như bạn không có máy chủ DNS chính, vì vậy không thể thêm/bỏ host."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Đồ thuật bây giờ sẽ cấu hình DNS phụ của bạn"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "với cấu hình này:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Máy khách với định danh này sẽ được thêm vào DNS của bạn"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Tên máy tính:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Địa chỉ IP của máy:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Máy khách với định danh này sẽ bị bỏ khỏi DNS của bạn"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Máy chủ DNS sẽ được cấu hình với cấu hình sau đây"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Hostname máy chủ:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Tên miền:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Đồ thuật hoàn thành việc thêm host vào DNS của bạn."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Đồ thuật hoàn thành việc bỏ host khỏi DNS của bạn."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Đồ thuật hoàn thành cấu hình dịch vụ DNS cho máy chủ của bạn."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 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ố."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Cấu hình hệ thống làm máy chủ DNS chính..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Cấu hình hệ thống làm máy chủ DNS phụ..."
 
@@ -610,7 +616,7 @@ msgstr "Máy chủ Mail"
 msgid "FTP server"
 msgstr "Máy chủ FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Máy chủ Samba"
 
@@ -634,7 +640,7 @@ msgstr "NIS server autofs map"
 msgid "Mandrakelinux Install server"
 msgstr "Máy chủ cài đặt MandrakeLinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab server"
 
@@ -659,7 +665,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:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Cài đặt không được"
 
@@ -897,15 +903,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Đồ Thuật Cấu Hình Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Bạn cần hiệu chỉnh lại domainname, không tương đương với localdomain hay "
-"không có gì. Hãy chạy drakconnect để hiệu chỉnh."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -917,7 +915,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:59
+#: ../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 "
@@ -927,39 +925,39 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 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:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword 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:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Mật khẩu:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Nhập lại mật khẩu:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Hostname:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Mail domain:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -967,45 +965,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Đang cài đặt"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../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:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Đang cấu hình máy chủ Kolab...."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Đồ thuật Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Bạn cần hiệu chỉnh lại domainname. Với máy chủ LDAP, bạn cần có domainname "
-"đúng, không tương đương với localdomain hay không có gì. Hostname phải là "
-"FQDN: Fully Qualified Domain Name. Hãy chạy drakconnect để hiệu chỉnh."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Hiển thị cấu hình Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Thêm người dùng vào máy chủ Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Xóa cấu hình Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1013,190 +1001,188 @@ msgstr ""
 "Đây là một giao thức gọn nhỏ để truy cập các dịch vụ thư mục, đặc biệt là "
 "dịch vụ thư mục dựa trên X500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP là giao thức gọn nhỏ để truy cập thư mục."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Đồ thuật cấu hình Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Trước tiên, bạn phải thiết lập máy chủ Ldap."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Lựa chọn của bạn:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Xóa cấu hình"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Lưu base hiện có trong /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Thêm Người Dùng LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Người dùng được tạo trong:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Người dùng được tạo trong: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Tên:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "Tên:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "Đăng nhập người dùng:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Bạn phải nhập tên gọi hợp lệ."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Bạn phải nhập tên hợp lệ."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Bạn phải nhập tên người dùng hợp lệ."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Mật khẩu người dùng LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "Mật khẩu không khớp"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Mật khẩu (nhập lại):"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Bạn phải nhập mật khẩu cho LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Mật khẩu không khớp nhau"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Người quản trị"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "Người quản trị là người dùng có mọi quyền truy cập LDAP database"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Người quản trị,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Cấu hình LDAP Server"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "Domain name: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "Domain name: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Quản trị LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP directory tree"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS naming được dùng cho LDAP directory tree definition"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP directory tree:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Quản trị LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Mật khẩu LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Mật khẩu LDAP (nhập lại):"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Bạn phải nhập một LDAP directory tree hợp lệ."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Khẳng định vệc tạo người dùng"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Tên đầu:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Tên người dùng:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Tạo ở:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Thông tin xác định để cấu hình máy chủ LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Container người dùng:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Đồ thuật hoàn thành cấu hình LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Hoàn thành việc thêm người dùng"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Lỗi khi thêm người dùng trong Ldap datase"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Máy chủ đã được cấu hình rồi"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Bạn đã cấu hình Ldap Server rồi"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s lỗi"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Lỗi!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Không thể kết nối đến %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Đồ thuật News"
@@ -1333,13 +1319,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Thư mục:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Đường dẫn bạn nhập không tồn tại."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Điều khiển truy cập"
 
@@ -1392,29 +1378,21 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Đồ thuật đã hoàn thành cấu hình máy chủ NFS của bạn"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Bạn cần hiệu chỉnh lại NIS domainname. Với máy chủ NIS, bạn cần có NIS "
-"domainname đúng, không tương đương với localdomain hay không có gì."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Máy chủ NIS với autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Máy khách NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 "Thiết lập máy chủ NIS với autofs map, tập tin auto.home và auto.master."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1422,28 +1400,28 @@ msgstr ""
 "Người dùng sẽ tự động gắn kết (mount) thư mục home của họ ở máy chủ, khi họ "
 "đăng nhập mạng máy khách NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Bạn muốn làm gì?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Cấu hình máy tính thành máy khách NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Bạn phải cung cấp nisdomain và nisserver."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Máy chủ NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS Domain:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1453,7 +1431,7 @@ msgstr ""
 "tạo autofs map, nên nó sẽ tạo cho người dùng NIS khả năng automount thư mục "
 "home của họ trên máy khách NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1461,78 +1439,78 @@ msgstr ""
 "Home NIS: thư mục home cho người dùng trên máy chủ NIS. Thư mục này sẽ được "
 "xuất ra thông qua máy chủ NFS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "NIS domain: NIS domain giống như tên miền DNS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Máy chủ NIS: tên máy của bạn."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Home NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS domainname:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Đồ thuật sẽ thiết lập máy chủ NIS với autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Thư mục NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domainname: tên của NIS domain."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Máy chủ NIS: hostname của NIS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 "YPBIND daemon tìm máy chủ cho NIS domains và bảo trì NIS binding information."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Lỗi: nên là thư mục."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Lỗi: nisdomainname không được là 'none' hoặc 'localdomain'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Hãy hiệu chỉnh nó."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "Đồ thuật hoàn thành cấu hình máy tính của bạn thành máy khách NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr ""
 "Đồ thuật hoàn thành cấu hình máy tính của bạn làm máy chủ NIS với autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Cấu hình máy tính của bạn làm một máy chủ NIS với autofs map..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS với autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Đang cấu hình hệ thống làm máy khách NIS..."
 
@@ -1891,7 +1869,7 @@ msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây được cần để cấu hình proxy của bạn:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1923,6 +1901,14 @@ msgstr "Squid proxy"
 msgid "PXE Wizard"
 msgstr "Đồ thuật 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."
+msgstr ""
+"Bạn cần hiệu chỉnh lại domainname, không tương đương với localdomain hay "
+"không có gì. Hãy chạy drakconnect để hiệu chỉnh."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Lập máy chủ PXE"
@@ -2270,24 +2256,24 @@ msgstr "Đang cấu hình máy chủ PXE ...."
 msgid "PXE server"
 msgstr "Máy chủ PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Đồ thuật Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s không tồn tại."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Toàn bộ - không hạn chế truy cập"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Quy tắc - Đề nghị cho phép và từ chối các host"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2295,55 +2281,55 @@ msgstr ""
 "Samba cho phép máy chủ của bạn chạy như một máy chủ in và tập tin cho các "
 "máy trạm không chạy hệ thống Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Đồ Thuật Cấu Hình Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Đồ thuật này sẽ giúp cấu hình các dịch vụ Samba của máy chủ của bạn."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba cần biết về Nhóm Làm Việc của Windows mà nó phục vụ."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Nhóm làm việc"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Nhóm làm việc:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Nhóm làm việc không đúng"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Banner máy chủ."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr ""
 "Banner là cách để máy chủ này được mô tả trong các máy trạm chạy Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Banner máy chủ sai"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Mức độ truy cập:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2351,7 +2337,7 @@ msgstr ""
 "* Ví dụ 1: cho phép mọi IP trong 150.203.*.*; trừ một\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2359,7 +2345,7 @@ msgstr ""
 "* Ví dụ 2: cho phép các host ứng với network/netmask đã cho\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2367,7 +2353,7 @@ msgstr ""
 "* Ví dụ 3: cho phép một cặp host\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2379,23 +2365,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Lưu ý là truy cập vẫn yêu cầu mật khẩu mức người dùng thích hợp."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Cho phép host:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Từ chối host:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Các dịch vụ Samba được bật chạy"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2405,19 +2391,19 @@ msgstr ""
 "Windows và cũng cung cấp chia sẻ máy in cho các máy in nối với máy chủ của "
 "bạn."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Bật chạy vùng chia sẻ tập tin"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Bật chạy Chia Sẻ Máy Chủ In Ấn"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Tạo các thư mục home sẵn dùng cho chủ sở hữu của chúng"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2425,28 +2411,28 @@ msgstr ""
 "Bạn đã chọn việc cho phép người dùng truy cập các thư mục home của họ qua "
 "Samba nhưng bạn và họ phải sử dụng smbpasswd để lập mật khẩu."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Thư mục chia sẻ:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Hãy gõ đường dẫn của thư mục bạn muốn chia sẻ."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Tạo thư mục chia sẻ nếu chưa có"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "Không tạo được thư mục."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Quyền hạn tập tin"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2456,59 +2442,59 @@ msgstr ""
 "'@') như sau:\n"
 "root, fred, @users, @wheel cho từng loại quyền hạn."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "đọc danh sách:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "ghi danh sách:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Chọn máy in nào bạn cho phép truy cập từ người dùng xác định"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Bật chạy mọi máy in"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Cấu hình Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Đồ thuật đã thu thập các tham số sau đây để cấu hình Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Banner máy chủ:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Chia sẻ tập tin:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Máy chủ in:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Home:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Máy in:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Đồ thuật đã hoàn thành cấu hình máy chủ Samba của bạn."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Đang cấu hình máy chủ Samba..."
 
@@ -2747,3 +2733,26 @@ msgstr "Máy chủ Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Cấu hình hệ thống làm máy chủ Apache..."
+
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Bạn cần hiệu chỉnh lại hostname của bạn."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Bạn cần hiệu chỉnh lại domainname. Với máy chủ LDAP, bạn cần có "
+#~ "domainname đúng, không tương đương với localdomain hay không có gì. "
+#~ "Hostname phải là FQDN: Fully Qualified Domain Name. Hãy chạy drakconnect "
+#~ "để hiệu chỉnh."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Không thể kết nối đến %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Bạn cần hiệu chỉnh lại NIS domainname. Với máy chủ NIS, bạn cần có NIS "
+#~ "domainname đúng, không tương đương với localdomain hay không có gì."
diff --git a/po/wa.po b/po/wa.po
index f7c2c109..589b6881 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: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-05 02:26+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -24,31 +24,31 @@ msgstr "Macrea d' apontiaedje"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Adviertixhmint."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Aroke."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Complumints"
 
@@ -91,18 +91,18 @@ msgstr ""
 msgid "(you don't need to type the domain after the name)"
 msgstr "(vos n' divoz nén taper li dominne après li no)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Idintifiaedje do cliyint:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 ""
 "Notez ki l' adresse IP eyet l' no do cliyint dvèt esse unikes sol rantoele."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -112,21 +112,21 @@ msgstr ""
 "eterprijhe.net ». Tchaeke éndjole sol rantoele doet aveur ene adresse IP "
 "(unike), dj' ô bén ene adresse limerike, eg: «12.34.56.78»."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "No del éndjole:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Adresse IP di l' éndjole:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Adviertixhmint"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Vos eployîz l' dhcp, li sierveu pout n' nén ovrer avou vost apontiaedje."
@@ -134,12 +134,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Aroke"
@@ -185,13 +185,31 @@ msgstr "IP do cliyint:"
 msgid "The wizard successfully added the client."
 msgstr "Li macrea a radjouté comifåt l' cliyint."
 
-#: ../common/Wizcommon.pm:86
+#: ../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"
+msgstr ""
+"Vos dvoz coridjî vosse no d' dominne. «localhost» n' est nén on no corek po "
+"on sierveu DNS. Li no d' dominne doet esse on no plinnmint cwålifyî (FQDN)."
+
+#: ../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."
+msgstr ""
+"Vos dvoz coridjî vosse no d' dominne. Po on sierveu DNS vos dvoz aveur on no "
+"d' dominne corek, nén «localdomain» nerén on dominne vude. Enondez "
+"drakconnect po l' candjî."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 "Li comande est co en alaedje. El voloz vs touwer eyet cwiter l' macrea?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Clôre"
 
@@ -286,8 +304,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "dismetou"
@@ -296,8 +314,8 @@ msgstr "dismetou"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "en alaedje"
@@ -310,52 +328,38 @@ msgstr "Eterface:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Li macrea a-st apontyî comifåt les siervices DHCP."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Berwete"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Renondez l' macrea, et s' sayîz d' candjî kékes parametes."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Vos dvoz coridjî vosse no d' lodjoe."
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"Vos dvoz coridjî vosse no d' dominne. Po on sierveu DNS vos dvoz aveur on no "
-"d' dominne corek, nén «localdomain» nerén on dominne vude. Enondez "
-"drakconnect po l' candjî."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Sierveu DNS mwaisse"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Sierveu DNS esclåve"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Radjouter on lodjoe å DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Oister on lodjoe foû do DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -363,11 +367,11 @@ msgstr ""
 "Li DNS (Sierveu di Nos d' Dominne) est l' siervice ki mete ene adresse IP po "
 "tchaeke no d' lodjoe."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Macrea d' apontiaedje do DNS mwaisse"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -378,44 +382,44 @@ msgstr ""
 "copiutreces locåles, eyet les dmandes po les nos nén locås seront "
 "redjiblêyes viè on sierveu DNS å dfoû."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Cwè voloz vs fé:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "Eterface do sierveu DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Vos n' divoz nén taper li dominne après li no)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "Sierveu:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "No do dominne DNS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "Tchoezixhoz l' lodjoe a oister foû del djivêye chal pa dzo."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Oister on lodjoe foû d' l' apontiaedje do moumint do DNS."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Oister lodjoe:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "No del copiutrece:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -425,11 +429,11 @@ msgstr ""
 "mwaisse, et sievrè eto di sierveu di rapexhaedje s' i gn a måy des "
 "problinmes et ki l' sierveu mwaisse ni pout nén esse eployî."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Adresse IP do sierveu DNS mwaisse:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -437,11 +441,11 @@ msgstr ""
 "Li redjiblaedje est fwait seulmint po les dmandes kel sierveu ni fwait nén "
 "otorité eyet k' i n' a nén li response el muchete nerén."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "Adresse IP do redjibleu"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -449,15 +453,15 @@ msgstr ""
 "Si vos nd avoz mezåjhe, et si vos cnoxhoz l' adresse IP do redjibleu, tapez "
 "chal si adresse IP, ôtrumint leyîz l' vude"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "Difoûtrin DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Radjouter on dominne di cweraedje"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -465,7 +469,7 @@ msgstr ""
 "Li no d' dominne di ç' sierveu ci est otomaticmint radjouté, ça fwait ki vos "
 "n' divoz nén l' mete chal."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -477,30 +481,30 @@ msgstr ""
 "d' dominne locå. Çoula pout esse candjî, eyet vos ploz dner li dominne cweri "
 "dvins après li mot clé «search» (cweraedje)."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Prémetou no d' dominne a cweri:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Çouchal n' est nén ene adresse IP valide... clitchîz so «Shuvant» po "
 "continouwer"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Çouchal n' est nén ene adresse IP valide... clitchîz so «Shuvant» po "
 "continouwer"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 "Çouchal n' est nén ene adresse IP valide... clitchîz so «Shuvant» po "
 "continouwer"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -508,11 +512,11 @@ msgstr ""
 "I shonnreut ki ci lodjoe chal est ddja dins vost apontiaedje DNS... clitchîz "
 "so shuvant po continouwer"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Aroke:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -520,7 +524,7 @@ msgstr ""
 "I shonnreut ki ci lodjoe chal n' est nén edjîstré e vost apontiaedje DNS... "
 "clitchîz so shuvant po continouwer"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -528,71 +532,71 @@ msgstr ""
 "I shonnreut ki nou sierveu DNS n' åye sitî apontyî avou l' macrea. Enondez "
 "l' macrea DNS po-z apontyî on sierveu DNS mwaisse s' i vs plait."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "I shonnreut ki vos n' estoz nén on sierveu DNS mwaisse, ça fwait k' dji "
 "n' såreut radjouter/oister des lodjoes."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Li macrea va asteure fé l' apontiaedje di vosse DNS esclåve"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "avou cist apontiaedje ci:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "On cliyint avou cist idintifiaedje la serè radjouté a vosse DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "No del copiutrece:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Adresse IP del copiutrece:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "On cliyint avou cist idintifiaedje la serè oisté di vosse DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Li sierveu DNS va esse apontyî avou les parametes ki shuvèt"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "No do sierveu:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Dominne:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Li macrea a radjouté comifåt l' lodjoe a vosse DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Li macrea a oisté comifåt l' lodjoe di vosse DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Li macrea a-st apontyî comifåt les siervices DNS sol sierveu da vosse."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Renondez l' macrea, et s' sayîz d' candjî kékes parametes."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu DNS mwaisse..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu DNS esclåve..."
 
@@ -620,7 +624,7 @@ msgstr "Sierveu d' emilaedje"
 msgid "FTP server"
 msgstr "Sierveu FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Sierveu Samba"
 
@@ -644,7 +648,7 @@ msgstr "Mape autofs pol sierveu NIS"
 msgid "Mandrakelinux Install server"
 msgstr "Sierveu d' astalaedje di Mandrakelinux"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Sierveu Kolab"
 
@@ -669,7 +673,7 @@ msgstr ""
 "%s n' est nén astalé\n"
 "Clitchîz so «Shuvant» po l' astaler ou so «Rinoncî» po cwiter"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "L' astalaedje a fwait berwete"
 
@@ -921,15 +925,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Macrea d' apontiaedje di Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"Vos dvoz coridjî vosse no d' dominne, ça n' doet nén esse «localdomain» "
-"nerén on dominne vude. Enondez drakconnect po l' candjî."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -942,7 +938,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:59
+#: ../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 "
@@ -952,42 +948,42 @@ 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:59
+#: ../kolab_wizard/Kolab.pm:56
 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:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Tapez l' sicret pol conte di manaedjeu do sierveu Kolab."
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 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:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Sicret:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Ritapez l' sicret:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 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:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "No do lodjoe:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Dominne d' emilreye:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -996,45 +992,35 @@ 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:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Fijhant l' astalaedje"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Astalaedje do sierveu Kolab so vosse sistinme..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Apontiaedje do sierveu Kolab so vosse sistinme..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Macrea Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"Vos dvoz coridjî vosse no d' dominne. Po on sierveu LDAP vos dvoz aveur on "
-"no d' dominne corek, nén «localdomain» nerén on dominne vude. Enondez "
-"drakconnect po l' candjî."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "Mostrer l' apontiaedje Ldap"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "Radjouter èn uzeu å sierveu Ldap"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "Disfacer l' apontiaedje Ldap"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1042,195 +1028,193 @@ msgstr ""
 "C' est on protocole ledjir po-z aveur accès åzès siervices di botins, "
 "copurade les siervices di botins båzés so X.500."
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 "LDAP vout dir protocole ledjir d' accès åzès botins (Lightweight Directory "
 "Access Protocol)."
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Macrea d' apontiaedje Ldap"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "Vos dvoz aprume apontyî on sierveu Ldap."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "Vosse tchuze:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "Disfacer l' apontiaedje"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Wårdant li båze k' egzistêye dedja e /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "Radjoutaedje d' èn uzeu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "Uzeu askepyî e: "
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "Uzeu askepyî e: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Pitit No:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "No:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "No d' elodjaedje:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "Vos dvoz dner on ptit no valide."
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "Vos dvoz dner on no valide."
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "Vos dvoz dner on no d' uzeu valide."
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "Sicret po l' uzeu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "les screts èn corespondèt nén"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "Ritapez l' sicret:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "Vos dvoz dner on scret po LDAP."
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Les screts èn corespondèt nén"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "Manaedjeu"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 "Li manaedjeu est èn uzeu k' a-st accès al båze di dnêyes LDAP, eyet "
 "l' poleur candjî"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "Manaedjeu,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "Apontiaedje do sierveu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "No d' dominne: "
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "No d' dominne: %s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "Manaedjeu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "Coxhlaedje di botins LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 "Li lomaedje DNS est eployî pol definixhaedje do coxhlaedje di botins LDAP"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "Coxhlaedje di botins LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "Manaedjeu LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "Sicret LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "Ritapez l' sicret LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Vos dvoz dner on coxhlaedje di botins LDAP valide."
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "Acertinaedje di l' uzeu a-z askepyî"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "Pitit No:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "No d' elodjaedje:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "Askepyî e:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Acertinaedje di l' informåcion po l' askepiaedje d' on sierveu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "Contneu des uzeus:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Li macrea a-st apontyî comifåt li LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "Uzeu radjouté comifåt"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "Åk n' a nén stî tot radjoutant èn uzeu å sierveu Ldap"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "Sierveu ddja apontyî"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "Vos avoz ddja apontyî vosse sierveu Ldap"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s a fwait berwete"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "Aroke!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "Dji n' a savou m' raloyî a %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Macrea di copinreyes (newsgroups)"
@@ -1374,13 +1358,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Ridant:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Li tchmin ki vs avoz dné n' egzistêye nén."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Contrôle d' accès"
 
@@ -1403,6 +1387,9 @@ 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 ""
+"L' accès serè permetou po les lodjoes sol rantoele. Vochal l' informåcion "
+"k' a stî trovêye åd fwait di vosse rantoele locåle, vos l' poloz candjî s' i "
+"fåt."
 
 #: ../nfs_wizard/NFS.pm:80 ../proxy_wizard/Squid.pm:119
 msgid "Grant access on local network"
@@ -1432,28 +1419,20 @@ msgstr "Maske rantoele:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Li macrea a-st apontyî comifåt vosse sierveu NFS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"Vos dvoz coridjî vosse no d' dominne NIS. Po on sierveu NIS vos dvoz aveur "
-"on no d' dominne corek, nén «localdomain» nerén on dominne vude."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Sierveu NIS avou mapaedje autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Cliyint NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1461,99 +1440,99 @@ msgstr ""
 "Li cliyint pout monter otomaticmint si ridant måjhon tot s' elodjant so ene "
 "copiutrece k' est cliyint NIS sol rantoele."
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Cwè voloz vs fé?"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Apontiaedje di vosse sistinme come cliyint NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Sierveu NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Dominne NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Dominne NIS: li dominne NIS a-z eployî (normålmint li minme ki vosse dominne "
 "DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Sierveu NIS: li no d' vosse copiutrece."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "Måjhon NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "No do dominne NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Li macrea aponteyrè vosse sierveu NIS avou l' mapaedje autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Ridant NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Dominne NIS: no do dominne NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Sierveu NIS: li no del copiutrece k' est sierveu NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Aroke, ça dvreut esse on ridant."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "Li macrea a-st apontyî comifåt vosse copiutrece po-z esse on cliyint NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1561,15 +1540,15 @@ msgstr ""
 "Li macrea a-st apontyî comifåt vosse copiutrece po-z esse on sierveu NIS "
 "eployant l' mapaedje autofs."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Apontiaedje di vosse sistinme come sierveu NIS avou mapaedje autofs..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "Sierveu NIS avou mapaedje autofs"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Apontiaedje di vosse sistinme come cliyint NIS..."
 
@@ -1924,7 +1903,7 @@ msgstr ""
 "vosse procsi:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1956,6 +1935,14 @@ msgstr "Procsi Squid"
 msgid "PXE Wizard"
 msgstr "Macrea 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."
+msgstr ""
+"Vos dvoz coridjî vosse no d' dominne, ça n' doet nén esse «localdomain» "
+"nerén on dominne vude. Enondez drakconnect po l' candjî."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Defini sierveu PXE"
@@ -2326,24 +2313,24 @@ msgstr "Apontiaedje do sierveu PXE so vosse sistinme..."
 msgid "PXE server"
 msgstr "Sierveu PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Macrea Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s n' egzistêye nén."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Tos - nole restriccion d' accès"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Les rîles da minne - èm dimander les lodjoes a permete ou rfuzer"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2352,38 +2339,38 @@ msgstr ""
 "scrireces po les posses éndjolreces eployant des sistinmes d' operance nén "
 "Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Macrea d' apontiaedje di Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Ci macrea chal vos aidrè a-z apontyî les siervices Samba pol sierveu da "
 "vosse."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba a mezåjhe di cnoxhe li groupe d' ovraedje Windows a siervi."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Groupe d' ovraedje"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Groupe d' ovraedje:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Li groupe d' ovraedje n' est nén valide"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Messaedje do sierveu."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2391,19 +2378,19 @@ msgstr ""
 "Li messaedje do sierveu est çou ki srè mostré po ç' sierveu chal åzès posses "
 "éndjolreces Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Messaedje:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Li messaedje do sierveu n' est nén corek"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Livea d' accès:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2411,7 +2398,7 @@ msgstr ""
 "* Egzimpe 1: permete totes les adresses IP del sôre 150.203.*.*, såf ene\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2420,7 +2407,7 @@ msgstr ""
 "patron dné (IP-rantoele/IP-masse)\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2428,7 +2415,7 @@ msgstr ""
 "* Egzimpe 3: permete l' accès a ene cope di lodjoes\n"
 "hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2440,23 +2427,23 @@ msgstr ""
 "hosts allow = @foonet\n"
 "hosts deny = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Notez tot l' minme ki l' accès a mezåjhe di screts po les uzeus."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Permete les lodjoes:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Rifuzer les lodjoes:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Siervices Samba metous en alaedje"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2466,19 +2453,19 @@ msgstr ""
 "éndjolreces Windows, eyet pout eto dner accès å pårtaedje des scrireces ki "
 "sont raloyeyes a vosse sierveu."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Mete en alaedje li zône di pårtaedje di fitchîs"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Mete en alaedje li sierveu di pårtaedje di scrireces"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Permete ki les uzeus åyexhe accès a leus ridants måjhone"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2487,28 +2474,28 @@ msgstr ""
 "åd triviè d' samba; mins vos dvoz (ou i dvèt) eployî smbpasswd po defini "
 "l' sicret."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Ridant pårtaedjî:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Tapez l' tchimin do ridant ki vos vloz pårtaedjî."
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "Askepyî l' ridant pårtaedjî s' i n' egzistêye nén co"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "L' askepiaedje do ridant a fwait berwete."
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Permissions do fitchî"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2518,62 +2505,62 @@ msgstr ""
 "aveur on « @ » pa dvant), po tchaeke sôre di permission, come çoula:\n"
 "root, djoze, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "Djivêye léjhaedje:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, djoze, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "Djivêye sicrijhaedje:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 "Tchoezixhoz les kénès scrireces ki dvèt esse accessibe pås cnoxhous uzeus"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Peremete l' eployaedje di totes les scrireces"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Apontiaedje di Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "Samba"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Messaedje do sierveu:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Pårtaedje di fitchîs:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Sierveu d' imprimaedje:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Måjhon:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Sicrireces:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Li macrea a-st apontyî comifåt vosse sierveu Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Apontiaedje do sierveu Samba da vosse..."
 
@@ -2820,6 +2807,28 @@ msgstr "Sierveu waibe apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu waibe Apache..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Vos dvoz coridjî vosse no d' lodjoe."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "Vos dvoz coridjî vosse no d' dominne. Po on sierveu LDAP vos dvoz aveur "
+#~ "on no d' dominne corek, nén «localdomain» nerén on dominne vude. Enondez "
+#~ "drakconnect po l' candjî."
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "Dji n' a savou m' raloyî a %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "Vos dvoz coridjî vosse no d' dominne NIS. Po on sierveu NIS vos dvoz "
+#~ "aveur on no d' dominne corek, nén «localdomain» nerén on dominne vude."
+
 #~ msgid "Configure Ldap server"
 #~ msgstr "Apontiaedje do sierveu Ldap"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e29ed267..0c521896 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-09-08 00:50+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -24,31 +24,31 @@ msgstr "配置向导"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "警告。"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "出错。"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "恭喜"
 
@@ -85,17 +85,17 @@ msgstr "此向导将帮助您把一个新的客户机添加到您的本地 DNS�
 msgid "(you don't need to type the domain after the name)"
 msgstr "(在名字后面不必输入域名)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "客户机身份:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "注意提供的 IP 地址和客户机名字在网络上应该是唯一的。"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -104,33 +104,33 @@ msgstr ""
 "您的网络客户机将通过名字来鉴别，例如 clientname.company.net。网络中每台机器必"
 "须有一个(唯一的)IP 地址，使用常规的点分隔语法。"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "机器名:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "机器的 IP 地址:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "警告"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "您在使用 dhcp，服务器可能无法按照您的配置工作。"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "出错"
@@ -173,12 +173,32 @@ msgstr "客户机 IP:"
 msgid "The wizard successfully added the client."
 msgstr "向导成功地添加了客户。"
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
+"localdomain 或不设置。主机名必须是 FQDN: 全称域名。请使用 DrakConnect 进行调"
+"整。"
+
+#: ../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."
+msgstr ""
+"您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
+"localdomain 或不设置。主机名必须是 FQDN: 全称域名。请使用 DrakConnect 进行调"
+"整。"
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr "命令仍在运行。您是否想要杀死它然后退出向导?"
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "关闭"
 
@@ -264,8 +284,8 @@ msgstr "为了配置 DHCP 服务，向导收集了下列需要的参数:"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "已禁用"
@@ -274,8 +294,8 @@ msgstr "已禁用"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "已启用"
@@ -288,63 +308,49 @@ msgstr "网卡:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "向导成功地配置了 DHCP 服务。"
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "失败"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "重新调用配置向导，然后试着更新一些参数。"
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "您需要重新调整您的主机名。"
-
-#: ../dns_wizard/Bind.pm:76
-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 ""
-"您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
-"localdomain 或不设置。主机名必须是 FQDN: 全称域名。请使用 DrakConnect 进行调"
-"整。"
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "主 DNS 服务器"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "从 DNS 服务器"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "在 DNS 中添加主机"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "在 DNS 中删除主机"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 "DNS(Domain Name Server，域名服务器)是通过网络主机名字找到相应机器的服务。"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "主 DNS 配置向导"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -353,44 +359,44 @@ msgstr ""
 "此向导将帮助您配置您服务器上的 DNS 服务。所做的配置将提供 DNS 服务以解析本地"
 "的计算机名字，非本地的请求将被转发给外部的 DNS。"
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "您想要执行何种操作:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 msgid "DNS server Interface"
 msgstr "DNS 服务器接口"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(在名字后面不必添加域名)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 msgid "Server:"
 msgstr "服务器:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 msgid "DNS Domainname:"
 msgstr "DNS 域名:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "请在下面的列表中选择您想要删除的主机。"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "在现有的 DNS 配置中删除主机。"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "删除主机:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "计算机名:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -399,11 +405,11 @@ msgstr ""
 "从域名服务器能够分担一部分主域名服务器的负担，并且可以作为一个备份用的服务"
 "器，在您的主服务器无法连接上时继续提供服务。"
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "主 DNS 服务器的 IP 地址:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
@@ -411,32 +417,32 @@ msgstr ""
 "向前查询只在要查询的服务器是非官方的或者在服务器的缓存中没有相应的回应的情况"
 "下发生。"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "转发器的 IP 地址:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
 msgstr ""
 "如果您需要它，并且知道您的转发器的 IP 地址的话，请输入它；否则，请您留空。"
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "外部 DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "添加搜索域"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr "域名是服务器自动添加的，所以您不必在此处添加。"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -446,110 +452,110 @@ msgstr ""
 "主机名查询的搜索列表。这个搜索列表通常由本地域名所决定；默认情况下，它仅仅包"
 "含本地域名。它可以通过列出想要的搜索关键词的域搜索路径来修改。"
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "搜索的默认域名:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "您的转发器 IP 地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "主 DNS 服务器的 IP 地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "这个 IP 地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr "看起来主机已经在您的 DNS 配置中了...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "错误:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr "看起来它并不在您的 DNS 配置中...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr "看起来在向导中并没有设定 DNS 服务器。请运行 DNS 向导: 主 DNS 服务器。"
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "看起来您的 DNS 服务器并不是主 DNS 服务器，而仅仅是从服务器。所以我无法添加/删"
 "除主机。"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "向导现在将创建您的从 DNS 配置"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "使用这个配置:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "采用这个标识的客户端将被添加到您的 DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "计算机名:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "计算机的 IP 地址:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "采用这个标识的客户端将被从您的 DNS 中删除"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "这个 DNS 服务器即将按照以下配置情况进行配置"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "服务器主机名:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "域名:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "向导成功地在您的 DNS 中添加了主机。"
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "向导成功地从您的 DNS 中删除了主机。"
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "向导已成功地为您的服务器配置了 DNS 服务。"
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "请重新调用配置向导，然后试着更新一些参数。"
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "正在将您的系统配置为主 DNS 服务器..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "将您的系统配置为从 DNS 服务器..."
 
@@ -577,7 +583,7 @@ msgstr "邮件服务器"
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba 服务器"
 
@@ -601,7 +607,7 @@ msgstr "NIS 服务器 Autofs 映射"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrakelinux 安装服务器"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Kolab 服务器"
 
@@ -626,7 +632,7 @@ msgstr ""
 "%s 未安装\n"
 "单击“下一步”安装，单击“取消”退出"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "安装失败"
 
@@ -852,15 +858,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Kolab 配置向导"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"您需要重新调整您的主机名，不能是 localdomain 或不设置。请使用 DrakConnect 进行"
-"调整。"
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -871,7 +869,7 @@ msgstr ""
 "面，一个提供给邮箱用户和联系人的共享地址簿，以及通过 POP3 和 IMAP4(rev1)访问"
 "邮件的功能。"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -880,39 +878,39 @@ msgstr ""
 "警告: Kolab 需要配置许多其它服务: Proftpd、LDAP、Cyrus、Postfix、Imap、"
 "Saslauth。向导将会为您先行备份这些服务的配置文件。"
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "欢迎使用 Kolab 群件服务器配置向导。"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "输入 Kolab 服务器管理员账户的密码。"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "密码不相配，或者密码为空，请纠正。"
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "密码:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "重输密码:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "向导现在将用此参数配置 Kolab 服务器"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "主机名:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "邮件域名:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
@@ -920,234 +918,222 @@ msgstr ""
 "kolab 服务器现已配置并运行起来了。请在 https://127.0.0.1/kolab/admin/ 以用户"
 "名“manager”及您输入的密码登录"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "安装进行中"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "正在您的系统中安装 Kolab 服务器..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "正在您的系统中配置 Kolab 服务器..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap 向导"
 
-#: ../ldap_wizard/Ldap.pm:64
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"您需要重新调整您的主机名。对于 LDAP 服务器，您需要正确的域名，而不能是 "
-"localdomain 或不设置。主机名必须是 FQDN: 全称域名。请使用 DrakConnect 进行调"
-"整。"
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 msgid "Show Ldap configuration"
 msgstr "显示 Ldap 配置"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr "在 Ldap 服务器中添加用户"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 msgid "Delete Ldap configuration"
 msgstr "删除 Ldap 配置"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr "这是一种访问目录服务的轻量级协议，特别适用于基于 X.500 的目录服务。"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "LDAP 代表轻量级目录访问协议。"
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 msgid "Ldap configuration wizard"
 msgstr "Ldap 配置向导"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 msgid "You must setup an Ldap server first."
 msgstr "您必须先设置 Ldap 服务器。"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr "您的选择:"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Delete configuration"
 msgstr "删除配置"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "在 /root/ldap-sav.ldiff 保存已有基"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr "LDAP 添加用户"
 
-#: ../ldap_wizard/Ldap.pm:154
-msgid "User Created in: "
-msgstr "用户创建于:"
+#: ../ldap_wizard/Ldap.pm:139
+#, perl-format
+msgid "User Created in: %s, %s"
+msgstr "用户创建于: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "名:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 msgid "Name:"
 msgstr "名称:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 msgid "User Login:"
 msgstr "用户登录:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr "您必须输入有效的名。"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr "您必须输入有效的名称。"
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr "您必须输入有效的用户名。"
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 msgid "LDAP User Password"
 msgstr "LDAP 用户密码"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr "密码不匹配"
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 msgid "Password (again):"
 msgstr "重输密码:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr "您必须为 LDAP 输入密码。"
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "密码不匹配"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr "管理员"
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr "管理员是 LDAP 数据库中授权的超级用户"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr "管理员,%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Configuring LDAP Server"
 msgstr "配置 LDAP 服务器"
 
-#: ../ldap_wizard/Ldap.pm:197
-msgid "Domain name: "
-msgstr "域名:"
+#: ../ldap_wizard/Ldap.pm:181
+#, perl-format
+msgid "Domain name: %s"
+msgstr "域名:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr "管理员 LDAP"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP directory tree"
 msgstr "LDAP 目录树"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr "DNS 命名用于 LDAP 目录树定义"
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 msgid "LDAP directory tree:"
 msgstr "LDAP 目录树:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr "管理员 LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 msgid "LDAP Password:"
 msgstr "LDAP 密码:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 msgid "LDAP Password (again):"
 msgstr "LDAP 重输密码:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 msgid "You must enter a valid LDAP directory tree."
 msgstr "您必须输入有效的 LDAP 目录树。"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr "确认创建用户"
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 msgid "First name:"
 msgstr "名:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "用户名:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr "创建于:"
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 msgid "Confirmation Information for create an LDAP server"
 msgstr "确认创建 LDAP 服务器的信息"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 msgid "Users Container:"
 msgstr "用户容器:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "向导成功地配置了 LDAP。"
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr "成功地添加了用户"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr "在 Ldap 数据库中添加用户出错"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr "服务器已经配置"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "You have already configured your Ldap Server"
 msgstr "您已经配置了您的 Ldap 服务器"
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, perl-format
 msgid "%s Failed"
 msgstr "%s 失败"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 msgid "Error!"
 msgstr "出错!"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr "无法连接到 %s"
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "新闻组向导"
@@ -1278,13 +1264,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "目录:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "您输入的路径不存在。"
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "访问控制"
 
@@ -1336,55 +1322,47 @@ msgstr "子网掩码:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "向导成功地配置了您的 NFS 服务器"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"您需要重新调整您的 NIS 域名。对于 NIS 服务器，您需要正确的 NIS 域名，而不能是"
-"localdomain 或不设置。"
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "带 Autofs 映射的 NIS 服务器"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS 客户端"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "设置带 Autofs 映射、auto.home 和 auto.master 文件的 NIS 服务器。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr "用户会在登录到 NIS 客户端网络时从服务器自动挂载他们的 home 目录。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "您想要执行何种操作？"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "将计算机配置为 NIS 客户"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "您必须输入 NIS 域名和 NIS 服务器。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NFS 服务器:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS 域名:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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 "
@@ -1393,83 +1371,83 @@ msgstr ""
 "NIS 服务器用于创建用户、主机名数据库。向导将将创建 autofs 映射，这样可让 NIS "
 "用户在 NIS 客户计算机上自动挂载其主目录。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 "Home NIS: NIS 服务器中用户的 home 基础目录。此目录将用作 NIS 服务器的导出。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr "NIS 域名: 您要使用的 NIS 域名(通常与您的 DNS 域名相同)。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS 服务器: 您计算机的名称。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "主 NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS 域名:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "向导将要设置您的带 Autofs 映射的 NIS 服务器"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS 目录:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS 域名: NIS 域上的名字。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS 服务器: NIS 服务器的主机名。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr "YPBIND 守护程序查找 NIS 域服务器并维护 NIS 绑定信息。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "错误，需要是一个目录。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "错误，NIS 域名不能为“none”或者“localdomain”。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "请进行纠正。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "向导成功地将您的计算机配置为 NIS 客户。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "向导成功地将您的计算机配置为带 autofs 映射的 NIS 服务器。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "将您的系统配置为带 autofs 映射的 NIS 服务器..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "带 autofs 映射的 NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "正在将您的系统配置为 NIS 客户..."
 
@@ -1482,8 +1460,8 @@ msgid ""
 "Error, can't find your hostname in /etc/hosts. Exiting. Please launch "
 "drakconnect and choose static IP address."
 msgstr ""
-"出错，无法在 /etc/hosts 中找到您的主机名。退出。请调用 DrakConnect 并选择静态 "
-"IP 地址。"
+"出错，无法在 /etc/hosts 中找到您的主机名。退出。请调用 DrakConnect 并选择静"
+"态 IP 地址。"
 
 #: ../postfix_wizard/Postfix.pm:59
 msgid "External mail server"
@@ -1804,7 +1782,7 @@ msgid ""
 msgstr "为了配置您的代理服务器，向导收集了下列需要的参数:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1836,6 +1814,14 @@ msgstr "Squid 代理服务器"
 msgid "PXE Wizard"
 msgstr "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."
+msgstr ""
+"您需要重新调整您的主机名，不能是 localdomain 或不设置。请使用 DrakConnect 进"
+"行调整。"
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "设置 PXE 服务器"
@@ -2169,78 +2155,78 @@ msgstr "正在您的系统中配置 PXE 服务器..."
 msgid "PXE server"
 msgstr "PXE 服务器"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba 向导"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "全部 - 没有访问限制"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "我的规则 - 询问我允许和禁用主机"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 "Samba 让您的服务器为运行 Linux 以外操作系统的工作站提供文件和打印服务。"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba 配置向导"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "此向导将帮助您在您的服务器上配置 Samba 服务。"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba 要服务的 Windows 工作组。"
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "工作组"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "工作组:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "工作组不对"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "服务器标志。"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "这个标志会显示在 Windows 网络邻居中这个服务器名字旁边作为描述。"
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "标志:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "服务器标志不对"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "访问级别:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2248,7 +2234,7 @@ msgstr ""
 "* 示例 1: 允许 150.203.*.* 中的所有 IP，除了其中一个\n"
 "允许的主机 = 150.203. 除了 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2256,7 +2242,7 @@ msgstr ""
 "* 示例 2: 所有的主机都必须与给定的网络/网络掩码匹配\n"
 "主机允许 = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2264,7 +2250,7 @@ msgstr ""
 "* 示例 3: 允许一组主机\n"
 "主机允许 = lapland, arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2275,23 +2261,23 @@ msgstr ""
 "主机允许 = @foonet\n"
 "主机禁止 = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "请注意，访问仍然需要适当的用户级别密码。"
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "允许的主机:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "禁止的主机:"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "已启用 Samba 服务"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2300,19 +2286,19 @@ msgstr ""
 "Samba 可以为您的 Windows 工作站提供一个文件共享区域，还可以让其他网络客户共享"
 "您的服务器连接的打印机。"
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "启用文件共享区域"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "启用服务器打印机共享"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "让用户可以访问自己的主目录"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2320,28 +2306,28 @@ msgstr ""
 "您选择了允许用户通过 Samba 访问他们的 home 目录，但是用户必须使用 smbpasswd "
 "设置一个密码。"
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "共享目录:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "请输入您想要共享的目录路径。"
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr "如果目录不存在则创建"
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr "创建目录失败。"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "文件许可"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2350,59 +2336,59 @@ msgstr ""
 "请为每种许可输入以逗号分隔的用户或组(组必须以“@”开头)，如: \n"
 "root, fred, @users, @wheel。"
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "读取列表:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "写入列表:"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "选择您想要让已知用户访问的打印机"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "启用全部打印机"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "配置 Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "为了配置 Samba，向导收集了下列需要的参数。"
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "服务器标语:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "文件共享:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "打印服务器:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "主目录:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "打印机:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "向导成功地配置了您的 Samba 服务器。"
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "正在配置您的 Postfix 服务器..."
 
@@ -2632,6 +2618,28 @@ msgstr "Apache 服务器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "您需要重新调整您的主机名。"
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "您需要重新调整您的主机名。对于 LDAP 服务器，您需要正确的域名，而不能是 "
+#~ "localdomain 或不设置。主机名必须是 FQDN: 全称域名。请使用 DrakConnect 进行"
+#~ "调整。"
+
+#~ msgid "Unable to connect to %s"
+#~ msgstr "无法连接到 %s"
+
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "您需要重新调整您的 NIS 域名。对于 NIS 服务器，您需要正确的 NIS 域名，而不"
+#~ "能是localdomain 或不设置。"
+
 #~ msgid "Configure Ldap server"
 #~ msgstr "配置 Ldap 服务器"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 58f150c6..94e5b85e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-02-21 22:10+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -23,31 +23,31 @@ msgstr "設定精靈"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "警告."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "錯誤."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "恭喜"
 
@@ -85,17 +85,17 @@ msgstr "本精靈會幫助您去增加一個新客戶端在您的本地端 DNS �
 msgid "(you don't need to type the domain after the name)"
 msgstr "(您不需要在名字後鍵入網域)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "客戶端認證:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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 "注意在網路上所給定的 IP 位址和客戶端名稱都應該是獨一的."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../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, "
@@ -104,33 +104,33 @@ msgstr ""
 "在網路上, 您的客戶端會用名稱來識別, 如clientname.company.net.網路上每一部機器"
 "都必須有一個以常用小點記號排列方式的(獨一) IP 位址."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "機器名稱:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "機器的 IP 位址:"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "警告"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "您正在 dncp 中, 伺服器可能不能與您的設定運作."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "錯誤"
@@ -171,12 +171,31 @@ msgstr "客戶端 IP:"
 msgid "The wizard successfully added the client."
 msgstr "精靈已成功加入一個客戶端."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+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 ""
+"您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
+"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+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 ""
+"您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
+"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "關閉"
 
@@ -260,8 +279,8 @@ msgstr "精靈收集到以下需要設定您的 DHCP 服務的參數:"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "已關閉"
@@ -270,8 +289,8 @@ msgstr "已關閉"
 #: ../ftp_wizard/Proftpd.pm:129 ../ftp_wizard/Proftpd.pm:130
 #: ../ftp_wizard/Proftpd.pm:131 ../ftp_wizard/Proftpd.pm:132
 #: ../ftp_wizard/Proftpd.pm:133 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "已啟用"
@@ -285,63 +304,49 @@ msgstr "介面:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "這精靈成功為您的伺服器設定 DHCP 服務."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "失敗"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "重新發動 drakwizard, 且嘗試改變某些參數."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "您須要重新調整您的主機名稱."
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-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 ""
-"您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
-"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "主要 DNS 伺服器"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "次要 DNS 伺服器"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "增加主機於 DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "移除主機於 DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
 msgstr ""
 " DNS  (Domain Name Server)是對應一個機器 IP 位址到一個網際網路主機名稱的服務."
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "主要 DNS 組態設定精靈"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -350,49 +355,49 @@ msgstr ""
 "這精靈會幫助您設定您的伺服器的 DNS 服務. 這設定會提供一個本地端 DNS服務給予本"
 "地端電腦名稱, 並傳送非本地端性要求到外面的 DNS."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "您想要做什麼:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "DNS 伺服器"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 #, fuzzy
 msgid "(You don't need to add the domain after the name)"
 msgstr "(您不需要在名字後鍵入網域)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "伺服器 IP:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "NIS 網域名稱:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Choose the host you want to remove in the following list."
 msgstr "請於下列清單中選擇您想要移除的主機."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 #, fuzzy
 msgid "Remove a host in existing DNS configuration."
 msgstr "於存在的 dns 組態設定中移除一個主機."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "移除主機:"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "電腦名稱:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../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 "
@@ -401,21 +406,21 @@ msgstr ""
 "一個附的名稱伺服器將承受一些主的名稱伺服器的負載, 且也會有備份伺服的功能, 以"
 "備您的主要伺服器是不可達到的."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "主要 DNS 伺服器的 IP 位址:"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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."
 msgstr "重新發送發生於那些伺服器並非授權且於它的 cache 中沒有答案的查詢."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "您的重新發送者的 IP"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../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"
@@ -423,21 +428,21 @@ msgstr ""
 "如果您需要它且知道您的 ip 重新發送者, 輸入它的 IP 位址. 如果您不知道, 則留下"
 "空白."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "外部 DNS:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "增加搜尋網域"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr "這個伺服器的網域名稱被自動加入, 且您不需要於此加入它."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../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 "
@@ -447,111 +452,111 @@ msgstr ""
 "查看主機名稱的搜尋清單. 搜尋清單一般是由本地端網域名稱決定; 預設為只有包含本"
 "地端網域名稱. 這或許可藉由列出渴望的網域搜尋路徑 接著搜尋關鍵字而被改變."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "預設網域名稱以搜尋:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "對您的轉寄者而言, 這不是一個有效的 IP 位址... 請按下一步繼續"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "這不是一個有效的主要 DNS IP 位址... 請按下一步繼續"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "這不是一個有效的 IP 位址... 請按下一步繼續"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr "似乎主機已經存在於您的 DNS 組態設定中... 按下下一步以繼續"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "錯誤:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr "似乎這個並不存在於您的 DNS 組態設定中... 按下下一步以繼續"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr "次乎沒有 DNS 伺服器由精靈中被設定. 請執行 DNS 精靈: 主要 DNS 伺服器."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "似乎您並不是一個主要 DNS 伺服器, 但是只是一個次的. 所意我不能增加/移除主機."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 #, fuzzy
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "OK 現在建構您的 DNS 次的組態設定"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "於這個組態設定:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "合於這個識別的客戶端將會被增加到您的 DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "電腦名稱:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "電腦 IP 位址:"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "合於這個識別的客戶端將會於您的 DNS 中被移除"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "此 DNS 伺服器將要被設定成下列組態"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "伺服器主機名稱:"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "網域名稱:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "精靈成功地加入主機於您的 DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "精靈成功地於您的 DNS 中移除主機."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "精靈成功地設定您的伺服器的 DNS 服務."
 
-#: ../dns_wizard/Bind.pm:281
+#: ../dns_wizard/Bind.pm:275
 #, fuzzy
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "重新發動 drakwizard, 且嘗試改變某些參數."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "正在設定您的系統成為主要 DNS 伺服器 ..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "正在設定您的系統成為次要 DNS 伺服器 ..."
 
@@ -579,7 +584,7 @@ msgstr "電郵伺服器"
 msgid "FTP server"
 msgstr "FTP 伺服器"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Samba 伺服器"
 
@@ -604,7 +609,7 @@ msgstr "NIS 伺服器 autofs 地圖"
 msgid "Mandrakelinux Install server"
 msgstr "Mandrake 安裝伺服器"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Kolab server"
 msgstr "Samba 伺服器"
@@ -631,7 +636,7 @@ msgstr ""
 "%s 沒有安裝\n"
 "要安裝點選 \"Next 下一步\" 或 \"Cancel 取消\" 離開"
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "安裝失敗"
 
@@ -859,16 +864,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Samba 設定精靈"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-#, fuzzy
-msgid ""
-"You need to readjust your domainname, not equal to localdomain or none. "
-"Please launch drakconnect to adjust it."
-msgstr ""
-"您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
-"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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 "
@@ -876,309 +872,295 @@ msgid ""
 "(rev1) access to mail"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../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."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 #, fuzzy
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "網頁伺服器設定精靈"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 #, fuzzy
 msgid "Password again:"
 msgstr "密碼:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 #, fuzzy
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "精靈成功設定您的伺服器的網際網路電郵服務."
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 #, fuzzy
 msgid "Hostname:"
 msgstr "主機名稱"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 #, fuzzy
 msgid "Mail domain:"
 msgstr "NIS 網域:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../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/"
 msgstr ""
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Install in progress"
 msgstr "安裝目錄:"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 #, fuzzy
 msgid "Installing Kolab server on your system..."
 msgstr "正在設定您的 Samba 伺服器..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 #, fuzzy
 msgid "Configuring Kolab server on your system..."
 msgstr "正在設定您的 Samba 伺服器..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Ldap 精靈"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP 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 ""
-"您須要重新調整您的網域名稱. 對於一個 LDAP 伺服器而言, 您需要一個正確 的網域名"
-"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "LDAP 組態設定精靈"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 msgid "Add user in Ldap server"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "LDAP 組態設定精靈"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "LDAP 組態設定精靈"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "設定 PXE 伺服器."
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "安裝伺服器組態設定"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "增加使用者"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "名子:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "使用者名稱:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "增加使用者"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "密碼"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "密碼:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "密碼不符合"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "正在設定 Samba 中"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "網域名稱:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "網域名稱:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "TFTP 目錄:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "TFTP 目錄:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "密碼:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "密碼:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "TFTP 目錄:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "名子:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "使用者名稱:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "正在設定 DHCP 伺服器"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "增加使用者"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "精靈成功地設定 LDAP."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 msgid "Successfully added User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 msgid "Error when adding user in Ldap database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "這精靈成功設定您的 Samba 伺服器."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "失敗"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "錯誤"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "新聞精靈"
@@ -1308,13 +1290,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "目錄:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "存取權控制"
 
@@ -1367,141 +1349,132 @@ msgstr "網路遮罩"
 msgid "The wizard successfully configured your NFS server."
 msgstr "精靈成功設定您的 NFS 伺服器"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your NIS domainname. For a NIS server you need a "
-"correct NIS domainname, not equal to localdomain or none."
-msgstr ""
-"您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
-"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "有 autofs 地圖的 NIS 伺服器"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "NIS 客戶端"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "NIS 伺服器:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "NIS 網域:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 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:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "NIS 伺服器: 您的電腦名稱."
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "家 NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "NIS 網域名稱:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 #, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "精靈成功地設定您的機器成為一個有 autofs 地圖的 NIS 伺服器."
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "NIS 目錄:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS 網域名稱:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 #, fuzzy
 msgid "NIS server: hostname of the NIS server."
 msgstr "NIS 伺服器: 您的電腦名稱."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "精靈成功地設定您的機器成為一個 NIS 客戶端."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
 msgstr "精靈成功地設定您的機器成為一個有 autofs 地圖的 NIS 伺服器."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "正在設定您的系統成為一個有 Autofs 地圖的 NIS 伺服器..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "有 Autofs 地圖的 NIS 伺服器"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "正在設定您的系統成為 NIS 客戶端 ..."
 
@@ -1846,7 +1819,7 @@ msgid ""
 msgstr "精靈收集到以下需要設定您的代理伺服器的參數:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -1876,6 +1849,15 @@ msgstr "Squid 代理伺服器"
 msgid "PXE Wizard"
 msgstr "PXE 精靈"
 
+#: ../pxe_wizard/Pxe.pm:78
+#, fuzzy
+msgid ""
+"You need to readjust your domainname, not equal to localdomain or none. "
+"Please launch drakconnect to adjust it."
+msgstr ""
+"您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域名"
+"稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "設定 PXE 伺服器"
@@ -2191,25 +2173,25 @@ msgstr ""
 msgid "PXE server"
 msgstr "PXE 伺服器"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Samba 精靈"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 #, fuzzy
 msgid "All - no access restriction"
 msgstr "全部 - 沒有使用存取限制"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2217,72 +2199,72 @@ msgstr ""
 "Samba 容許您的伺服器作為一台檔案及列印機伺服器, 提供服務予一些非 Linux 系統的"
 "工作站."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Samba 設定精靈"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "這精靈會幫助您設定您的伺服器的 Samba 服務."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Samba 需要知道所服務的視窗工作群組."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "工作群"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "工作群組:"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "錯誤工作群"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "伺服器橫幅."
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
 msgstr "橫幅是一個在各視窗工作站上描述此伺服器的方法."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "橫幅:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "伺服器橫幅不正確"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "存取等級:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2290,23 +2272,23 @@ msgid ""
 "hosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "啟用 Samba 服務"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -2315,19 +2297,19 @@ msgstr ""
 "Samba 可以提供一個公共檔案分享本地端給予您的視窗工作站,也可以提供分享連接上您"
 "的伺服器的列印機."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "啟用 /home/samba/public sharing area"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "啟用伺服器上的列印機分享"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "使家目錄可被他們的擁有者使用"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2335,87 +2317,87 @@ msgstr ""
 "您選擇了准許使用者經由 samba 存取他們的主目錄, 但是您/他們必須使用 smpasswd "
 "去設定密碼."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
 "root, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "啟用全部列印機"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "正在設定 Samba 中"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr "精靈收集到以下需要設定 Samba 的參數."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "伺服器橫幅:"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "檔案分享:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "列印伺服器:"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "家目錄:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "列印機:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "這精靈成功設定您的 Samba 伺服器."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "正在設定您的 Samba 伺服器..."
 
@@ -2634,6 +2616,30 @@ msgstr "Apache 伺服器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在設定您的系統成為 Apache 伺服器 ..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "您須要重新調整您的主機名稱."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP 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 ""
+#~ "您須要重新調整您的網域名稱. 對於一個 LDAP 伺服器而言, 您需要一個正確 的網"
+#~ "域名稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "增加使用者"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your NIS domainname. For a NIS server you need a "
+#~ "correct NIS domainname, not equal to localdomain or none."
+#~ msgstr ""
+#~ "您須要重新調整您的網域名稱. 對於一個 DNS 伺服器而言, 您需要一個正確 的網域"
+#~ "名稱, 不同等於本地端網域或沒有. 發動 drakconnect 來調整它."
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "正在設定 DHCP 伺服器"