updated pot file

52 files changed, 13544 insertions, 9983 deletions

diff --git a/po/ar.po b/po/ar.po
index 18893920..775e68aa 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,21 +9,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2002-08-14 14:25+0200\n"
 "Last-Translator: <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: ../Wiztemplate.pm:31
 #, fuzzy
 msgid "configuration wizard"
 msgstr "معالج التهيئة"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,9 +32,9 @@ msgstr "معالج التهيئة"
 msgid "Warning."
 msgstr "تحذير"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -43,12 +43,12 @@ msgid "Error."
 msgstr "خطأ في المعالج."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -87,22 +87,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "هذا المعالح سيساعدك على اضافة عميل جديد في الـ DNS الجديد."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(لن تحتاج الى كتابة النظاق بعد الإسم)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "تعريف العميل:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,28 +111,29 @@ msgstr ""
 "سيتم التعرف على العميل بالإسم, مثل clientname.company.net. كل جهاز كمبيوتر "
 "يجب أن يكون لديه عنوان IP خاص به, بالصيغة المنقوطة المعروفة."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "اسم الجهاز:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "رقم IP الخاص بالجهاز"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "تحذير\\nأنت في DHCP, الخادم قد لا يعمل بهذه التهيئة."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -178,7 +179,7 @@ msgstr "عنوان IP للعميل:"
 msgid "The wizard successfully added the client."
 msgstr "قام المعالج بإضافة العميل بنجاح."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "معالج DHCP"
 
@@ -194,60 +195,89 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "هذا المعالج سيساعدك على تهيئة خدمات DHCP لخادمك."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "حدود العناوين المستخدمة عن طريق DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "اختر حدود العناوين المعطاة لمحطات العمل عن طريق خدمة DHCP; ان لم تكن لك "
 "حاجات خاصة, يمكنك قبول القيم المعطاة بأمان"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "عنوان IP الأقل:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "عنوان IP الأعلى:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "حدود IP المحددة غير صحيحة"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "حدود IP المحددة ليست في حدود عناوين الشبكة للخادم"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "عنوان IP للخادم لا يجب أن يكون في الحدود"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "جاري تهيئة خادم DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "قام المعالج بتهيئة المعاملات التالية و الضرورية لتهيئة خدمة DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "معطل"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "ممكّن"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "قام المعالج بتهيئة خدمات DHCP بنجاح."
 
@@ -255,20 +285,20 @@ msgstr "قام المعالج بتهيئة خدمات DHCP بنجاح."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "خادم NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "خادم NFS"
@@ -305,72 +335,73 @@ msgstr ""
 "خدمة DNS محلية لأسماء أجهزة الكمبيوتر المحلية, مع ارسال الطلبات الغير محلية "
 "الى DNS خارجي."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "امنع المستضيفات:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "اسم النظاق المحسوب"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "جاري تهيئة خادم DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "بوابة خارجية"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -378,117 +409,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "هذا العنوان غير صالح... اضغط التالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "هذا العنوان غير صالح... اضغط التالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "هذا العنوان غير صالح... اضغط التالي للمتابعة"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "خطأ في المعالج."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "معالج DNS (تهيئة)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "اسم النظاق المحسوب"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "عنوان IP للخادم:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "اسم الخادم:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "قام المعالج بإضافة العميل بنجاح."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "قام المعالج بإضافة العميل بنجاح."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "قام المعالج بتهيئة خدمات DNS بنجاح."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "جاري تهيئة خادم DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "جاري تهيئة خادم DNS"
@@ -572,6 +603,7 @@ msgid "Please select a wizard"
 msgstr "فضلاً اختر معالج"
 
 #: ../drakwizard.pl:138
+#, perl-format
 msgid ""
 "%s is not installed\n"
 "Click \"Next\" to install or \"Cancel\" to quit"
@@ -585,27 +617,23 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "معالج FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "معالج تهيئة خادم FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "هذا المعالج سيساعدك على تهيئة خادم FTP لشبكتك."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "لا تقم بالتأشير على أي صندوق اذا لم تكن ترغب في تفعيل خادم FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "خادم FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "اختر نوع خدمة FTP التي تريد تفعيلها:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -613,81 +641,83 @@ msgstr ""
 "يمكن لخادمك أن يكون خادم FTP لشبكتك الداخلية (الإنترانت) و كخادم FTP "
 "للإنترنت."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "مكّن خادمات FTP للإنترانت"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "مكّن خادم FTP للإنترنت"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "اسمح المستضيفات:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
-msgstr "تحذير\\nأنت في DHCP, الخادم قد لا يعمل بهذه التهيئة."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "عفواً, يجب أن تكون المستخدم الجذر كي تقوم بهذا..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "جاري تهيئة خادم FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "قام المعالج بتجميع المعاملات التالية و الضرورية لتهيئة خادم FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -696,35 +726,35 @@ msgstr ""
 "لقبول هذه القيم, و لتهيئة الخادم, اضغط زر التالي أو استخدم زر الرجوع لتصحيح "
 "اختياراتك."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "معطل"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "ممكّن"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "خادم FTP للإنترانت:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "خادم FTP للإنترنت:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "قام المعالج بتهيئة خادم  FTP للإنترنت/الإنترانت بنجاح"
 
@@ -772,7 +802,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1056,7 +1086,7 @@ msgid ""
 msgstr ""
 "قام المعالج بتجميع المعاملات الآتية و الضرورية لتهيئة خدمة أخبار الإنترنت:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1333,31 +1363,46 @@ msgstr ""
 msgid "Nis Client"
 msgstr "عنوان IP للعميل:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "معالج Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "اسم خادم البريد:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "اسم خادم البريد:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "معالج تهيئة البريد"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "هذا المعالج سيساعدك على تهيئة خدمات بريد الإنترنت لشبكتك."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "عنوان البريد الصادر"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "يجب أن يتم اختيار هذا مع العنوان الذي تستخدمه للبريد الوارد."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1365,20 +1410,28 @@ msgstr ""
 "يمكنك اختيار العنوان الذي سيظهره خادم البريد الصادر في حقول \"From:\" و "
 "\"Repy-to\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "اسم النظاق المحسوب"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "تحذير:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "لقد أدخلت عنواناً فارغاً لبوابة البريد."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1386,15 +1439,21 @@ msgstr ""
 "يمكن أن يتم قبول اختيارك, لكن هذا لن يسمح لك بإرسال البريد خارج الشبكة "
 "المحلية. اضغط التالي للمتابعة, أو رجوع لإدخال قيمة."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquerade not good!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "بوابة بريد الإنترنت"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1404,65 +1463,70 @@ msgstr ""
 "اذا كان عنوان موفر خدمة الإنترنت لديك \"provider.com\" فخادم بريد الإنترنت "
 "عادة ما يكون \"smtp.provider.com/\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 "الخادم سيرسل البريد الصادر من خلال بوابة بريد, هذا ستولى الإرسال النهائي."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "اسم خادم البريد:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "جاري تهيئة البريد"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr ""
 "قام المعالج بتجميع المعلومات التالية و الضرورية لتهيئة خدمة بريد الإنترنت:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "هيئة العنوان"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "قام المعالج بتهيئة خدمة بريد الإنترنت لخادمك بنجاح."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "جاري تهيئة خادم FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "خادم الطباعة:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "جاري تهيئة خادم FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - الدخول مخصص فقط لهذا الخادم"
@@ -1637,7 +1701,8 @@ msgid "Access Control:"
 msgstr "تحكم الدخول:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "قام المعالج بتهيئة خادم البروكسي بنجاح."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1655,12 +1720,6 @@ msgstr "معالج Squid"
 msgid "PXE Wizard"
 msgstr "معالج FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -1832,6 +1891,7 @@ msgid "Please provide a bootable image..."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:182
+#, perl-format
 msgid "Please choose an image from a different directory than %s."
 msgstr ""
 
@@ -1918,6 +1978,7 @@ msgid "Samba wizard"
 msgstr "معالج Samba"
 
 #: ../samba_wizard/Samba.pm:59 ../web_wizard/Apache.pm:61
+#, perl-format
 msgid "%s does not exist."
 msgstr ""
 
@@ -2374,722 +2435,738 @@ msgstr "دليل المستخدم:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "قام المعالج بتهيئة خادم الويب للإنترنت/الإنترانت بنجاح"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "لا تقم بالتأشير على أي صندوق اذا لم تكن ترغب في تفعيل خادم FTP."
+
 #, fuzzy
-msgid "Setup a ldap server."
-msgstr "خادم قواعد البيانات"
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr "تحذير\\nأنت في DHCP, الخادم قد لا يعمل بهذه التهيئة."
 
 #, fuzzy
-msgid "Ip of master DNS server:"
-msgstr "جاري تهيئة خادم DNS"
+#~ msgid "Setup a ldap server."
+#~ msgstr "خادم قواعد البيانات"
 
 #, fuzzy
-msgid "Dhcp server"
-msgstr "خادم NFS"
+#~ msgid "Ip of master DNS server:"
+#~ msgstr "جاري تهيئة خادم DNS"
 
 #, fuzzy
-msgid "Dns server"
-msgstr "خادم الأخبار"
+#~ msgid "Dhcp server"
+#~ msgstr "خادم NFS"
 
 #, fuzzy
-msgid "Ftp server"
-msgstr "خادم NFS"
+#~ msgid "Dns server"
+#~ msgstr "خادم الأخبار"
 
 #, fuzzy
-msgid "Pxe server"
-msgstr "خادمات الوقت"
+#~ msgid "Ftp server"
+#~ msgstr "خادم NFS"
 
 #, fuzzy
-msgid "Nis+autofs Server"
-msgstr "خادم الأخبار"
+#~ msgid "Pxe server"
+#~ msgstr "خادمات الوقت"
 
 #, fuzzy
-msgid "PXE Wizard (devel)"
-msgstr "معالج DHCP"
+#~ msgid "Nis+autofs Server"
+#~ msgstr "خادم الأخبار"
 
 #, fuzzy
-msgid "DNS Configuration Wizard"
-msgstr "معالج تهيئة DNS"
+#~ msgid "PXE Wizard (devel)"
+#~ msgstr "معالج DHCP"
+
+#, fuzzy
+#~ msgid "DNS Configuration Wizard"
+#~ msgstr "معالج تهيئة DNS"
 
-msgid "DNS Server Addresses"
-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 ""
+#~ "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 الأساسي و "
+#~ "الثانوي; عادة يتم اعطاء هذه العناوين عن طريق موفر خدمة الإنترنت الخاص بك."
 
 #, fuzzy
-msgid "IP addresses are a dotted list of four numbers smaller than 256"
-msgstr "عناوين IP هي قوائم منقوطة بأربع أرقام أصغر من 256"
+#~ msgid "IP addresses are a dotted list of four numbers smaller than 256"
+#~ msgstr "عناوين IP هي قوائم منقوطة بأربع أرقام أصغر من 256"
 
 #, fuzzy
-msgid "Primary DNS Address"
-msgstr "عنوان DNS الأساسي:"
+#~ msgid "Primary DNS Address"
+#~ msgstr "عنوان DNS الأساسي:"
 
-msgid "Secondary DNS Address:"
-msgstr "عنوان DNS الثانوي:"
+#~ msgid "Secondary DNS Address:"
+#~ msgstr "عنوان DNS الثانوي:"
 
-msgid "You have entered an empty address for the DNS server."
-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 ""
+#~ "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 "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 ""
+#~ "The wizard collected the following parameters needed to configure your "
+#~ "DNS service:"
+#~ msgstr "قام المعالح بتجميع المعاملات التالية و الضرورية لتهيئة خدمة DNS:"
 
-msgid "Primary DNS Address:"
-msgstr "عنوان DNS الأساسي:"
+#~ msgid "Primary DNS Address:"
+#~ msgstr "عنوان DNS الأساسي:"
 
 #, fuzzy
-msgid "Dns (add client)"
-msgstr "معالج DNS (اضافة عميل)"
+#~ msgid "Dns (add client)"
+#~ msgstr "معالج DNS (اضافة عميل)"
 
 #, fuzzy
-msgid "NIS+autofs configuration wizard"
-msgstr "معالج تهيئة DNS"
+#~ msgid "NIS+autofs configuration wizard"
+#~ msgstr "معالج تهيئة DNS"
 
 #, fuzzy
-msgid "Nis Server:"
-msgstr "خادم الأخبار"
+#~ msgid "Nis Server:"
+#~ msgstr "خادم الأخبار"
 
 #, fuzzy
-msgid "Home nis:"
-msgstr "الدليل الخاص:"
+#~ msgid "Home nis:"
+#~ msgstr "الدليل الخاص:"
 
 #, fuzzy
-msgid "Nis directory Makefile:"
-msgstr "دليل المستخدم:"
+#~ msgid "Nis directory Makefile:"
+#~ msgstr "دليل المستخدم:"
 
-msgid "Cancel"
-msgstr "الغاء"
+#~ msgid "Cancel"
+#~ msgstr "الغاء"
 
-msgid "Next"
-msgstr "التالي"
+#~ msgid "Next"
+#~ msgstr "التالي"
 
-msgid "Previous"
-msgstr "سابق "
+#~ msgid "Previous"
+#~ msgstr "سابق "
 
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "نظام الملفات            الحجم  المستخدم الموجود الإستخدام% محمل في"
+#~ msgid "Filesystem            Size  Used Avail Use% Mounted on"
+#~ msgstr "نظام الملفات            الحجم  المستخدم الموجود الإستخدام% محمل في"
 
 #, fuzzy
-msgid "Warming."
-msgstr "تحذير"
+#~ msgid "Warming."
+#~ msgstr "تحذير"
 
 #, fuzzy
-msgid "Congratulationss"
-msgstr "تهانينا"
+#~ msgid "Congratulationss"
+#~ msgstr "تهانينا"
 
-msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
-msgstr "اضغط التالي لتهيئة هذه المعاملات الآن, أو الغاء للخروج من المعالج."
+#~ msgid ""
+#~ "Press next to configure these parameters now, or Cancel to exit this "
+#~ "wizard."
+#~ msgstr "اضغط التالي لتهيئة هذه المعاملات الآن, أو الغاء للخروج من المعالج."
 
-msgid "OK"
-msgstr "موافق"
+#~ msgid "OK"
+#~ msgstr "موافق"
 
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr "اذا اخترت التهيئة الآن, فستتابع تهيئة العميل بشكل آلي"
+#~ msgid ""
+#~ "If you choose to configure now, you will automatically continue with the "
+#~ "Client configuration"
+#~ msgstr "اذا اخترت التهيئة الآن, فستتابع تهيئة العميل بشكل آلي"
 
-msgid "Configure"
-msgstr "تهيئة"
+#~ msgid "Configure"
+#~ msgstr "تهيئة"
 
-msgid "You need to be root to run this wizard"
-msgstr "تحتاج أن تكون المستخدم الجذر لتشغيل هذا المعالج"
+#~ msgid "You need to be root to run this wizard"
+#~ msgstr "تحتاج أن تكون المستخدم الجذر لتشغيل هذا المعالج"
 
-msgid "Network not configured yet"
-msgstr "لم تتم تهيئة الشبكة بعد."
+#~ msgid "Network not configured yet"
+#~ msgstr "لم تتم تهيئة الشبكة بعد."
 
-msgid "You have entered a machine name or an IP number already used."
-msgstr "لقد ادخلت اسم جهاز و رقم IP مستخدم مسبقاً."
+#~ msgid "You have entered a machine name or an IP number already used."
+#~ msgstr "لقد ادخلت اسم جهاز و رقم IP مستخدم مسبقاً."
 
-msgid "Quit"
-msgstr "خروج"
+#~ msgid "Quit"
+#~ msgstr "خروج"
 
-msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
-msgstr ""
-"اضغط التالي اذا كنت تريد تغيير القيم الموجودة مسبقاً, أو اضغط رجوع لتصحيح "
-"اختياراتك."
+#~ msgid ""
+#~ "Press next if you want to change the already existing value, or back to "
+#~ "correct your choice."
+#~ msgstr ""
+#~ "اضغط التالي اذا كنت تريد تغيير القيم الموجودة مسبقاً, أو اضغط رجوع لتصحيح "
+#~ "اختياراتك."
 
-msgid ""
-"You have to configure the basic network parameters before launching this "
-"wizard."
-msgstr "عليك تهيئة معاملات الشبكة الأساسية قبل تشغيل هذا المعالج."
+#~ msgid ""
+#~ "You have to configure the basic network parameters before launching this "
+#~ "wizard."
+#~ msgstr "عليك تهيئة معاملات الشبكة الأساسية قبل تشغيل هذا المعالج."
 
-msgid "User addition"
-msgstr "اضافة المستخدمين"
+#~ msgid "User addition"
+#~ msgstr "اضافة المستخدمين"
 
-msgid ""
-"To accept this value, and configure your server, click on \\qConfirm\\q or "
-"use the Back button to correct them."
-msgstr ""
-"لقبول هذه القيمة, و تهيئة الخادم, انقر \"تأكيد\" أو استخدم زر رجوع لتصحيح "
-"القيمة."
+#~ msgid ""
+#~ "To accept this value, and configure your server, click on \\qConfirm\\q "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "لقبول هذه القيمة, و تهيئة الخادم, انقر \"تأكيد\" أو استخدم زر رجوع لتصحيح "
+#~ "القيمة."
 
-msgid "Please type a password for the root user:"
-msgstr "فضلا أدخل كلمة مرور للمستخدم الجذر:"
+#~ msgid "Please type a password for the root user:"
+#~ msgstr "فضلا أدخل كلمة مرور للمستخدم الجذر:"
 
-msgid "Configuring the MySQL Database Server"
-msgstr "جاري تهيئة خادم قواعد البيانات MySQL"
+#~ msgid "Configuring the MySQL Database Server"
+#~ msgstr "جاري تهيئة خادم قواعد البيانات MySQL"
 
-msgid "Confirm"
-msgstr "تأكيد"
+#~ msgid "Confirm"
+#~ msgstr "تأكيد"
 
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "قام المعالج بتهيئة خادم قواعد البيانات MySQL بنجاح"
+#~ msgid "The wizard successfully configured your MySQL Database Server"
+#~ msgstr "قام المعالج بتهيئة خادم قواعد البيانات MySQL بنجاح"
 
-msgid "Add"
-msgstr "أضف"
+#~ msgid "Add"
+#~ msgstr "أضف"
 
-msgid "Note: This user will have all permissions"
-msgstr "ملحوظة: هذا المستخدم ستكون له كل التصاريح"
+#~ msgid "Note: This user will have all permissions"
+#~ msgstr "ملحوظة: هذا المستخدم ستكون له كل التصاريح"
 
-msgid "MySQL Database wizard"
-msgstr "معالج قةاعد بيانات MySQL"
+#~ msgid "MySQL Database wizard"
+#~ msgstr "معالج قةاعد بيانات MySQL"
 
-msgid "To run your server, you first need to specify a root password"
-msgstr "لتشغيل الخادم, تحتاج أولاً لتحديد كلمة مرور المستخدم الجذر"
+#~ msgid "To run your server, you first need to specify a root password"
+#~ msgstr "لتشغيل الخادم, تحتاج أولاً لتحديد كلمة مرور المستخدم الجذر"
 
-msgid "Root Password:"
-msgstr "كلمة مرور المستخدم الجذر:"
+#~ msgid "Root Password:"
+#~ msgstr "كلمة مرور المستخدم الجذر:"
 
-msgid "MySQL Database Server"
-msgstr "خادم قواعد البيانات MySQL"
+#~ msgid "MySQL Database Server"
+#~ msgstr "خادم قواعد البيانات MySQL"
 
-msgid ""
-"The wizard collected the following parameters needed to configure your MySQL "
-"Database Server"
-msgstr ""
-"قام المعالج بتهيئة المعاملات التالية و الضرورية لتهيئو خادم قواعد البيانات "
-"MySQL"
+#~ msgid ""
+#~ "The wizard collected the following parameters needed to configure your "
+#~ "MySQL Database Server"
+#~ msgstr ""
+#~ "قام المعالج بتهيئة المعاملات التالية و الضرورية لتهيئو خادم قواعد "
+#~ "البيانات MySQL"
 
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr "هذا المعالج سيساعدك على تهيئة خادم قواعد البيانات MySQL لشبكتك."
+#~ msgid ""
+#~ "This wizard will help you configuring the MySQL Database Server for your "
+#~ "network."
+#~ msgstr "هذا المعالج سيساعدك على تهيئة خادم قواعد البيانات MySQL لشبكتك."
 
-msgid "Please enter a username and password to add a user"
-msgstr "فضلاً أدخل اسم مستخدم و كلمة مرور لإضافة مستخدم"
+#~ msgid "Please enter a username and password to add a user"
+#~ msgstr "فضلاً أدخل اسم مستخدم و كلمة مرور لإضافة مستخدم"
 
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr "اذا اخترت التهيئة الآن, ستتابع تهيئة MySQL بشكل آلي"
+#~ msgid ""
+#~ "If you choose to configure now, you will automatically continue with the "
+#~ "MySQL Database configuration"
+#~ msgstr "اذا اخترت التهيئة الآن, ستتابع تهيئة MySQL بشكل آلي"
 
-msgid "Fix it"
-msgstr "أصلحه"
+#~ msgid "Fix it"
+#~ msgstr "أصلحه"
 
-msgid "Is the server authoritative ? Ask your system administrator."
-msgstr "خل يحتاج المستخدم الى المصادقة؟ اسأل مدير النظام."
+#~ msgid "Is the server authoritative ? Ask your system administrator."
+#~ msgstr "خل يحتاج المستخدم الى المصادقة؟ اسأل مدير النظام."
 
-msgid "DHCP Configuration Wizard"
-msgstr "معالج تهيئة DHCP"
+#~ msgid "DHCP Configuration Wizard"
+#~ msgstr "معالج تهيئة DHCP"
 
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "متوسط - خدمات الويب, ftp, و ssh ستكون مرئية للخارج"
+#~ msgid "Medium - web, ftp and ssh shown to outside"
+#~ msgstr "متوسط - خدمات الويب, ftp, و ssh ستكون مرئية للخارج"
 
-msgid "Strong - no outside visibility, users limited to web"
-msgstr "قوي - لا خدمات مرئية للخارج, المستخدمون فقط للويب"
+#~ msgid "Strong - no outside visibility, users limited to web"
+#~ msgstr "قوي - لا خدمات مرئية للخارج, المستخدمون فقط للويب"
 
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
-msgstr "قام المعالح بتجميع المعاملات التالية و الضرورية لتهيئة الجدار الناري:"
+#~ msgid ""
+#~ "The wizard collected the following parameters needed to configure your "
+#~ "firewall:"
+#~ msgstr ""
+#~ "قام المعالح بتجميع المعاملات التالية و الضرورية لتهيئة الجدار الناري:"
 
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr "الجدار الناري يحمي شبكتك الدتخلية من الإختراقات القادمة من الإنترنت."
+#~ msgid ""
+#~ "The firewall protects your internal network from unauthorized accesses "
+#~ "from the Internet."
+#~ msgstr ""
+#~ "الجدار الناري يحمي شبكتك الدتخلية من الإختراقات القادمة من الإنترنت."
 
-msgid "Device"
-msgstr "الجهاز"
+#~ msgid "Device"
+#~ msgstr "الجهاز"
 
-msgid "Firewall wizard"
-msgstr "معالج الجدار الناري"
+#~ msgid "Firewall wizard"
+#~ msgstr "معالج الجدار الناري"
 
-msgid "None - No protection"
-msgstr "لا شئ - لا حماية"
+#~ msgid "None - No protection"
+#~ msgstr "لا شئ - لا حماية"
 
-msgid "Internet Network Device:"
-msgstr "جهاز شبكة الإنترنت:"
+#~ msgid "Internet Network Device:"
+#~ 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 ""
-"يمكن تهيئة الجدار الناري لتوفير مستويات مختلفة من الحماية; اختر مستوى "
-"الحماية الملائم لاحتياجاتك. اذا لم تكن تعلم, فإن المستوى المتوسط عادة ما "
-"يكون هو الأكثر ملائمة."
+#~ 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 ""
+#~ "يمكن تهيئة الجدار الناري لتوفير مستويات مختلفة من الحماية; اختر مستوى "
+#~ "الحماية الملائم لاحتياجاتك. اذا لم تكن تعلم, فإن المستوى المتوسط عادة ما "
+#~ "يكون هو الأكثر ملائمة."
 
-msgid "The device name is not correct"
-msgstr "اسم الجهاز غير صحيح"
+#~ msgid "The device name is not correct"
+#~ msgstr "اسم الجهاز غير صحيح"
 
-msgid "Fix It"
-msgstr "أصلحه"
+#~ msgid "Fix It"
+#~ msgstr "أصلحه"
 
-msgid "Firewall Configuration Wizard"
-msgstr "معالج تهيئة الجدار الناري"
+#~ msgid "Firewall Configuration Wizard"
+#~ msgstr "معالج تهيئة الجدار الناري"
 
-msgid ""
-"The firewall needs to know how your server is connected to Internet; choose "
-"the device you are using for the external connection."
-msgstr ""
-"الجدار الناري يحتاج الة معرفة كيفية اتصال الجهاز الخادم بالإنترنت; اختر "
-"الجهاز الذي تستخدمه للإتصال الخارجي."
+#~ msgid ""
+#~ "The firewall needs to know how your server is connected to Internet; "
+#~ "choose the device you are using for the external connection."
+#~ msgstr ""
+#~ "الجدار الناري يحتاج الة معرفة كيفية اتصال الجهاز الخادم بالإنترنت; اختر "
+#~ "الجهاز الذي تستخدمه للإتصال الخارجي."
+
+#~ msgid "Protection Level"
+#~ msgstr "مستوى الحماية"
+
+#~ msgid "Something terrible happened"
+#~ msgstr "حصل شئ فظيع"
+
+#~ msgid "Firewall Network Device"
+#~ msgstr "جهاز الجدار الناري للشبكة"
+
+#~ msgid "The wizard successfully configured your server firewall."
+#~ msgstr "قام المعالج بتهيئة الحدار الناري بنجاح"
+
+#~ msgid "Configuring the Firewall"
+#~ msgstr "جاري تهيئة الجدار الناري"
+
+#~ msgid "Exit"
+#~ msgstr "خروج"
+
+#~ msgid "This wizard will help you configuring your server firewall."
+#~ msgstr "هذا المعالج سيساعدك في تهيئة الجدار الناري للجهاز الخادم."
+
+#~ msgid "Low - Light filtering, standard services available"
+#~ msgstr "ضعيف - فلترة خفيفة, الخدمات الأساسية موجودة"
+
+#~ msgid "Protection Level:"
+#~ 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 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:\" و "
+#~ "\"Repy-to\"."
+
+#~ 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 ""
+#~ "أسماء مستضيفات الإنترنت يجب أن تكون على شكل \"host.domain.domaintype\"; "
+#~ "مثلاً اذا كان عنوان موفر خدمة الإنترنت لديك \"provider.com\" فخادم بريد "
+#~ "الإنترنت عادة ما يكون \"smtp.provider.com/\"."
+
+#~ msgid "There seems to be a problem..."
+#~ msgstr "يبدو أن هناك مشكلة..."
+
+#~ msgid "Do It"
+#~ msgstr "افعلها"
+
+#~ msgid "Hmmm"
+#~ msgstr "هممم"
+
+#~ msgid ""
+#~ "If you choose to configure now, you will automatically continue with the "
+#~ "POSTFIX configuration"
+#~ msgstr "اذا اخترت التهيئة الآن, ستتابع تهيئة POSTFIX بشكل آلي."
+
+#~ msgid "Mail Address:"
+#~ msgstr "عنوان البريد:"
+
+#~ msgid ""
+#~ "If you choose to configure now, you will automatically continue with the "
+#~ "Proxy configuration."
+#~ msgstr "اذا اخترت التهيئة الآن, ستتابع تهيئة البروكسي بشكل آلي."
+
+#~ msgid "This Wizard needs to run as root"
+#~ msgstr "يحتاج المعالج أن يتم تشغيله كمستخدم جذر"
+
+#~ 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 "/etc/services:"
+#~ msgstr "/etc/services:"
+
+#~ msgid ""
+#~ "You can safely select \\qNo upper level proxy\\q if you don't need this "
+#~ "feature."
+#~ msgstr "يمكنك اختيار \"لا منفذ أعلى للبروكسي\" اذا لم تحتج الى هذه الميزة."
+
+#~ msgid ""
+#~ "Enter the qualified hostname (like \\qcache.domain.net\\q) and the port "
+#~ "of the proxy to use."
+#~ msgstr ""
+#~ "Enter the qualified hostname (like \\qcache.domain.net\\q) and the port "
+#~ "of the proxy to use."
+
+#~ msgid ""
+#~ "If you choose to configure now, you will automatically continue with the "
+#~ "SAMBA configuration"
+#~ msgstr "اذا اخترت التهيئة الآن, فستتابع تهيئة SAMBA بشكل آلي"
+
+#~ 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 netgroup \"foonet\", لكن امنع "
+#~ "الدخول من مستضيف معين\\nhosts allow = @foonet\\nhosts deny = pirate"
+
+#~ msgid "This wizard will set the basic networking parameters of your server."
+#~ msgstr "هذا المعالج سيعيّن معاملات الشبكة الأساسية للخادم الخاص بك."
+
+#~ msgid "Basic Network Configuration Wizard"
+#~ msgstr "معالج تهيئة أساسيات الشبكة"
+
+#~ msgid "The network address is wrong"
+#~ msgstr "عنوان الخادم خطأ"
+
+#~ msgid "Network Address"
+#~ 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 ""
+#~ "The wizard successfully configured the basic networking services of your "
+#~ "server."
+#~ msgstr "قام المعالح بتهيئة خدمات الشبكة الأساسية للخادم الخاص بك بنجاح."
+
+#~ msgid ""
+#~ "(you can change here these values if you know exactly what you're doing)"
+#~ msgstr "(تستطيع هنا تغيير القيم اذا كنت تعلم تماماً ماذا تفعل)"
+
+#~ 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 ""
+#~ "عنوان الشبكة هو رقم يعرّف شبكتك; القيمة المقترحة مصممة لتهيئة خادم غير "
+#~ "متصل بالإنترنت, أو متصل باستخدام IP masquerade; باستثناء اذا كنت تعرف ما "
+#~ "تفعل, اقبل القيمة الإفتراضية."
+
+#~ msgid "Note about networking"
+#~ msgstr "ملحوظة عن الشبكة"
+
+#~ msgid "Server Address"
+#~ 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 ""
+#~ "عناوين الشبكة هي قائمة من أربع أرقام أقل من 256, مفصولة بالنقاط; الرقم "
+#~ "الأخير في هذه القائمة يجب أن يكون صفر."
+
+#~ msgid ""
+#~ "Note: the gateway IP address should be non empty if you want an access to "
+#~ "outside world."
+#~ msgstr ""
+#~ "ملحوظة: عنوان IP للبوابة يجب أن لا يكون فارغاً اذا كنت تريد الوصول الى "
+#~ "العالم الخارجي."
+
+#~ msgid "The Server IP address is incorrect"
+#~ msgstr "عنوان IP الخاص بالخادم غير صحيح"
+
+#~ msgid "Configuring your network"
+#~ msgstr "جاري تهيئة الشبكة"
+
+#~ msgid "Gateway IP:"
+#~ msgstr "IP البوابة:"
+
+#~ msgid ""
+#~ "This page computes the default server address; it should be invisible."
+#~ msgstr "هذه الصفحة تحسب العنوان الإفتراضي للخادم; يجب أن تكون غير مرئية."
+
+#~ msgid "IP net address:"
+#~ msgstr "عنوان IP net:"
+
+#~ msgid "Server Wizard"
+#~ 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 للشبكة المحلية مختلفين عن "
+#~ "الإتصال \"الخارجي\" للخادم."
+
+#~ 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 ""
+#~ "اختر جهاز التشبيك (البطاقة عادةً) الذي يجب أن يستخدمه الخادم للإتصال "
+#~ "بالشبكة الخاصة بك. انه الجهاز الذي تستخدمه للشبكة المحلية, و ليس عادةً نفس "
+#~ "الجهاز الذي تستخدمه للدخول على الإنترنت."
+
+#~ msgid ""
+#~ "Devices are presented with the Linux name and, if known, with the card "
+#~ "description."
+#~ msgstr "يتم تقديم الأجهزة بإسم لينكس و, إن كان معروفاً, مع وصف للبطاقة."
+
+#~ 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 ""
+#~ "This wizard will help you in configuring the basic networking services of "
+#~ "your server."
+#~ 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 الخاص بالخادم هو رقم يعرّف الخادم في الشبكة الخاصة بك; القيمة "
+#~ "المعطاة مصممة لشبكة خاصة, بدون اتصال بالإنترنت أو متصل باستخدام IP "
+#~ "masquerading; باستثناء اذا كنت تعرف ما تفعل, اقبل القيمة الإفتراضية."
+
+#~ msgid "The host name is not correct"
+#~ msgstr "اسم المستضيف غير صحيح"
+
+#~ 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 ""
+#~ "اسم المستضيف هو الإسم الذي سيتم من خلاله تعريف الخادم الى محطات العمل "
+#~ "الأخرى في الشبكة و ربما الإنترنت (اعتماداً على تهيئة سير المعلومات عندك)."
+
+#~ msgid "Wizard Error."
+#~ msgstr "خطأ في المعالج."
+
+#~ msgid "net device"
+#~ msgstr "جهاز الشبكة"
+
+#~ msgid "This page computes the domainname; it should be invisible"
+#~ msgstr "هذه الصفحة تحسب اسم النطاق; يجب أن تكون غير مرئية"
+
+#~ msgid "Gateway device:"
+#~ msgstr "جهاز البوابة:"
+
+#~ msgid ""
+#~ "The wizard collected the following parameters needed to configure your "
+#~ "network"
+#~ msgstr "قام المعالج بتهيئة المعملات الآتية و الضرورية لتهيئة  الشبكة."
+
+#~ msgid "Device:"
+#~ 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 "Protection Level"
-msgstr "مستوى الحماية"
+#~ msgid "Server Address:"
+#~ msgstr "عنوان الخادم:"
 
-msgid "Something terrible happened"
-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 ""
+#~ "الإتصال الخارجي هو شبكة يكون فيها جهاز الكمبيوتر الخاص بك عميلاً (في "
+#~ "الإنترنت أو شبكة upstream), متصلاً بشبكة أخرى باستخدام بطاقة شبكة أو مودم."
+
+#~ 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\"; اذا كان "
+#~ "الخادم سيستخدم كخادم إنترنت, يجب أن يكون اسم النطاق مسجلاً مع موفر خدمة "
+#~ "الإنترنت الخاصة بك. اذا كانت لديك شبكة انترانت فلا مشكلة اذا استخدمت أي "
+#~ "اسم مثل \"company.net\"."
 
-msgid "Firewall Network Device"
-msgstr "جهاز الجدار الناري للشبكة"
+#~ msgid "Host Name"
+#~ msgstr "اسم المستضيف"
 
-msgid "The wizard successfully configured your server firewall."
-msgstr "قام المعالج بتهيئة الحدار الناري بنجاح"
+#~ msgid "Network Address:"
+#~ msgstr "عنوان الشبكة:"
 
-msgid "Configuring the Firewall"
-msgstr "جاري تهيئة الجدار الناري"
+#~ msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+#~ msgstr "CRI, Campus d'Orsay, جامعة حنوب باريس, فرنسا"
 
-msgid "Exit"
-msgstr "خروج"
+#~ msgid "University of Manchester, Manchester, England"
+#~ msgstr "جامعة مانشستر, مانشستر, انجلترا"
 
-msgid "This wizard will help you configuring your server firewall."
-msgstr "هذا المعالج سيساعدك في تهيئة الجدار الناري للجهاز الخادم."
+#~ msgid "SCI, Universite de Limoges, France"
+#~ msgstr "SCI, جامعة ليموج, فرنسا"
 
-msgid "Low - Light filtering, standard services available"
-msgstr "ضعيف - فلترة خفيفة, الخدمات الأساسية موجودة"
+#~ msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+#~ msgstr "المركز الفضائي الكندي, دورفال, كيبيك, كندا"
 
-msgid "Protection Level:"
-msgstr "مستوى الحماية:"
+#~ msgid "(please, choose servers in your geographical area)"
+#~ 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 news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"اسم مستضيفات الإنترنت يجب أن تكون على شكل \"host.domain.domaintype\"; مثلا "
-"اذا كان عنوان موفر خدمات الإنترنت هو \"provider.com\", فإسم خادم الأخبار "
-"عادة ما يكون \"news.provider.com\"."
+#~ msgid "University of Oklahoma, Norman, Oklahoma, USA"
+#~ msgstr "جامعة أوكلاهوما, نورمان, أوكلاهوما, الولايات المتحدة الأمريكية"
 
-msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
-msgstr ""
-"يمكنك اختيار العنوان الذي سيظهره خادم البريد الصادر في حقول \"From:\" و "
-"\"Repy-to\"."
+#~ msgid "University of Regina, Regina, Saskatchewan, Canada"
+#~ 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 ""
-"أسماء مستضيفات الإنترنت يجب أن تكون على شكل \"host.domain.domaintype\"; مثلاً "
-"اذا كان عنوان موفر خدمة الإنترنت لديك \"provider.com\" فخادم بريد الإنترنت "
-"عادة ما يكون \"smtp.provider.com/\"."
+#~ msgid "Trinity College, Dublin, Ireland"
+#~ msgstr "كلية ترينيتي, دبلن, أيرلندا"
 
-msgid "There seems to be a problem..."
-msgstr "يبدو أن هناك مشكلة..."
+#~ msgid "Singapore"
+#~ msgstr "سنغافورة"
 
-msgid "Do It"
-msgstr "افعلها"
+#~ msgid "The Chinese University of Hong Kong"
+#~ msgstr "جامعة هونج كونج الصينية"
 
-msgid "Hmmm"
-msgstr "هممم"
+#~ msgid "UNLV College of Engineering, Las Vegas, NV"
+#~ msgstr "كلية UNLV للهندسة, لاس فيغاس, نيفادا"
 
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"POSTFIX configuration"
-msgstr "اذا اخترت التهيئة الآن, ستتابع تهيئة POSTFIX بشكل آلي."
+#~ msgid "Altea (Alicante/SPAIN)"
+#~ msgstr "Altea (Alicante/أسبانيا)"
 
-msgid "Mail Address:"
-msgstr "عنوان البريد:"
+#~ msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
+#~ msgstr "مجلس كندا للبحوث, أوتاوا, أونتاريو, كندا"
 
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
-msgstr "اذا اخترت التهيئة الآن, ستتابع تهيئة البروكسي بشكل آلي."
+#~ msgid "CISM, Lyon, France"
+#~ msgstr "CISM, ليون, فرنسا"
 
-msgid "This Wizard needs to run as root"
-msgstr "يحتاج المعالج أن يتم تشغيله كمستخدم جذر"
+#~ msgid "Inet, Inc., Seoul, Korea"
+#~ msgstr "Inet Inc., سيول, كوريا"
 
-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 "Scientific Center in Chernogolovka, Moscow region, Russia"
+#~ msgstr "المركز العلمي في تشيرنوغولوفكا, موسكو, روسيا"
 
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#~ msgid "Washington State University Tri-Cities, Richland, Wa"
+#~ msgstr "Washington State University Tri-Cities, ريتشلاند, واشنطن"
 
-msgid ""
-"You can safely select \\qNo upper level proxy\\q if you don't need this "
-"feature."
-msgstr "يمكنك اختيار \"لا منفذ أعلى للبروكسي\" اذا لم تحتج الى هذه الميزة."
+#~ msgid "University of Adelaide, South Australia"
+#~ msgstr "جامعة أديليد, جنوب أستراليا"
 
-msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
-msgstr ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+#~ msgid "CRIUC, Universite de Caen, France"
+#~ msgstr "CRIUC, جامعة كين, فرنسا"
 
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr "اذا اخترت التهيئة الآن, فستتابع تهيئة SAMBA بشكل آلي"
+#~ msgid "WARNING"
+#~ msgstr "تحذير"
 
-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 netgroup \"foonet\", لكن امنع الدخول "
-"من مستضيف معين\\nhosts allow = @foonet\\nhosts deny = pirate"
+#~ msgid "Loria, Nancy, France"
+#~ msgstr "لوريا, نانسي, فرنسا"
 
-msgid "This wizard will set the basic networking parameters of your server."
-msgstr "هذا المعالج سيعيّن معاملات الشبكة الأساسية للخادم الخاص بك."
+#~ msgid "Fukuoka university, Fukuoka, Japan"
+#~ msgstr "جامعة فوكوكا, فوكوكا, اليابان"
 
-msgid "Basic Network Configuration Wizard"
-msgstr "معالج تهيئة أساسيات الشبكة"
+#~ msgid "Swiss Fed. Inst. of Technology"
+#~ msgstr "المعهد الفيدرالي السويسري للتكنولوجيا"
 
-msgid "The network address is wrong"
-msgstr "عنوان الخادم خطأ"
+#~ msgid "LAAS/CNRS, Toulouse, France"
+#~ msgstr "LAAS/CNRS, تولوز, فرنسا"
 
-msgid "Network Address"
-msgstr "عنوان الشبكة"
+#~ msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
+#~ 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 "MIT Information Systems, Cambridge, MA"
+#~ msgstr "MIT لنظم المعلومات, كامبريدج, ماساشوستس"
 
-msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
-msgstr "قام المعالح بتهيئة خدمات الشبكة الأساسية للخادم الخاص بك بنجاح."
+#~ msgid "Baylor College of Medicine, Houston, Tx"
+#~ msgstr "كلية طب بايلور, هيوستون, تكساس"
 
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr "(تستطيع هنا تغيير القيم اذا كنت تعلم تماماً ماذا تفعل)"
-
-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 ""
-"عنوان الشبكة هو رقم يعرّف شبكتك; القيمة المقترحة مصممة لتهيئة خادم غير متصل "
-"بالإنترنت, أو متصل باستخدام IP masquerade; باستثناء اذا كنت تعرف ما تفعل, "
-"اقبل القيمة الإفتراضية."
-
-msgid "Note about networking"
-msgstr "ملحوظة عن الشبكة"
-
-msgid "Server Address"
-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 ""
-"عناوين الشبكة هي قائمة من أربع أرقام أقل من 256, مفصولة بالنقاط; الرقم "
-"الأخير في هذه القائمة يجب أن يكون صفر."
-
-msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
-msgstr ""
-"ملحوظة: عنوان IP للبوابة يجب أن لا يكون فارغاً اذا كنت تريد الوصول الى العالم "
-"الخارجي."
-
-msgid "The Server IP address is incorrect"
-msgstr "عنوان IP الخاص بالخادم غير صحيح"
-
-msgid "Configuring your network"
-msgstr "جاري تهيئة الشبكة"
-
-msgid "Gateway IP:"
-msgstr "IP البوابة:"
-
-msgid "This page computes the default server address; it should be invisible."
-msgstr "هذه الصفحة تحسب العنوان الإفتراضي للخادم; يجب أن تكون غير مرئية."
+#~ msgid "Penn State University, University Park, PA"
+#~ msgstr "جامعة Penn State, University Park, PA"
 
-msgid "IP net address:"
-msgstr "عنوان IP net:"
+#~ msgid "University of Oslo, Norway"
+#~ msgstr "جامعة أوسلو, النرويج"
 
-msgid "Server Wizard"
-msgstr "معالج الخادم"
+#~ msgid "Computer Science Department, University of Wisconsin-Madison"
+#~ 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 للشبكة المحلية مختلفين عن "
-"الإتصال \"الخارجي\" للخادم."
-
-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 ""
-"اختر جهاز التشبيك (البطاقة عادةً) الذي يجب أن يستخدمه الخادم للإتصال بالشبكة "
-"الخاصة بك. انه الجهاز الذي تستخدمه للشبكة المحلية, و ليس عادةً نفس الجهاز "
-"الذي تستخدمه للدخول على الإنترنت."
-
-msgid ""
-"Devices are presented with the Linux name and, if known, with the card "
-"description."
-msgstr "يتم تقديم الأجهزة بإسم لينكس و, إن كان معروفاً, مع وصف للبطاقة."
-
-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 ""
-"This wizard will help you in configuring the basic networking services of "
-"your server."
-msgstr "هذا المعالج سيساعدك على تهيئة خدمات الشبكة الأساسية للخادم الخاص بك."
+#~ msgid "activate user module"
+#~ 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 الخاص بالخادم هو رقم يعرّف الخادم في الشبكة الخاصة بك; القيمة "
-"المعطاة مصممة لشبكة خاصة, بدون اتصال بالإنترنت أو متصل باستخدام IP "
-"masquerading; باستثناء اذا كنت تعرف ما تفعل, اقبل القيمة الإفتراضية."
+#~ msgid ""
+#~ "To accept this value, and configure your server, click on \"Confirm\" or "
+#~ "use the Back button to correct them."
+#~ msgstr ""
+#~ "لقبول هذه القيمة, و تهيئة الخادم, انقر \"تأكيد\" أو استخدم زر رجوع لتصحيح "
+#~ "القيمة."
 
-msgid "The host name is not correct"
-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 للشبكة المحلية مختلفين عن "
+#~ "الإتصال \"الخارجي\" للخادم."
 
-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 ""
-"اسم المستضيف هو الإسم الذي سيتم من خلاله تعريف الخادم الى محطات العمل الأخرى "
-"في الشبكة و ربما الإنترنت (اعتماداً على تهيئة سير المعلومات عندك)."
-
-msgid "Wizard Error."
-msgstr "خطأ في المعالج."
-
-msgid "net device"
-msgstr "جهاز الشبكة"
-
-msgid "This page computes the domainname; it should be invisible"
-msgstr "هذه الصفحة تحسب اسم النطاق; يجب أن تكون غير مرئية"
-
-msgid "Gateway device:"
-msgstr "جهاز البوابة:"
-
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"network"
-msgstr "قام المعالج بتهيئة المعملات الآتية و الضرورية لتهيئة  الشبكة."
-
-msgid "Device:"
-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 "Server Address:"
-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 ""
-"الإتصال الخارجي هو شبكة يكون فيها جهاز الكمبيوتر الخاص بك عميلاً (في الإنترنت "
-"أو شبكة upstream), متصلاً بشبكة أخرى باستخدام بطاقة شبكة أو مودم."
-
-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\"; اذا كان "
-"الخادم سيستخدم كخادم إنترنت, يجب أن يكون اسم النطاق مسجلاً مع موفر خدمة "
-"الإنترنت الخاصة بك. اذا كانت لديك شبكة انترانت فلا مشكلة اذا استخدمت أي اسم "
-"مثل \"company.net\"."
-
-msgid "Host Name"
-msgstr "اسم المستضيف"
-
-msgid "Network Address:"
-msgstr "عنوان الشبكة:"
-
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, جامعة حنوب باريس, فرنسا"
-
-msgid "University of Manchester, Manchester, England"
-msgstr "جامعة مانشستر, مانشستر, انجلترا"
-
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, جامعة ليموج, فرنسا"
-
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "المركز الفضائي الكندي, دورفال, كيبيك, كندا"
-
-msgid "(please, choose servers in your geographical area)"
-msgstr "(فضلاً اختر الخادمات في منطقتك الجغرافية)"
-
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "جامعة أوكلاهوما, نورمان, أوكلاهوما, الولايات المتحدة الأمريكية"
-
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "جامعة ريجينا, ريجينا, ساسكاتشيوان, كندا"
-
-msgid "Trinity College, Dublin, Ireland"
-msgstr "كلية ترينيتي, دبلن, أيرلندا"
-
-msgid "Singapore"
-msgstr "سنغافورة"
-
-msgid "The Chinese University of Hong Kong"
-msgstr "جامعة هونج كونج الصينية"
-
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "كلية UNLV للهندسة, لاس فيغاس, نيفادا"
-
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante/أسبانيا)"
-
-msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
-msgstr "مجلس كندا للبحوث, أوتاوا, أونتاريو, كندا"
-
-msgid "CISM, Lyon, France"
-msgstr "CISM, ليون, فرنسا"
-
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet Inc., سيول, كوريا"
-
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "المركز العلمي في تشيرنوغولوفكا, موسكو, روسيا"
-
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washington State University Tri-Cities, ريتشلاند, واشنطن"
-
-msgid "University of Adelaide, South Australia"
-msgstr "جامعة أديليد, جنوب أستراليا"
-
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, جامعة كين, فرنسا"
-
-msgid "WARNING"
-msgstr "تحذير"
-
-msgid "Loria, Nancy, France"
-msgstr "لوريا, نانسي, فرنسا"
-
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "جامعة فوكوكا, فوكوكا, اليابان"
-
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "المعهد الفيدرالي السويسري للتكنولوجيا"
-
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, تولوز, فرنسا"
-
-msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
-msgstr "قسم علوم الحاسب, جامعة ستراتشايلد, غلاسغو, سكوتلاندا"
-
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT لنظم المعلومات, كامبريدج, ماساشوستس"
-
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "كلية طب بايلور, هيوستون, تكساس"
-
-msgid "Penn State University, University Park, PA"
-msgstr "جامعة Penn State, University Park, PA"
-
-msgid "University of Oslo, Norway"
-msgstr "جامعة أوسلو, النرويج"
-
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "قسم علوم الحاسب, جامعة وسكونسن-ماديسون"
-
-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 للشبكة المحلية مختلفين عن "
-"الإتصال \"الخارجي\" للخادم."
-
-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\"; اذا كان "
-"الخادم سيستخدم كخادم إنترنت, يجب أن يكون اسم النطاق مسجلاً مع موفر خدمة "
-"الإنترنت الخاصة بك. اذا كانت لديك شبكة انترانت فلا مشكلة اذا استخدمت أي اسم "
-"مثل \"company.net\"."
+#~ 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\"; اذا كان "
+#~ "الخادم سيستخدم كخادم إنترنت, يجب أن يكون اسم النطاق مسجلاً مع موفر خدمة "
+#~ "الإنترنت الخاصة بك. اذا كانت لديك شبكة انترانت فلا مشكلة اذا استخدمت أي "
+#~ "اسم مثل \"company.net\"."
 
-msgid "Public directory:"
-msgstr "دليل عام:"
+#~ msgid "Public directory:"
+#~ msgstr "دليل عام:"
 
-msgid "Enable the Web Server for the Intranet and for the Internet"
-msgstr "مكّن خادم الويب للإنترنت و الإنترانت"
+#~ msgid "Enable the Web Server for the Intranet and for the Internet"
+#~ msgstr "مكّن خادم الويب للإنترنت و الإنترانت"
 
-msgid "Enable the FTP Server for the Intranet and for the Internet"
-msgstr "مكّن خادم FTP للإنترنت و الإنترانت"
+#~ msgid "Enable the FTP Server for the Intranet and for the Internet"
+#~ msgstr "مكّن خادم FTP للإنترنت و الإنترانت"
 
-msgid "Sorry, you have to be root to run this wizard..."
-msgstr "عفواً, يجب أن تكون المستدم الجذر لتشغيل هذا المعالج..."
+#~ msgid "Sorry, you have to be root to run this wizard..."
+#~ msgstr "عفواً, يجب أن تكون المستدم الجذر لتشغيل هذا المعالج..."
 
-msgid "End"
-msgstr "انهاء"
+#~ msgid "End"
+#~ msgstr "انهاء"
 
-msgid "See you soon!"
-msgstr "نراك قريباً!"
+#~ msgid "See you soon!"
+#~ msgstr "نراك قريباً!"
 
-msgid "Press Quit to exit or Back to correct your choice"
-msgstr "اضغط خروج للخروج أو السابق لتصحيح خياراتك"
+#~ msgid "Press Quit to exit or Back to correct your choice"
+#~ msgstr "اضغط خروج للخروج أو السابق لتصحيح خياراتك"
 
-msgid "No Samba service has been requested"
-msgstr "لم يتم طلب أي خدمة Samba"
+#~ msgid "No Samba service has been requested"
+#~ msgstr "لم يتم طلب أي خدمة Samba"
diff --git a/po/az.po b/po/az.po
index 60abfdd5..80f5e840 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-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-29 14:51+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "quraşdırma sehirbazı"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "quraşdırma sehirbazı"
 msgid "Warning."
 msgstr "Xəbərdarlıq."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr "Xəta"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -86,15 +86,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Bu sehirbaz yerli DNS'inizə yeni alıcı əlavə etməkdə sizə yardım edəcək"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Alıcı tanınması:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Maşının adı:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, 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:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -135,7 +136,7 @@ msgstr ""
 "bilər."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -180,7 +181,7 @@ msgstr "Alıcı IP'si:"
 msgid "The wizard successfully added the client."
 msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP Sehirbazı"
 
@@ -198,62 +199,91 @@ msgstr ""
 "Bu sehirbaz vericinizin DHCP xidmətlərini quraşdırmaqda sizə yardım edəcək."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "dhcp tərəfindən işlədilən ünvanların aralığı"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "DHCP xidməti tərəfindən iş stansiyalarına tə'yin edilmiş ünvanların "
 "aralığını seçin. Xüsusi ehtiyaclarınız yoxdursa, təklif edilən qiymətləri "
 "e'tibarla seçə bilərsiniz."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Ən Kiçik IP Ünvanı:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Ən Böyük IP Ünvanı:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "dhcp vericisinə ara üz buna qulaq asmalıdır"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Verilən IP aralığı düzgün deyil"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Verilən IP aralığı verici şəbəkəsi ünvan aralığı içində deyil"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "Vericinin IP'si aralıqda yer almamalıdır"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP Vericisi Quraşdırılır"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr ""
 "Bu sehirbaz DHCP xidmətinizi quraşdırmaq üçün aşağıdakı parametrləri topladı:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "qeyri-fəal"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "fəal"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Ara üz:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Sehirbaz vericinizin DHCP xidmətlərini müvəffəqiyyətlə quraşdırdı."
 
@@ -261,20 +291,20 @@ msgstr "Sehirbaz vericinizin DHCP xidmətlərini müvəffəqiyyətlə quraşdır
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS vericisi"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS vericisi"
@@ -310,69 +340,70 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Rədd edilən qovşaqlar:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -380,117 +411,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, 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:172
+#: ../dns_wizard/Bind.pm:171
 #, 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:177
+#: ../dns_wizard/Bind.pm:176
 #, 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Xəta"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Dns (quraşdırma)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Ən Kiçik IP Ünvanı:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Verici Banneri:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "Nis Domeni:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Sehirbaz alıcını müvəffəqiyyətlə əlavə etdi."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, 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:680
+#: ../dns_wizard/Bind.pm:679
 #, 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:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Sisteminiz Nis+Autofs(nfs) vericisi olaraq quraşdırılır ..."
@@ -581,28 +612,24 @@ msgstr "Qurulum bacarılmadı"
 msgid "FTP wizard"
 msgstr "FTP sehirbazı"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP Verici Quraşdırma Sehirbazı"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Bu sehirbaz şəbəkəniz üçün FTP Vericisini quraşdırmaqda sizə yardım edəcək."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "FTP Vericinizi fəallaşdırmaq istəmirsəniz heç bir qutunu işarələməyin."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP Vericisi"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Fəal etmək istədiyiniz FTP xidmət növünü seçin:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -610,76 +637,76 @@ msgstr ""
 "Vericiniz, həm yerli şəbəkəniz (intranet) həm də internet üçün FTP vericisi "
 "olaraq vəzifə görə bilər."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "İntranet üçün FTP Vericisini fəallaşdır"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "İnternet üçün FTP Vericisini Fəallaşdır"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "İcazə verilən qovşaqlar:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Diqqət\\nSiz dhcp içində yer alırsınız, verici sizin qurğularla işləməyə "
-"bilər."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Bağışlayın, bunu edə bilmək üçün ali istifadəçi olmalısınız..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP Vericisi Quraşdırılır"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -688,7 +715,7 @@ msgstr ""
 "Sehirbaz FTP Vericinizin quraşdırılması üçün ehtiyac olan aşağıdakı "
 "parametrləri topladı"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -697,35 +724,35 @@ msgstr ""
 "Bu qiymətləri qəbul edib vericinizi quraşdırmaq üçün, Sonrakı, düzəlişlər "
 "etmək üçün isə Geri düyməsinə basın."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "qeyri-fəal"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "fəal"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "İntranet FTP Vericisi:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "İnternet FTP Vericisi:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Sehirbaz İntranet/İnternet FTP Vericinizi müvəffəqiyyətlə quraşdırdı"
 
@@ -773,7 +800,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1055,7 +1082,7 @@ msgstr ""
 "İnternet Xəbərlər xidmətinizi quraşdırmaq üçün sehirbaz aşağıdakı "
 "parametrləri topladı:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1334,33 +1361,48 @@ msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 msgid "Nis Client"
 msgstr "ANis Alıcısı"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix sehirbazı"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Poçt vericisi"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Poçt vericisi"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "İnternet Poçtu Quraşdırma Sehirbazı"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Bu sehirbaz şəbəkəniz üçün İnternet Poçt xidmətlərini quraşdırmaqda sizə "
 "yardım edəcək."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Göndərilən Poçt Ünvanı"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Bu, gələn poçt üçün işlətdiyiniz ünvan ilə ardıcıl seçilməlidir."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1368,19 +1410,27 @@ msgstr ""
 "Gedən poçtun \"Göndərən:\" və \"Cavabla\" sahələrində göstəriləcək ünvan "
 "növünü seçə bilərsiniz."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maskarad domen adı:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Xəbərdarlıq: "
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Poçt şəbəkə keçidi üçün boş ünvan daxil etdiniz."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1389,15 +1439,21 @@ msgstr ""
 "yollama imkanı verməyəcək. Davam etmək üçün sonrakı, qiymət daxil etmək üçün "
 "isə geri düyməsinə basın."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskarad yaxşı deyil!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "İnternet Poçt Şəbəkə Keçidi"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1407,7 +1463,7 @@ msgstr ""
 "üçün, əgər provayderiniz \"provider.com\" isə, internet poçt vericisi \"smtp."
 "provider.com\" olacaq."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1415,29 +1471,29 @@ msgstr ""
 "Vericiniz gedən poçtları poçt şəbəkə keçişi vasitəsiylə göndərəcək, son "
 "çatdırmanı bu keçiş həll edəcək."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Poçt Vericisi Adı:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "İnternet Poçtu Quraşdırılır"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1445,30 +1501,35 @@ msgstr ""
 "Bu sehirbaz İnternet Poçt xidmətinizi quraşdırmaq üçün aşağıdakı "
 "parametrləri topladı:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Ünvanın Şəkli"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Sehirbaz vericinizin İnternet Poçt xidmətini müvəffəqiyyətlə quraşdırdı."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTP Vericisi Quraşdırılır"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Çap Vericisi:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP Vericisi Quraşdırılır"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - ancaq bu vericiyə icazə verilməyəcək"
@@ -1646,7 +1707,8 @@ msgid "Access Control:"
 msgstr "İcazə İdarəsi:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Sehirbaz vəkil vericinizi müvəffəqiyyətlə quraşdırdı."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1663,12 +1725,6 @@ msgstr "Sehirbazı keç"
 msgid "PXE Wizard"
 msgstr "PXE Sehirbazı"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "PXE vericisini seç"
@@ -2403,6 +2459,18 @@ msgstr "İstifadəçi cərgəsi: "
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Sehirbaz İntranet/İnternet Veb Vericinizi müvəffəqiyyətlə quraşdırdı"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "FTP Vericinizi fəallaşdırmaq istəmirsəniz heç bir qutunu işarələməyin."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Diqqət\\nSiz dhcp içində yer alırsınız, verici sizin qurğularla işləməyə "
+#~ "bilər."
+
 #~ msgid "DNS Configuration Wizard"
 #~ msgstr "DNS Quraşdırma Sehirbazı"
 
diff --git a/po/bg.po b/po/bg.po
index 559c816f..18d7e351 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-08-29 00:54+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Конфигурационен магьосник"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "Конфигурационен магьосник"
 msgid "Warning."
 msgstr "Предупреждение"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr ""
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -83,15 +83,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Този помощник ще ви помогне да добавите нов клиент в локалния ви DNS"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(не се налага да пишете името на домейна)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Идентификация на клиента:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +110,30 @@ msgstr ""
 "компютър в мрежата трябва да има (уникален) IP адрес, изписан по обичайния "
 "начин"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Име на машината:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP адрес на компютъра:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Внимание\\n Вие сте с dhcp,сървърът може да не работи с вашите настройки"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -178,7 +179,7 @@ msgstr "IP адрес на клиента:"
 msgid "The wizard successfully added the client."
 msgstr "Помощникът успешно добави клиента"
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP помощник"
 
@@ -194,51 +195,60 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Този помощник ще ви помогне да настроите DHCP услугите на сървъра ви."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Обхват на адресите,използвани от dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Изберете обхвата от адреси,отдавани на работните станции от dhcp услугата."
 "Освен ако нямате някакви специални нужди,спокойно може да оставите "
 "настройките както са си."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Най-малък IP адрес:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Най-голям IP адрес:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Зададеният обхват от IP адреси не е правилен"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "IP обхвата не е в обхвата от адреси на мрежовия сървър"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP-то на сървъра не трябва да бъде в обхвата"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Настройване на DHCP сървъра"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -246,11 +256,31 @@ msgstr ""
 "Помощникът намери следните параметри, необходими за настройката на DHCP "
 "услугата ви:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "изключен"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "включен"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Помощникът успешно настрои DHCP услугите на сървъра ви."
 
@@ -258,20 +288,20 @@ msgstr "Помощникът успешно настрои DHCP услугите
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS сървър"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS сървър"
@@ -307,70 +337,71 @@ msgstr ""
 "Тези настройки ще предоставят локална DNS услуга за локалните компютърни "
 "имена,а нелокалните ще бъдат пренасочвани през външния DNS."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Потребителско име:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Настройване на DNS сървъра"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -378,115 +409,115 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Това не е правилен адрес... натиснете \"нататък\",за да продължите"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Това не е правилен адрес... натиснете \"нататък\",за да продължите"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Това не е правилен адрес... натиснете \"нататък\",за да продължите"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS помощник (настройка)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Потребителско име:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Име на новинарския сървър:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Помощникът успешно добави клиента"
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Помощникът успешно добави клиента"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Помощникът успешно настрои DNS услугите на сървъра ви."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Настройване на DNS сървъра"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Настройване на DNS сървъра"
@@ -586,27 +617,23 @@ msgstr "инсталацията провалена"
 msgid "FTP wizard"
 msgstr "FTP помощник"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Помощник за настройка на FTP сървър"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Този помощник ще ви помогне да настроите FTP сървър-а за мрежата ви."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Не слагайте отметки никъде,ако не искате да включвате FTP сървъра си."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP сървър"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Избор на FTP услугата за активиране:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -614,75 +641,75 @@ msgstr ""
 "Сървърът ви може да действа като такъв за вътрешната мрежа (интранет) и "
 "такъв за Интернет."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Отваря FTP сървъра за връзка с локалната мрежа"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Отваря FTP сървъра за връзка с Интернет"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Внимание\\n Вие сте с dhcp,сървърът може да не работи с вашите настройки"
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Съжалявам, трябва да бъдете root, за да направите това..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Настройване на FTP сървър"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -691,7 +718,7 @@ msgstr ""
 "Помощникът събра следните параметри,необходими за настройка на FTP сървъра "
 "ви : "
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -700,35 +727,35 @@ msgstr ""
 "Натиснете \"Нататък\",за да приемете тези настройки и да настроите сървъра,"
 "или \"Назад\" за да ги поправите"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "изключен"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "включен"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Интранет FTP сървър:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Интернет FTP сървър:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Помощникът успешно настрои вашият Интранет/Интернет ftp сървър"
 
@@ -776,7 +803,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1056,7 +1083,7 @@ msgstr ""
 "Помощникът събра следните параметри,необходими за настройката на вашия "
 "сървър за интернет новини:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1332,65 +1359,94 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP адрес на клиента:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 #, fuzzy
 msgid "Postfix wizard"
 msgstr "FTP помощник"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "FTP сървър"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "FTP сървър"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Помощник за настройка на интернет поща"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Този помощник ще ви помогне да настроите услугата \"ел.поща\" на сървъра ви."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Изходящ пощенски адрес"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Предупреждение:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Вие сте въвели празен адрес за пощенски портал."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1401,64 +1457,69 @@ msgstr ""
 "например,ако вашия доставчик е \"provider.com\", сървърът трябва да е \"news."
 "provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Помощникът успешно настрои вашата услуга \"интернет поща\" на сървъра ви."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Настройване на FTP сървър"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "FTP сървър"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Настройване на FTP сървър"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr ""
@@ -1615,8 +1676,9 @@ msgid "Access Control:"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
-msgstr ""
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
+msgstr "Помощникът успешно настрои вашият NFS сървър."
 
 #: ../proxy_wizard/Squid.pm:217
 #, fuzzy
@@ -1633,12 +1695,6 @@ msgstr "Магьосник за клиента"
 msgid "PXE Wizard"
 msgstr "FTP помощник"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2318,6 +2374,17 @@ msgstr "Потребителска директория:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Не слагайте отметки никъде,ако не искате да включвате FTP сървъра си."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Внимание\\n Вие сте с dhcp,сървърът може да не работи с вашите настройки"
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/bs.po b/po/bs.po
index b554c7f4..33425233 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-20 12:39+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,9 +32,9 @@ msgstr "Čarobnjak za podešavanje"
 msgid "Warning."
 msgstr "Upozorenje"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -42,12 +42,12 @@ msgid "Error."
 msgstr "Greška."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -88,15 +88,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Ovaj čarobnjak će vam pomoći u dodavanju novog klijenta u vaš lokalni DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identifikacija klijenta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -105,7 +105,7 @@ msgstr ""
 "Obratite pažnju da dati IP broj i ime klijenta moraju biti jedinstveni u "
 "ovoj mreži."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Ime računara:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP broj računara:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -138,7 +139,7 @@ msgstr ""
 "konfiguracijom."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -185,7 +186,7 @@ msgstr "IP klijenta:"
 msgid "The wizard successfully added the client."
 msgstr "Čarobnjak je uspješno dodao klijenta."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP čarobnjak"
 
@@ -202,51 +203,60 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite DHCP servise na ovom serveru."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Raspon adresa koje koristi DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Izaberite raspon adresa koje će biti dodjeljene radnim stanicama putem DHCP "
 "servisa; osim ako imate neke posebne potrebe, možete slobodno prihvatiti "
 "predložene vrijednosti."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Najmanja IP adresa:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Najveća IP adresa:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "IP raspon koji ste unijeli nije ispravan"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "IP raspon koji ste unijeli nije u adresnom prostoru servera"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP servera se ne smije nalaziti u opsegu"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Podešavanje DHCP servera"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -254,11 +264,31 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "DHCP servisa:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "isključen"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "uključen"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Čarobnjak je uspješno podesio DHCP servis na ovom serveru."
 
@@ -266,20 +296,20 @@ msgstr "Čarobnjak je uspješno podesio DHCP servis na ovom serveru."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS server"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS server"
@@ -316,72 +346,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Odbij računare:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Određeno ime domena"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Podešavanje DNS servera"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Vanjski gateway"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -389,117 +420,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Ovo nije ispravna adresa... pritisnite Dalje za nastavak"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Ovo nije ispravna adresa... pritisnite Dalje za nastavak"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Ovo nije ispravna adresa... pritisnite Dalje za nastavak"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Greška."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS čarobnjak (podešavanje)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Određeno ime domena"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP adresa servera:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Ime servera:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Čarobnjak je uspješno dodao klijenta."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Čarobnjak je uspješno dodao klijenta."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Podešavanje DNS servera"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Podešavanje DNS servera"
@@ -600,27 +631,23 @@ msgstr "instalacija nije uspjela"
 msgid "FTP wizard"
 msgstr "FTP čarobnjak"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Čarobnjak za podešavanje FTP servera"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite FTP server za vašu mrežu."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Nemojte uključivati nijednu opciju ako ne želite pokrenuti FTP server."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Izaberite vrstu FTP servisa koji želite pokrenuti:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -628,76 +655,76 @@ msgstr ""
 "Vaš server se može ponašati kao FTP server prema vašoj internoj mreži "
 "(intranet) ili kao FTP server za Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Uključi FTP server za Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Uključi FTP server za Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Dozvoli računare:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Upozorenje\\nNalazite se u dhcp-u, server možda neće raditi sa ovom "
-"konfiguracijom."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Žalim, morate biti root da uradite ovo..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Podešavanje FTP servera"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -706,7 +733,7 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje FTP "
 "servera"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -715,35 +742,35 @@ msgstr ""
 "Da prihvatite ove vrijednosti i podesite server, kliknite na dugme Dalje ili "
 "koristite dugme Nazad da ih ispravite."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "isključen"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "uključen"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet FTP server:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet FTP server:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet FTP server"
 
@@ -791,7 +818,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1076,7 +1103,7 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Internet news servisa:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1353,26 +1380,41 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP klijenta:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix čarobnjak"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Ime mail servera:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Ime mail servera:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Čarobnjak za podešavanje Internet mail-a"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Ovaj čarobnjak će vam pomoći da podesite Internet Mail servis za vašu mrežu."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Izlazna mail adresa"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1380,7 +1422,7 @@ msgstr ""
 "Ovo trebate izabrati tako da bude konzistentno za adresom koju koristite za "
 "dolaznu poštu."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1388,19 +1430,27 @@ msgstr ""
 "Možete izabrati tip adrese koju će izlazna pošta prikazivati u \"From:\" i "
 "\"Reply-to\" poljima."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maskirano ime domena:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Upozorenje:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Unijeli ste praznu adresu za mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1408,15 +1458,21 @@ msgstr ""
 "Vaš izbor može biti prihvaćen, ali to će onemogućiti slanje maila izvan vaše "
 "lokalne mreže. Pritisnite Dalje za nastavak, ili Nazad da unesete nešto."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquerade nije dobar!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet mail gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1426,7 +1482,7 @@ msgstr ""
 "primjer, ako je vaš provajder \"provajder.ba\", internet mail server je "
 "obično \"smtp.provajder.ba\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1434,29 +1490,29 @@ msgstr ""
 "Vaš server će poslati izlazni mail kroz mail gateway, koji će se zatim "
 "pobrinuti za krajnju dostavu."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Ime mail servera:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Podešavanje Internet Mail-a"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1464,29 +1520,34 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Internet mail servisa:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Oblik adrese"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Čarobnjak je uspješno podesio Internet mail servis za ovaj server."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Podešavanje FTP servera"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Print server:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Podešavanje FTP servera"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - pristup ograničen samo na ovaj računar"
@@ -1668,7 +1729,8 @@ msgid "Access Control:"
 msgstr "Kontrola pristupa:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Čarobnjak je uspješno podesio proxy server."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1686,12 +1748,6 @@ msgstr "Squid čarobnjak"
 msgid "PXE Wizard"
 msgstr "FTP čarobnjak"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2421,6 +2477,18 @@ msgstr "Korisnički direktorij:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet Web server."
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Nemojte uključivati nijednu opciju ako ne želite pokrenuti FTP server."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Upozorenje\\nNalazite se u dhcp-u, server možda neće raditi sa ovom "
+#~ "konfiguracijom."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/ca.po b/po/ca.po
index 5c915c6c..bc8ca016 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-22 19:32+0100\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Auxiliar de configuració"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,9 +30,9 @@ msgstr "Auxiliar de configuració"
 msgid "Warning."
 msgstr "Avís."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -40,12 +40,12 @@ msgid "Error."
 msgstr "Error."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -85,15 +85,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Aquest auxiliar us ajudarà a afegir un client nou al DNS local."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identificació del client:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -102,7 +102,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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +112,30 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nom de la màquina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Adreça IP de la màquina:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Avís"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Esteu sobre dhcp; és possible que el servidor no funcioni amb aquesta "
 "configuració."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -180,7 +181,7 @@ msgstr "IP del client:"
 msgid "The wizard successfully added the client."
 msgstr "L'auxiliar ha afegit el client amb èxit."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Auxiliar del DHCP"
 
@@ -198,48 +199,57 @@ msgstr ""
 "Aquest auxiliar us ajudarà a configurar els serveis DHCP del vostre servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Rang d'adreces emprades pel DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Seleccioneu el rang d'adreces assignat pel servei DHCP a les estacions de "
 "treball. Si no teniu cap requeriment especial, podeu acceptar amb "
 "tranquil·litat els valors que es proposen."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Adreça IP més baixa:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Adreça IP més alta:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Interfície que ha d'escoltar el servidor dhcp"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "El rang d'adreces IP especificat no és correcte."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "El rang d'adreces IP especificat no és al rang d'adreces del servidor."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "L'adreça IP del servidor no ha d'estar en el rang."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "S'està configurant el servidor DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -247,11 +257,31 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetres següents necessaris per configurar el "
 "servei DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "inhabilitat"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "habilitat"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interfície:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "L'auxiliar ha configurat els serveis DHCP del servidor amb èxit."
 
@@ -259,19 +289,19 @@ msgstr "L'auxiliar ha configurat els serveis DHCP del servidor amb èxit."
 msgid "You need to readjust your hostname."
 msgstr "Heu de reajustar el nom de la vostre màquina."
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "Servidor DNS mestre"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "Servidor DNS esclau"
 
@@ -305,70 +335,71 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "Què voleu fer:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nom d'usuari:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "IP del servidor DNS mestre:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -376,113 +407,113 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Aquesta adreça no és vàlida... Premeu Següent per continuar"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 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:177
+#: ../dns_wizard/Bind.pm:176
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Error"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "amb aquesta configuració:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Adreça IP més baixa:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "Nom del servidor:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "Domini Nis:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "L'auxiliar ha afegit el client amb èxit."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "L'auxiliar ha afegit el client amb èxit."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 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:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "S'està configurant el vostre sistema con servidor DNS mestre ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "S'està configurant el vostre sistema con servidor DNS esclau ..."
 
@@ -571,28 +602,24 @@ msgstr "La instal·lació ha fallat"
 msgid "FTP wizard"
 msgstr "Auxiliar de l'FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Auxiliar de configuració del servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Aquest auxiliar us ajudarà a configurar el servidor FTP per la vostra xarxa."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "No marqueu cap opció si no voleu activar el servidor FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Seleccioneu el tipus de servei FTP que voleu activar:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -600,76 +627,78 @@ msgstr ""
 "El servidor pot actuar com a servidor FTP per a la xarxa interna (intranet) "
 "i com a servidor FTP per a Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Habilita el servidor FTP per a la intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Habilita el servidor FTP per a internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+#, fuzzy
+msgid "Admin email:"
 msgstr "Correu de l'administrador"
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
-msgstr ""
+#: ../ftp_wizard/Proftpd.pm:99
+#, fuzzy
+msgid "Allow FTP resume:"
+msgstr "Permet FXP"
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
 msgstr "Permet FXP"
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Avís\n"
-"Esteu sobre dhcp; és possible que el servidor no funcioni amb aquesta "
-"configuració."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Heu de ser el superusuari per fer això..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "S'està configurant el servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -677,7 +706,7 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetes següents\n"
 "necessaris per configurar el servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -685,35 +714,35 @@ msgstr ""
 "Per acceptar aquests valors i configurar el servidor feu clic al botó "
 "Següent, o premeu el botó Anterior per corregir-los."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "inhabilitat"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "habilitat"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Servidor FTP per a la intranet:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Servidor FTP per a internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr "Correu de l'administrador"
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr "Permet FXP"
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "L'auxiliar ha configurat el servidor FTP per a Intranet/Internet amb èxit"
@@ -761,7 +790,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1037,7 +1066,7 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetres següents \n"
 "necessaris per configurar el servei de notícies d'Internet:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1311,27 +1340,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Client Nis"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Auxiliar del postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Servidor de correu"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Servidor de correu"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Auxiliar de configuració del correu d'Internet"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Aquest auxiliar us ajudarà a configurar els serveis de correu d'Internet per "
 "a la vostra xarxa."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Adreça del correu de sortida"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1339,7 +1383,7 @@ msgstr ""
 "Hauríeu de triar conseqüentment amb l'adreça que feu servir per al correu "
 "d'entrada."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1347,19 +1391,27 @@ msgstr ""
 "Podeu triar el tipus d'adreça que el correu de sortida mostrarà en els camps "
 "\"De:\" i \"Respon a:\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Nom de domini emmascarat:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Avís:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Heu introduït una adreça buida per a la passarel·la de correu."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1368,15 +1420,21 @@ msgstr ""
 "fora de la xarxa local. Premeu Següent per continuar, o Anterior per "
 "introduir un valor."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "L'emmascarament no és correcte"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Passarel·la del correu d'Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1386,7 +1444,7 @@ msgstr ""
 "tipusdedomini\";per exemple, si el vostre proveïdor és \"proveïdor.com\", el "
 "servidor de correu d'internet generalment serà \"smtp.proveïdor.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1394,29 +1452,29 @@ msgstr ""
 "El vostre servidor enviarà el correu de sortida a través d'una passarel·la, "
 "que s'encarregarà de lliurar-lo finalment."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nom del servidor de correu:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "S'està configurant el correu d'Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1424,29 +1482,35 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetres següents necessaris per configurar el "
 "servei de correu d'Internet:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Format de l'adreça"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "L'auxiliar ha configurat el servei de correu d'Internet del servidor amb "
 "èxit."
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "S'està configurant el servidor Postfix"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Servidor Postfix"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "S'està configurant el servidor Postfix"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Màquina local - accés permès únicament des d'aquest servidor"
@@ -1630,7 +1694,8 @@ msgid "Access Control:"
 msgstr "Control d'accés:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "L'auxiliar ha configurat el servidor intermediari amb èxit."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1645,12 +1710,6 @@ msgstr ""
 msgid "PXE Wizard"
 msgstr "Auxiliar de PXE"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr ""
@@ -2368,6 +2427,17 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "L'auxiliar ha configurat el servidor Web per a Intranet/Internet amb èxit"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "No marqueu cap opció si no voleu activar el servidor FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Avís\n"
+#~ "Esteu sobre dhcp; és possible que el servidor no funcioni amb aquesta "
+#~ "configuració."
+
 #~ msgid "Ip of master DNS server:"
 #~ msgstr "IP del servidor DNS mestre:"
 
diff --git a/po/cs.po b/po/cs.po
index 494717d3..2756ca8e 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-07 10:44GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Průvodce pro nastavení"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,9 +36,9 @@ msgstr "Průvodce pro nastavení"
 msgid "Warning."
 msgstr "Varování"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -46,12 +46,12 @@ msgid "Error."
 msgstr "Chyba."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -94,15 +94,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Tento průvodce vám pomůže přidat nového klienta do vaší lokální služby DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identifikace klienta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -111,7 +111,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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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, "
@@ -121,22 +121,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Název počítače:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP adresa počítače:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Varování"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -144,7 +145,7 @@ msgstr ""
 "nastavením správně fungovat."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -191,7 +192,7 @@ msgstr "IP klienta:"
 msgid "The wizard successfully added the client."
 msgstr "Průvodce úspěšně přidal klienta."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Průvodce pro DHCP"
 
@@ -208,51 +209,60 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Tento průvodce vám pomůže nastavit služby DHCP na vašem serveru."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Rozsah adres použitých službou DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Vyberte rozsah adres, které budou službou DHCP přiřazované pracovním "
 "stanicím; pokud nemáte zvláštní požadavky, můžete bez starostí přijmout "
 "nabízené hodnoty."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Nejnižší IP adresa:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Nejvyšší IP adresa:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Zadaný rozsah IP adres není správně"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Zadaný rozsah IP adres není v rozsahu síťových adres serveru"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP adresa serveru musí být mimo rozsah"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Nastavuji server DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -260,11 +270,31 @@ msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení vaší služby "
 "DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "vypnuto"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "zapnuto"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Průvodce úspěšně nastavil služby DHCP na vašem serveru."
 
@@ -272,20 +302,20 @@ msgstr "Průvodce úspěšně nastavil služby DHCP na vašem serveru."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS server"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS server"
@@ -322,72 +352,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Zakázat počítače:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Vypočtený název domény"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Nastavuji DNS server"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Externí brána"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -395,117 +426,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Toto není platná adresa... pokračujte stisknutím tlačítka Další"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Toto není platná adresa... pokračujte stisknutím tlačítka Další"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Toto není platná adresa... pokračujte stisknutím tlačítka Další"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Chyba."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Průvodce nastavením DNS (nastavení)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Vypočtený název domény"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP adresa serveru:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Název serveru:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Průvodce úspěšně přidal klienta."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Průvodce úspěšně přidal klienta."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Nastavuji DNS server"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Nastavuji DNS server"
@@ -606,27 +637,23 @@ msgstr "instalace selhala"
 msgid "FTP wizard"
 msgstr "Průvodce pro FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Průvodce nastavením FTP serveru"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Tento průvodce vám pomůže nastavit FTP server pro vaši síť."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Pokud nechcete aktivovat váš FTP server, nezaškrtávejte žádné políčko."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Vyberte požadovaný druh služby FTP, kterou chcete aktivovat:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -634,76 +661,76 @@ msgstr ""
 "Váš počítač může poskytovat služby FTP serveru pro vaši interní síť "
 "(Intranet) a služby FTP serveru pro síť Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Povolit FTP server pro Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Povolit FTP server pro Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Povolit počítače:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Varování\\nMáte-li síť nastavenou v režimu DHCP, server nemusí s vaším "
-"nastavením správně fungovat."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Promiňte, ale na tohle musíte být uživatel root..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Nastavuji FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -712,7 +739,7 @@ msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení vašeho FTP "
 "serveru"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -721,35 +748,35 @@ msgstr ""
 "Chcete-li přijmout tyto hodnoty a nastavit váš server, klepněte na tlačítko "
 "Další nebo použijte tlačítko Zpět a opravte je."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "vypnuto"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "zapnuto"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "FTP server pro Intranet:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "FTP server pro Internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Tento průvodce úspěšně nastavil váš FTP server pro Internet/Intranet"
 
@@ -797,7 +824,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1084,7 +1111,7 @@ msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení vaší služby "
 "pro diskusní skupiny z Internetu:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1362,26 +1389,41 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP klienta:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Průvodce pro server Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Název poštovního serveru:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Název poštovního serveru:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Průvodce nastavením pošty pro Internet"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Tento průvodce vám pomůže nastavit služby pošty pro Internet pro vaši síť."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Odchozí poštovní adresa"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1389,7 +1431,7 @@ msgstr ""
 "Tato by měla být zvolena konzistentně s adresou, kterou používáte pro "
 "příchozí poštu."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1397,19 +1439,27 @@ msgstr ""
 "Můžete vybrat adresu, která se bude objevovat v odchozích dopisech v "
 "položkách\"From:\" (odesílatel) a \"Reply-To:\" (komu poslat odpověď)."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Název maškarádované domény:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Varování:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Zadal jste prázdnou adresu pro poštovní bránu."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1418,15 +1468,21 @@ msgstr ""
 "lokální síť. Chcete-li pokračovat, stiskněte tlačítko Další, jinak stiskněte "
 "tlačítko Zpět a zadejte nějakou hodnotu."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maškaráda není v pořádku!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Brána pro poštu na Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1436,7 +1492,7 @@ msgstr ""
 "pokud se například váš poskytovatel jmenuje \"poskytovatel.cz\", pak je "
 "obvykle název jeho poštovního serveru pro Internet \"smtp.poskytovatel.cz\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1444,29 +1500,29 @@ msgstr ""
 "Váš server bude odesílat odchozí poštu skrze poštovní bránu, která se "
 "postará o konečné doručení."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Název poštovního serveru:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Nastavuji elektronickou poštu pro síť Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1474,31 +1530,36 @@ msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení vaší služby "
 "pro poštu na Internetu:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Tvar adresy"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Průvodce úspěšně nastavil službu pro elektronickou poštu na Internetu na "
 "vašem serveru."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Nastavuji FTP server"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Tiskový server:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Nastavuji FTP server"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - přístup omezený pouze na tento server"
@@ -1681,7 +1742,8 @@ msgid "Access Control:"
 msgstr "Kontrola přístupu:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Tento průvodce úspěšně nastavil váš proxy server."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1699,12 +1761,6 @@ msgstr "Průvodce pro server Squid"
 msgid "PXE Wizard"
 msgstr "Průvodce pro FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2440,6 +2496,18 @@ msgstr "Uživatelský adresář:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Průvodce úspěšně nastavil váš webový server pro Internet/Intranet"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Pokud nechcete aktivovat váš FTP server, nezaškrtávejte žádné políčko."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Varování\\nMáte-li síť nastavenou v režimu DHCP, server nemusí s vaším "
+#~ "nastavením správně fungovat."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/cy.po b/po/cy.po
index 550fd16e..c2601380 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-12-31 18:24-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "dewin ffurfweddu"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -26,9 +26,9 @@ msgstr "dewin ffurfweddu"
 msgid "Warning."
 msgstr "Rhybudd."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -36,12 +36,12 @@ msgid "Error."
 msgstr "Gwall."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -82,15 +82,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Bydd y dewin yn eich cynorthwyo i ychwanegu cleient newydd yn eich DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Enw cleient:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -99,7 +99,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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +109,30 @@ msgstr ""
 "enwcleient.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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Enw'r peiriant"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Rhif IP'y peiriant:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Rydych yn dhcp, efallai na fydd y gwasanaethwr yn gweithio gyda'ch "
 "ffurfweddiad."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -177,7 +178,7 @@ msgstr "IP Cleient:"
 msgid "The wizard successfully added the client."
 msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Dewin DHCP"
 
@@ -195,49 +196,58 @@ msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau DHCP eich gwasanaethwr."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Ystod y cyfeiriadau defnyddir gan dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Dewiswch ystod cyfeiriadau dynodwyd i'r orsaf waith gan y gwasanaeth DHCP; "
 "oni bai fod gennych anghenion arbennig, bydd modd i chi dderbyn y gwerthoedd "
 "sy'n cael eu cynnig."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Cyfeiriad IP Isaf:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Cyfeiriad IP Uchaf"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Rhyngwyneb y mae'n rhaid i wasanaethwr dhcp wrando amdano"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Nid yw'r amrediad IP rhoddwyd yn gywir."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Nid yw'r amrediad IP rhoddwyd o fewn amrediad cyfeiriad y gwasanaethwr."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "Rhaid i IP y gwasanaethwr beidio â bod o fewn amrediad."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Ffurfweddu'r Gwasanaethwr DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -245,11 +255,31 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer eich "
 "gwasanaeth DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "anablwyd"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "galluogwyd"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Rhyngwyneb:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gwasanaethwr."
 
@@ -257,20 +287,20 @@ msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gwasanaethwr."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Gwasanaethwr NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Gwasanaethwr NFS"
@@ -308,71 +338,72 @@ msgstr ""
 "cyfrifiaduron lleol, gyda cheisiadau allanol yn cael eu hanfon ymlaen i DNS "
 "allanol."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Gwrthod gwesteiwr"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Enw Gwasanaethwr Newyddion:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Ffurfweddu'r Gwasanaethwr DHCP"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -380,119 +411,119 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad dilys...gwasgwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad dilys...gwasgwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad dilys...gwasgwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Gwall"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Dns (ffurfweddu)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Enw Gwasanaethwr Newyddion:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Baner Gwasanaethwr"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "Nis Domain:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu'r gwasanaethau DNS ar gyfer eich "
 "gwasanaethwr."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Ffurfweddu eich system fel gwasanaethwr Nis+Autofs(nfs)..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Ffurfweddu eich system fel gwasanaethwr Nis+Autofs(nfs)..."
@@ -584,30 +615,25 @@ msgstr "Methodd y gosod"
 msgid "FTP wizard"
 msgstr "Dewin FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Dewin Ffurfweddu Gwasanaethwr FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu'r Gwasanaethwr FTP ar gyfer eich "
 "rhwydwaith."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gwasanaethwr FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Gwasanaethwr FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Dewiswch y matho o wasanaeth FTP rydych am ei gychwyn:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -615,75 +641,76 @@ msgstr ""
 "Mae modd i'ch gwasanaethwr weithredu fel Gwasanaethwr FTP ar gyfer eich "
 "rhwydwaith mewnol (mewnrwyd) neu fel Gwasanaethwr FTP ar gyfer y Rhyngrwyd."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Galluogi'r Gwasanaethwr FTP ar gyfer y Fewnrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Galluogi'r Gwasanaethwr FTP ar gyfer y Rhyngrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Caniatáu gwesteiwr:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Rhybudd\\nRydych yn dhcp, efallai na fydd y gwasanaethwr yn gweithio gyda'ch "
-"ffufrweddiad."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Rhaid i chi fod yn wraidd i wneud hyn..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Ffurfweddu'r Gwasanaethwr FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -691,7 +718,7 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol\n"
 "sydd eu hangen ar gyfer ffurfweddu eich Gwasanaethwr FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -699,35 +726,35 @@ msgstr ""
 "I dderbyn y gwerthoedd hyn, ac i ffurfweddu eich gwasanaethwr, cliciwch  y "
 "botwm Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "anablwyd"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "galluogwyd"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Gwasanaethwr FTP Mewnrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Gwasanaeth FTP y Rhyngrwyd:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr FTP Mewnrwyd/"
@@ -777,7 +804,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1060,7 +1087,7 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol\n"
 "sydd eu hangen ar gyfer ffurfweddu eich Gwasanaeth Newyddion Rhyngrwyd:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1342,27 +1369,42 @@ msgstr "Ffurfweddu eich system fel Cleient Nis..."
 msgid "Nis Client"
 msgstr "Cleient Nis"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Dewin Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Gwasanaethwr e-bost"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Gwasanaethwr e-bost"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Dewin Ffurfweddu E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau E-bost Rhyngrwyd ar gyfer "
 "eich rhwydwaith."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Cyfeiriad E-bost Allfynd"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1370,7 +1412,7 @@ msgstr ""
 "Rhaid i hyn gael ei ddewis yn gyson gyda'r cyfeiriad sy'n cael ei ddefnyddio "
 "ar gyfer e-bost sy'n cyrraedd."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1378,19 +1420,27 @@ msgstr ""
 "Mae modd dewis y math o gyfeiriad fydd e-bost allfynd yn ei ddangos ym maes "
 "\"Oddi wrth:\" a \"Ateb i\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Enw parth ffug:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Rhybudd"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Rydych wedi rhoi cyfeiriad gwag ar gyfer porth e-bost."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1399,15 +1449,21 @@ msgstr ""
 "allan i'ch rhwydwaith lleol. Cliciwch nesaf i barhau, neu nôl i gynnig "
 "gwerth."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Ffugio gwael!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Porth E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1417,7 +1473,7 @@ msgstr ""
 "\"; e.e. os eich darparwr yw \"darparwr.com\", fel rheol y gwasanaethwr e-"
 "bost rhyngrwyd yw \"newyddion.darparwr.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1425,29 +1481,29 @@ msgstr ""
 "Bydd eich gwasanaethwr yn anfon yr e-bost allfynd drwy borth e-bost, gan "
 "ofalu am y trosglwyddiad terfynol."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Enw Gwasanaethwr E-bost::"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Ffurfweddu E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1455,30 +1511,35 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gwasanaeth E-bost Rhyngrwyd:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Ffurf y Cyfeiriad"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaeth E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Ffurfweddu'r Gwasanaethwr FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Gwasanaethwr Argraffu:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Ffurfweddu'r Gwasanaethwr FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Gwestai Lleol - cyfyngu mynediad i'r gwasanaethwr hwn yn unig"
@@ -1656,7 +1717,8 @@ msgid "Access Control:"
 msgstr "Rheoli Mynediad:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaethwr dirprwyol."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1674,12 +1736,6 @@ msgstr "Dewin Squid"
 msgid "PXE Wizard"
 msgstr "Dewin PXE"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Gosod wasanaethwr PXE"
@@ -2415,6 +2471,17 @@ msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr Gwe Mewnrwyd/"
 "Rhyngrwyd"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gwasanaethwr FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Rhybudd\\nRydych yn dhcp, efallai na fydd y gwasanaethwr yn gweithio "
+#~ "gyda'ch ffufrweddiad."
+
 #, fuzzy
 #~ msgid "Setup a ldap server."
 #~ msgstr "Gosod gwasanaethwr PXE"
diff --git a/po/da.po b/po/da.po
index 189fd2ef..079dff3b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-20 16:33+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigurationshjælper"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "Konfigurationshjælper"
 msgid "Warning."
 msgstr "Advarsel."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -43,12 +43,12 @@ msgid "Error."
 msgstr "Fejl."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -89,15 +89,15 @@ 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."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Klientidentifikation:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -105,7 +105,7 @@ msgid ""
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +115,28 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Maskinens navn:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Maskinens IP-nummer:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -181,7 +182,7 @@ msgstr "Klient-IP:"
 msgid "The wizard successfully added the client."
 msgstr "Hjælperen tilføjede klienten uden problemer."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP-hjælper"
 
@@ -199,47 +200,56 @@ msgstr ""
 "Denne hjælper vil hjælpe dig med at konfigurere DHCP-tjenester på din server."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Adresseområde brugt af dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Vælg adresseområdet tildelt arbejdstationerne af DHCP-tjenesten; hvis du "
 "ikke har specielle behov kan du trygt godtage de foreslåede værdier."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Laveste IP-adresse:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Højeste IP-adresse:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Grænsesnit som dhcp-serveren skal lytte på"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Det angivne IP-område er ikke korrekt."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Det angivne IP-område er ikke i serverens netværksadresseområde."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "IP-adressen for serveren må ikke være i området."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurerer DHCP-serveren"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -247,11 +257,31 @@ msgstr ""
 "Hjælperen samlede følgende parametre som behøves for at konfigurere DHCP-"
 "tjenesten:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "deaktiveret"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "aktiveret"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Grænsesnit:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 "Hjælperen konfigurerede DHCP-tjenesterne på din serveren uden problemer."
@@ -260,20 +290,20 @@ msgstr ""
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS-server"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS-server"
@@ -310,71 +340,72 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "Fjern vært:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Beregnet domænenavn"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurerer DNS-serveren"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Ekstern gateway"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -382,116 +413,116 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 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:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Dette er ikke en gyldig adresse, klik på Næste for at fortsætte"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Fejl"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "med denne konfiguration:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Beregnet domænenavn"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP-adresse for server:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "Værtsnavn på server:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "Nis Domain:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Hjælperen tilføjede klienten uden problemer."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Hjælperen tilføjede klienten uden problemer."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Hjælperen konfigurerede DNS-tjenesterne på din server uden problemer."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurerer dit system som en Nis+Autofs(nfs) server ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurerer dit system som en Nis+Autofs(nfs) server ..."
@@ -583,28 +614,24 @@ msgstr "Installation mislykkedes"
 msgid "FTP wizard"
 msgstr "FTP-hjælper"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Konfigurationshjælper for FTP-server"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Denne hjælpe vil hjælpe dig med at konfigurere FTP-serveren til dit netværk."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Markér ikke nogen boks hvis du ikke vil aktivere FTP-serveren."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Vælg hvilken form af FTP-tjeneste du vil aktivere:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -612,75 +639,76 @@ msgstr ""
 "Din server kan spille som en FTP-server mod dit interne netværk (intranet) "
 "og som en FTP-server for Internettet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Aktivér FTP-serveren for Intranettet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Aktivér FTP-serveren for Internettet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Tillad værter:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Advarsel\n"
-"Du er i dhcp, serveren vil muligvis ikke virke med din konfiguration."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Desværre, du skal være root for at gøre dette."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Konfigurerer FTP-serveren"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -688,7 +716,7 @@ msgstr ""
 "Hjælperen samlede de følgende parametre\n"
 "som behøves for at konfigurere din FTP-server"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -696,35 +724,35 @@ msgstr ""
 "For at godtage disse værdier og konfigurere din server skal du klikke på "
 "Næste-knappen, eller bruge Tilbage-knappen for at ændre dem"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "deaktiveret"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "aktiveret"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet-FTP-server:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet-FTP-server:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Hjælperen konfigurerede din Intranet/Internet FTP-server uden problemer"
@@ -773,7 +801,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1058,7 +1086,7 @@ msgstr ""
 "Hjælperen samlede de følgende parametre\n"
 "som behøves for at konfigurere din Internet nyheds-tjeneste:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1339,27 +1367,42 @@ msgstr "Konfigurerer dit system som en Nis-klient ..."
 msgid "Nis Client"
 msgstr "Nis-klient"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix-hjælper"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "E-postserver"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "E-postserver"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet epost konfigureringshjælper"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Denne hjælper vil hjælpe dig med at konfigurere Internet epost-tjenester for "
 "dit netværk."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Udgående e-postadresse"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1367,7 +1410,7 @@ msgstr ""
 "Denne bør vælges i overensstemmelse med adressen du bruger for indgående "
 "post."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1375,19 +1418,27 @@ msgstr ""
 "Du kan vælge den slags adresser som udgående epost vil vise i \"From:\" og "
 "\"Reply-to\"-felterne."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maskarade domænenavn"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Du indtastede en tom adresse for epost-gatewayen."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1396,15 +1447,21 @@ msgstr ""
 "udenfor dit lokale netværk. Tryk næste for at fortsætte, eller tilbage for "
 "at indtaste en værdi."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskering ikke i orden!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet epost gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1414,7 +1471,7 @@ msgstr ""
 "din udbyder er \"udbyder.dk\", er internet epost-serveren normalt \"smtp."
 "udbyder.dk\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1422,29 +1479,29 @@ msgstr ""
 "Din server vil sende udgående post via en epost-gateway, denne vil tage hånd "
 "om slutleveringen."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Navn på e-postserver:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurerer Internet epost"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1452,31 +1509,36 @@ msgstr ""
 "Hjælperen samlede følgende parametre som behøves for at konfigurere din "
 "Internet epost-tjeneste:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Form på adressen"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Hjælperen konfigurerede din Internet eposttjeneste for din server uden "
 "problemer."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Konfigurerer FTP-serveren"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Postfix"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Konfigurerer FTP-serveren"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Lokalvært - adgang begrænset til kun denne server"
@@ -1654,7 +1716,8 @@ msgid "Access Control:"
 msgstr "Adgangskontrol:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Hjælperen har konfigureret din proxy-server uden problemer."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1672,12 +1735,6 @@ msgstr "Squid"
 msgid "PXE Wizard"
 msgstr "PXE-hjælper"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Indstil PXE-server"
@@ -2409,6 +2466,16 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "Hjælperen konfigurerede din Intranet/Internet web-server uden problemer"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Markér ikke nogen boks hvis du ikke vil aktivere FTP-serveren."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Advarsel\n"
+#~ "Du er i dhcp, serveren vil muligvis ikke virke med din konfiguration."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/de.po b/po/de.po
index 7ee4f0ad..5dea321c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-18 23:46+0200\n"
 "Last-Translator: Sebastian Deutscher <sebastian_deutscher@web.de>\n"
 "Language-Team: german <cooker-i18n@linux-mandrake.com>\n"
@@ -31,7 +31,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigurations-Assistent"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -40,9 +40,9 @@ msgstr "Konfigurations-Assistent"
 msgid "Warning."
 msgstr "Warnung"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -50,12 +50,12 @@ msgid "Error."
 msgstr "Fehler."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -99,15 +99,15 @@ msgstr ""
 "Dieser Assistent hilft Ihnen beim Integrieren neuer Rechner in Ihre lokale "
 "DNS Domäne"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Rechner Identifikation:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -116,7 +116,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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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, "
@@ -126,22 +126,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Rechnername:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP-Adresse des Rechners:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -149,7 +150,7 @@ msgstr ""
 "erreichbar sein."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -199,7 +200,7 @@ msgstr "Client IP-Adresse:"
 msgid "The wizard successfully added the client."
 msgstr "Der Rechner wurde vom Assistenten erfolgreich in das Netz integriert."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP-Assistent"
 
@@ -216,51 +217,60 @@ msgstr ""
 "Der Assistent wird Ihnen helfen, den DHCP-Dienst Ihres Servers einzurichten."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "DHCP Adressbereich"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Wählen Sie den Adressbereich, aus dem der Dienst den anfragenden Rechnern "
 "Adressen zuteilen darf. Sollten Sie keine Sonderwünsche haben, können Sie "
 "die Vorgaben getrost übernehmen."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Niedrigste IP-Adresse:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Höchste IP-Adresse:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Der angegebene IP-Bereich ist ungültig"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Der angegebene IP-Bereich befindet sich in einem anderen Subnetz."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "Die Server-IP-Adresse, darf nicht im DHCP-Block liegen!"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP-Dienst einrichten"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -268,11 +278,31 @@ msgstr ""
 "Der Assistent hat die folgenden Parameter zusammengestellt, um Ihren DHCP "
 "Dienst einzurichten:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "aus"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "ein"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Der Assistent hat den DHCP-Dienst erfolgreich eingerichtet."
 
@@ -280,20 +310,20 @@ msgstr "Der Assistent hat den DHCP-Dienst erfolgreich eingerichtet."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS-Dienst"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS-Dienst"
@@ -330,72 +360,73 @@ msgstr ""
 "einzurichten, der lokale Adressanfragen selbst beantwortet und Anfragen "
 "aderer Subnetzte/des Internets entsprechend weiter leitet."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Abgehlente Hosts."
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Benutzername:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNS-Dienst einrichten"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Externes Gateway"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -403,11 +434,11 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
@@ -415,110 +446,110 @@ msgstr ""
 "Das ist keine gültige Adresse ... Betätigen Sie die Schaltfläche \"Weiter\", "
 "um fort zu fahren."
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "Das ist keine gültige Adresse ... Betätigen Sie die Schaltfläche \"Weiter\", "
 "um fort zu fahren."
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 "Das ist keine gültige Adresse ... Betätigen Sie die Schaltfläche \"Weiter\", "
 "um fort zu fahren."
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Fehler."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS Assistent (Einrichtung)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Server IP-Adresse:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Servername:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Der Rechner wurde vom Assistenten erfolgreich in das Netz integriert."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Der Rechner wurde vom Assistenten erfolgreich in das Netz integriert."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Der Assistent hat den DNS-Dienst erfolgreich eingerichtet."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "DNS-Dienst einrichten"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "DNS-Dienst einrichten"
@@ -619,29 +650,24 @@ msgstr "Die Installation schlug fehl!"
 msgid "FTP wizard"
 msgstr "FTP Assistent"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP Dienst Assistent"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Der Assistent wird Ihnen helfen, den FTP-Dienst Ihres Servers einzurichten."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Markieren Sie kein Feld, wenn sie den FTP-Dienst nicht aktivieren wollen."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP-Dienst"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Wählen Sie die Art des FTP-Dienstes, die Sie verwenden wollen:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -649,76 +675,76 @@ msgstr ""
 "Der Dienst kann als FTP Server in Ihrem internen Netzwerk (Intranet)  oder "
 "als FTP Server für das Internet eingesetzt werden."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Den FTP-Dienst für das Intranet aktivieren"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Den FTP-Dienst für das Internet aktivieren"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Erlaube Hosts:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Warnung!\\n Sie befinden sich im DHCP-Modus, der Server wird eventuell nicht "
-"erreichbar sein."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Für diese Aktion benötigen Sie Administrator-Rechte."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP-Dienst aktivieren"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -727,7 +753,7 @@ msgstr ""
 "Der Assistent hat die folgenden Parameter zusammengestellt, um Ihren FTP "
 "Dienst einzurichten:"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -736,35 +762,35 @@ msgstr ""
 "Verwenden Sie \"Weiter\", um diese Werte zu akzeptieren und den Server "
 "einzurichten. Mit \"Zurück\" können Sie Korrekturen an den Werten vornehmen."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "aus"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "ein"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet FTP-Dienst:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet FTP-Dienst:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Der Assistent hat den Intranet/Internet FTP-Dienst erfolgreich eingerichtet."
@@ -813,7 +839,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1100,7 +1126,7 @@ msgstr ""
 "Der Assistent hat die folgenden Parameter zusammengestellt, um Ihren "
 "Internet-News-Dienst einzurichten:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1382,33 +1408,48 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Client IP-Adresse:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix Assistent"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Mail-Servername:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Mail-Servername:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet-Mail-Konfigurationsassistent"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Dieser Assistent wird Ihnen beim Konfigurieren des Internet Mail Service "
 "Ihres Netzwerkes helfen."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Ausgehende Mail-Adresse"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Dies sollte immer mit der Empfangsadresse Ihrer Mails gewählt werden."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1416,20 +1457,28 @@ msgstr ""
 "Sie können die Art der Adresse wählen, die die ausgehende Mail im \"Von:\"- "
 "und \"Antwort an\"-Feld anzeigen wird."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Masquerade Domänen Name"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Warnung:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Sie gaben eine leere Adresse den Mail-Gateway an."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1438,16 +1487,22 @@ msgstr ""
 "Mails außerhalb Ihres lokalen Netzwerkes zu senden. Drücken Sie Nächstes um "
 "fortzufahren oder Zurück um eine Eingabe zu tätigen."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 #, fuzzy
 msgid "Masquerade not good!"
 msgstr "Die Masquerade ist nicht gut! "
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1457,7 +1512,7 @@ msgstr ""
 "werden, wenn Ihr Provider zum Beispiel \"provider.com\" ist, heißt der "
 "Internet-Mailserver \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1465,29 +1520,29 @@ msgstr ""
 "Ihr Server wird die ausgehenden Nachrichten durch ein Mail-Gateway senden, "
 "der das weitere übernimmt."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Mail-Servername:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurieren der Internet-Mail"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1495,31 +1550,36 @@ msgstr ""
 "Der Assisten hat die folgenden Parameter gesammelt, die gebraucht werden um "
 "Ihr Internet-Mail-Service zu konfigurieren."
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Form der Adresse"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Der Assistent konfigurierte den Internet-Mail-Service Ihres Servers "
 "erfolgreich."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTP-Dienst aktivieren"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Druckserver:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP-Dienst aktivieren"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - Zugang ist nur auf diesen Server beschränkt."
@@ -1707,7 +1767,8 @@ msgid "Access Control:"
 msgstr "Zugangskontrolle:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Der Assistent hat den Proxy erfolgreich eingerichtet."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1725,12 +1786,6 @@ msgstr "Squid-Assistent"
 msgid "PXE Wizard"
 msgstr "FTP Assistent"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2463,6 +2518,18 @@ msgstr ""
 "Der Assistent hat ihren Intranet/Internet Web-Server erfolgreich "
 "konfiguriert."
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Markieren Sie kein Feld, wenn sie den FTP-Dienst nicht aktivieren wollen."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Warnung!\\n Sie befinden sich im DHCP-Modus, der Server wird eventuell "
+#~ "nicht erreichbar sein."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index c9f59108..5bf0b218 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-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr ""
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -28,9 +28,9 @@ msgstr ""
 msgid "Warning."
 msgstr ""
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -38,12 +38,12 @@ msgid "Error."
 msgstr ""
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -78,47 +78,48 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -160,7 +161,7 @@ msgstr ""
 msgid "The wizard successfully added the client."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr ""
 
@@ -175,6 +176,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr ""
 
@@ -182,48 +187,72 @@ msgstr ""
 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."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 
@@ -231,19 +260,19 @@ msgstr ""
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr ""
 
@@ -272,68 +301,69 @@ msgid ""
 "with non-local requests forwarded to an outside DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -341,105 +371,105 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr ""
 
@@ -522,139 +552,137 @@ msgstr ""
 msgid "FTP wizard"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
+#: ../ftp_wizard/Proftpd.pm:137
+msgid "Intranet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
+#: ../ftp_wizard/Proftpd.pm:138
+msgid "Internet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:128
-msgid "Intranet FTP Server:"
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:129
-msgid "Internet FTP Server:"
+#: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:140
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 
@@ -701,7 +729,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -955,7 +983,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1212,124 +1240,155 @@ msgstr ""
 msgid "Nis Client"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+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:48
+#: ../postfix_wizard/Postfix.pm:66
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr ""
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+msgid "Configuring your Postfix server....."
+msgstr ""
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr ""
@@ -1485,7 +1544,7 @@ msgid "Access Control:"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+msgid "The wizard have successfully configured your proxy server."
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1500,12 +1559,6 @@ msgstr ""
 msgid "PXE Wizard"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 0aefa968..0d5d78f3 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-03-08 18:36+0200\n"
 "Last-Translator:  Νίκος Νύκταρης (Nick Niktaris) <niktarin@yahoo.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,9 +30,9 @@ msgstr "Οδηγός Ρυθμίσεων"
 msgid "Warning."
 msgstr "Προειδοποίηση"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "Σφάλμα Οδηγού."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -88,15 +88,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει να προσθέσετε ένα νέο πελάτη στο τοπικό DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(δεν χρειάζεται να πληκτρολογήσετε τον τομέα μετά το όνομα)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Αναγνωριστικό πελάτη:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -105,7 +105,7 @@ msgstr ""
 "Σημειώστε ότι ο αριθμός IP και το όνομα πελάτη πρέπει να είναι μοναδικά στο "
 "δίκτυο."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,23 @@ msgstr ""
 "εταιρία.net. Κάθε μηχάνημα πρέπει να έχει στο δίκτυο μια (μοναδική) "
 "διεύθυνση IP,συνήθως χωρισμένη με τελείες."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Όνομα του μηχανήματος:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "αριθμός IP αυτού του μηχανήματος:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -138,7 +139,7 @@ msgstr ""
 "τις ρυθμίσεις σας."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -185,7 +186,7 @@ msgstr "IP Πελάτη:"
 msgid "The wizard successfully added the client."
 msgstr "Ο οδηγός πρόσθεσε με επιτυχία τον πελάτη."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Οδηγός DHCP"
 
@@ -203,51 +204,60 @@ msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει στη ρύθμιση των υπηρεσιών στον διακομιστή σας."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Περιοχή διευθύνσεων που χρησιμοποιείται από το dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Επιλέξτε την περιοχή των διευθύνσεων που αναθέτονται στους σταθμούς εργασίας "
 "από την υπηρεσία DHCP, αν δεν έχετε ειδικές απαιτήσεις, μπορείτε να δεχτείτε "
 "τις προτεινόμενες τιμές."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Μικρότερη Διεύθυνση ΙΡ:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Μεγαλύτερη διεύθυνση ΙΡ:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Η περιοχή ΙΡ που δηλώσατε δεν είναι έγκυρη"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Η περιοχή ΙΡ που δηλώσατε δεν είναι έγκυρη"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "Η IP του εξυπηρετητή πρέπει να είναι εκτός της περιοχής διευθύνσεων"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -255,11 +265,31 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "την υπηρεσία DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "απενεργοποιημένο"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "ενεργοποιημένο"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τις υπηρεσίες DHCP στον διακομιστή σας."
 
@@ -267,20 +297,20 @@ msgstr "Ο οδηγός ρύθμισε με επιτυχία τις υπηρεσ
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Διακομιστής NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Διακομιστής NFS"
@@ -317,72 +347,73 @@ msgstr ""
 "σας. Αυτή η ρύθμιση θα παρέχει μια τοπική υπηρεσία DNS για τοπικά ονόματα "
 "υπολογιστών, ενώ οι μη τοπικές αιτήσεις θα προωθούνται σε εξωτερικό DNS."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Απέτρεψε τους υπολογιστές:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Υπολογισμένο Όνομα Τομέα"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Ρυθμίζεται ο Διακομιστής DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Εξωτερική πύλη"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -390,117 +421,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Αυτή δεν είναι έγκυρη διεύθυνση... επιλέξτε επόμενο για να συνεχίσετε"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Αυτή δεν είναι έγκυρη διεύθυνση... επιλέξτε επόμενο για να συνεχίσετε"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Αυτή δεν είναι έγκυρη διεύθυνση... επιλέξτε επόμενο για να συνεχίσετε"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Σφάλμα Οδηγού."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Οδηγός DNS (ρύθμιση)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Υπολογισμένο Όνομα Τομέα"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Διεύθυνση IP διακομιστή:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Όνομα Διακομιστή:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Ο οδηγός πρόσθεσε με επιτυχία τον πελάτη."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Ο οδηγός πρόσθεσε με επιτυχία τον πελάτη."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τις υπηρεσίες DNS του διακομιστή σας."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Ρυθμίζεται ο Διακομιστής DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Ρυθμίζεται ο Διακομιστής DNS"
@@ -598,31 +629,25 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "Οδηγός FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Οδηγός Ρυθμίσεων Διακομιστή FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει στη ρύθμιση του Διακομιστή FTP στο δίκτυο "
 "σας. "
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Μην τσεκάρετε κανένα κουτί αν δεν θέλετε να ενεργοποιήσετε τον διακομιστή "
-"FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Διακομιστής FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Επιλέξτε το είδος της υπηρεσίας FTP που θέλετε να ενεργοποιήσετε:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -630,76 +655,76 @@ msgstr ""
 "Ο διακομιστής σας μπορεί να λειτουργεί ως Διακομιστής FTP για το εσωτερικό "
 "σας δίκτυο (intranet) και ως διακομιστής FTP για το διαδίκτυο."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Ενεργοποίηση του διακομιστή FTP για το Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Ενεργοποίηση του Διακομιστή FTP για το Διαδίκτυο"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Επέτρεψε τους υπολογιστές:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Προειδοποίηση\\nΕίστε σε dhcp, ο διακομιστής μπορεί να μη λειτουργήσει με "
-"τις ρυθμίσεις σας."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Συγγνώμη, πρέπει να είστε root για να το κάνετε αυτό..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Ρυθμίζεται ο διακομιστής FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -708,7 +733,7 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "τον Διακομιστή FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -717,35 +742,35 @@ msgstr ""
 "Για να γίνουν δεκτές αυτές οι τιμές, και να ρυθμιστεί ο διακομιστής, κάντε "
 "κλικ στο Επόμενο ή επιλέξτε Πίσω για να τις διορθώσετε."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "απενεργοποιημένο"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "ενεργοποιημένο"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Διακομιστής Intranet FTP:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Διακομιστής FTP διαδικτύου:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον Διακομιστή Διαδικτύου/Intranet FTP"
 
@@ -793,7 +818,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1080,7 +1105,7 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "την υπηρεσία Ειδήσεων Διαδικτύου:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1363,34 +1388,49 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP Πελάτη:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Οδηγός Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Όνομα Διακομιστή Αλληλογραφίας:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Όνομα Διακομιστή Αλληλογραφίας:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Οδηγός Ρυθμίσεων Αλληλογραφίας Διαδικτύου"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Αυτός ο οδηγός μπορεί να σας βοηθήσει στη ρύθμιση των υπηρεσιών "
 "Αλληλογραφίας Διαδικτύου για το δίκτυό σας."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Διεύθυνση Εξερχόμενης Αλληλογραφίας"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 "Θα πρέπει να επιλεγεί σε σχέση με την διεύθυνση εισερχόμενης αλληλογραφίας"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1398,20 +1438,28 @@ msgstr ""
 "Μπορείτε να επιλέξετε τη διεύθυνση θα εμφανίζεται στα πεδία \"Από:\" και "
 "\"Απάντηση σε\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Υπολογισμένο Όνομα Τομέα"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Προειδοποίηση:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Εισάγατε κενή διεύθυνση για την πύλη αλληλογραφίας."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1420,15 +1468,21 @@ msgstr ""
 "μηνύματα εκτός του τοπικού σας δικτύου. Πατήστε επόμενο για συνέχεια ή άκυρο "
 "για να εισάγετε μια τιμή."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Πύλη Αλληλογραφίας Διαδικτύου"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1438,7 +1492,7 @@ msgstr ""
 "domaintype\" π.χ. αν ο παροχέας σας είναι ο \"provider.com\", τότε ο "
 "διακομιστής αλληλογραφίας διαδικτύου είναι συνήθως  \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1446,29 +1500,29 @@ msgstr ""
 "Ο διακομιστή σας θα στέλνει την εξερχόμενη αλληλογραφία μέσω μιας πύλης, που "
 "θα αναλαμβάνει την τελική παράδοση"
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Όνομα Διακομιστή Αλληλογραφίας:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Ρυθμίζεται η Αλληλογραφία Διαδικτύου"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1476,31 +1530,36 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "την υπηρεσία Αλληλογραφία Διαδικτύου"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Μορφή της Διεύθυνσης"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Ο οδηγός ρύθμισε με επιτυχία την υπηρεσία Αλληλογραφίας Διαδικτύου για τον "
 "διακομιστή σας."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Ρυθμίζεται ο διακομιστής FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Εξυπηρετητής Εκτυπώσεων:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Ρυθμίζεται ο διακομιστής FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - επιτρέπεται η πρόσβαση μόνο σε αυτόν τον εξυπηρετητή"
@@ -1685,7 +1744,8 @@ msgid "Access Control:"
 msgstr "Έλεγχος Πρόσβασης:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον εξυπηρετητή proxy."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1703,12 +1763,6 @@ msgstr "Οδηγός Squid"
 msgid "PXE Wizard"
 msgstr "Οδηγός FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2455,6 +2509,19 @@ msgstr "Κατάλογος Χρήστη:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή Ιστού Διαδικτύου/Intranet"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Μην τσεκάρετε κανένα κουτί αν δεν θέλετε να ενεργοποιήσετε τον διακομιστή "
+#~ "FTP."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Προειδοποίηση\\nΕίστε σε dhcp, ο διακομιστής μπορεί να μη λειτουργήσει με "
+#~ "τις ρυθμίσεις σας."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/eo.po b/po/eo.po
index bbee2a6c..f0103dd2 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-08-09 15:18+0000\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigurad-sorĉilo"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,9 +30,9 @@ msgstr "Konfigurad-sorĉilo"
 msgid "Warning."
 msgstr "Averto"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "Sorĉil-eraro."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -86,15 +86,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Tiu ĉi sorĉilo helpos vin aldoni novan klienton en via loka DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "KIienta identigo:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +112,30 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nomo de la maŝino:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP-numero de la maŝino:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Averto"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Averto\\n Vi estas en dhcp, la servilo eble ne laboras kun via konfiguraĵo."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -181,7 +182,7 @@ msgstr "Klienta IP:"
 msgid "The wizard successfully added the client."
 msgstr "La sorĉilo sukcese aldonis la klienton."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP-sorĉilo"
 
@@ -197,52 +198,61 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Tiu ĉi sorĉilo helpos vin konfiguri la DHCP-servojn de via servilo."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Intervalo de adresoj uzataj de dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Elektu la intervalon de adresoj asignitaj al la laborstacioj de la DHCP-"
 "servo; se vi ne havas specialajn bezonojn, vi povas sekure akcepti la "
 "proponitajn valorojn."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Plej malalta IP-adreso:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Plej alta IP-adreso:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "La difinita IP-intervalo ne estas ĝusta"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "La difinita IP-intervalo ne estas en la adres-intervalo de la servila reto"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "La IP de la servilo devas ne esti en intervalo"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurante la DHCP-servilon"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -250,11 +260,31 @@ msgstr ""
 "La sorĉilo koletis la sekvajn parametrojn necesajn por konfiguri vian DHCP-"
 "servon:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "elŝaltita"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "enŝaltita"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "La sorĉilo sukcese konfiguris la DHCP-servojn de via servilo."
 
@@ -262,20 +292,20 @@ msgstr "La sorĉilo sukcese konfiguris la DHCP-servojn de via servilo."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS-servilo"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS-servilo"
@@ -312,72 +342,73 @@ msgstr ""
 "konfigurado provizos lokan DNS-servon por lokaj komputilnomoj, kun nelokaj "
 "demandoj plusendataj al ekstera DNS."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Rifuzu gastigantojn:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Komputita domajno-nomo"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurante la DNS-servilon"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Ekstera kluzo"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -385,117 +416,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, 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:172
+#: ../dns_wizard/Bind.pm:171
 #, 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:177
+#: ../dns_wizard/Bind.pm:176
 #, 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Sorĉil-eraro."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS-sorĉilo (konfigurado)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Komputita domajno-nomo"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP-adreso de la servilo:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Servil-nomo:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "La sorĉilo sukcese aldonis la klienton."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "La sorĉilo sukcese aldonis la klienton."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurante la DNS-servilon"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurante la DNS-servilon"
@@ -593,27 +624,23 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP-sorĉilo"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Sorĉilo por konfigurado de FTP-servilo"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Tiu ĉi sorĉilo helpos vin konfiguri la FTP-servilon por via reto."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Kontrolu nenian keston se vi ne volas aktivigi vian FTP-servilon."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP-servilo"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Elektu la specon de FTP-servo kiun vi deziras aktvigi:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -621,75 +648,76 @@ msgstr ""
 "Via servilo povas konduti kiel FTP-servilo al via interna reto (intrareto) "
 "kaj kiel FTP-servilo por la interreto."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Enŝaltu la FTP-servilon por la intrareto"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Enŝaltu la FTP-servilon por la interreto"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Permesu gastigantojn:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Averto\\n Vi estas en dhcp, la servilo eble ne laboras kun via konfiguraĵo."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Bedaŭrinde, vi devas esti root por tion fari..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Mi konfiguras la FTP-servilon"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -698,7 +726,7 @@ msgstr ""
 "La sorĉilo kolektis la sekvajn parametrojn bezonatajn por konfiguri vian FTP-"
 "servilon"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -707,35 +735,35 @@ msgstr ""
 "Por akcepti tiujn valorojn kaj konfiguri vian servilon, alklaku la Daŭrigu-"
 "butonon aŭ uzu la Reen-butonon por korekti ilin."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "elŝaltita"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "enŝaltita"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intrareta FTP-servilo:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Interreta FTP-servilo:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "La sorĉilo sukcese konfiguris vian intraretan/interretan FTP-servilon"
 
@@ -783,7 +811,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1070,7 +1098,7 @@ msgstr ""
 "La sorĉilo kolektis sekvajn parametrojn bezonatajn por konfiguri vian "
 "interretan novaĵ-servon:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1349,32 +1377,47 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Klienta IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postmet-sorĉilo"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Nomo de poŝt-servilo:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Nomo de poŝt-servilo:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Sorĉilo por konfiguri la interretan poŝton"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Tiu ĉi sorĉilo helpos vin konfiguri la interretajn poŝt-servojn por via reto."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Elira poŝtadreso"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Tio ĉi estu elektita kune kun la adreso kiun vi uzas por enira poŝto."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1382,20 +1425,28 @@ msgstr ""
 "Vi povas elekti la specon de adreso kiun eliranta poŝto montras en la kampo "
 "\"From:\" and \"Reply-to\" (\"De:\" kaj \"Respondo-al\")."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Komputita domajno-nomo"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Averto:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Vi enmetis malplenan adreson por la poŝt-kluzo."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1403,15 +1454,21 @@ msgstr ""
 "Via elekto akcepteblas, sed tio ne permesos vin sendi poŝtaĵon eksteren de "
 "via loka reto. Premo sekvan por daŭrigi, aŭ reen por enigi valoron."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskado ne bonas!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Interreta poŝt-kluzo"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1421,7 +1478,7 @@ msgstr ""
 "\"; ekz-e, se via provizanto estas \"provider.com\", la interreta poŝt-"
 "servilo estas kutime \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1429,29 +1486,29 @@ msgstr ""
 "Via servilo sendos la eliraĵojn tra poŝta kluzo, tio zorgos pri la fina "
 "liverado."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nomo de poŝt-servilo:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Mi konfiguras la interretan poŝton"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1459,30 +1516,35 @@ msgstr ""
 "La sorĉilo kolektis jenajn parametrojn bezonatajn por konfiguri vian "
 "interretan poŝt-servon:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Formo de la adreso"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "La sorĉilo sukcese konfiguris vian interretan poŝtservon de via servilo."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Mi konfiguras la FTP-servilon"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Presil-servilo:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Mi konfiguras la FTP-servilon"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Aliro de Localhost restriktita al nur tiu ĉi servilo"
@@ -1662,7 +1724,8 @@ msgid "Access Control:"
 msgstr "Alirkontrolo:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "La sorĉilo sukcese konfiguris vian prokur-servilon."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1680,12 +1743,6 @@ msgstr "Squid-sorĉilo"
 msgid "PXE Wizard"
 msgstr "FTP-sorĉilo"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2413,6 +2470,17 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "La sorĉilo sukcese konfiguris vian intraretan/interretan Teksaĵ-servilon"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Kontrolu nenian keston se vi ne volas aktivigi vian FTP-servilon."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Averto\\n Vi estas en dhcp, la servilo eble ne laboras kun via "
+#~ "konfiguraĵo."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/es.po b/po/es.po
index a223b9bc..b0468af4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-28 15:11-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Asistente de configuraci�n"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -26,9 +26,9 @@ msgstr "Asistente de configuraci�n"
 msgid "Warning."
 msgstr "Advertencia."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -36,12 +36,12 @@ msgid "Error."
 msgstr "Error."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -66,7 +66,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Presione Siguiente para comenzar, o Cancelar para salir de este asistente."
+msgstr ""
+"Presione Siguiente para comenzar, o Cancelar para salir de este asistente."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid ""
@@ -80,23 +81,23 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Este asistente lo ayudar� a a�adir un cliente nuevo en su DNS local."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identificaci�n del cliente:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr ""
-"Note que la direcci�n IP y el nombre del cliente dados deber�an ser �nicos en "
-"la red."
+"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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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, "
@@ -106,26 +107,28 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nombre de la m�quina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "Direcci�n IP de la m�quina:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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."
+msgstr ""
+"Est� usando dhcp, puede que el servidor no funcione con su configuraci�n."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -171,7 +174,7 @@ msgstr "IP del cliente:"
 msgid "The wizard successfully added the client."
 msgstr "El asistente a�adi� exitosamente al cliente."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Asistente de DHCP"
 
@@ -185,51 +188,62 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:52
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Este asistente lo ayudar� a configurar los servicios DHCP de su servidor."
+msgstr ""
+"Este asistente lo ayudar� a configurar los servicios DHCP de su servidor."
+
+#: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Rango de direcciones utilizados por dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Seleccione el rango de direcciones que el servicio DHCP asigna a las "
 "estaciones de trabajo; a menos que tenga necesidades especiales, puede "
 "aceptar con seguridad los valores propuestos."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Direcci�n IP m�s baja:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Direcci�n IP m�s alta:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+#, fuzzy
+msgid "Enable PXE:"
+msgstr "Activado"
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Interfaz en la cual debe escuchar el servidor dhcp"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "El rango de IP especificado no es correcto."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "El rango de IP especificado no est� en el rango de IP del servidor."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "La IP del servidor no debe estar en el rango."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Configurando el servidor de DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -237,11 +251,31 @@ msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su servicio DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "deshabilitado"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "habilitado"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interfaz:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "El asistente configur� exitosamente los servicios DHCP de su servidor."
 
@@ -249,7 +283,7 @@ msgstr "El asistente configur� exitosamente los servicios DHCP de su servidor."
 msgid "You need to readjust your hostname."
 msgstr "Debe volver a ajustar su nombre de host."
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
@@ -259,12 +293,12 @@ msgstr ""
 "nombre de dominio correcto, distinto a 'localdomain' o vac�o. Lance "
 "drakconnect para ajustarlo."
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "Servidor DNS maestro"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "Servidor DNS esclavo"
 
@@ -298,27 +332,28 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "Qu� desea hacer:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 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:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "Quitar un host en una configuraci�n dns existente."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "Quitar host:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "N�mbre de computadora:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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 "
@@ -328,11 +363,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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr "Direcci�n IP para el servidor DNS maestro:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -340,89 +375,97 @@ 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr "IP de su reenviador"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
 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."
+"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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "DNS externo:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr "A�adir dominio de b�squeda"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
-"Se a�ade autom�ticamente el nombre de dominio de este servidor, y no necesita "
-"a�adirlo aqu�."
+"Se a�ade autom�ticamente el nombre de dominio de este servidor, y no "
+"necesita a�adirlo aqu�."
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 ""
-"Lista de b�squeda para b�squeda de nombres de host. La lista de b�squeda por lo "
-"general se determina a partir del nombre de dominio; predeterminadamente 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'"
+"Lista de b�squeda para b�squeda de nombres de host. La lista de b�squeda por "
+"lo general se determina a partir del nombre de dominio; predeterminadamente "
+"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:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr "Nombre de dominio predet. a buscar:"
 
-#: ../dns_wizard/Bind.pm:167
-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:166
+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:172
+#: ../dns_wizard/Bind.pm:171
 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"
+msgstr ""
+"Esta no es una direcci�n IP v�lida para el DNS Maestro... presione siguiente "
+"para continuar"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 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"
+msgstr ""
+"Esta no es una IP direcci�n v�lida... presione siguiente para continuar"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
-msgstr "Parece que ese host ya est� en su configuraci�n DNS... persione siguiente para continuar"
+msgstr ""
+"Parece que ese host ya est� en su configuraci�n DNS... persione siguiente "
+"para continuar"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "Error:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
-"Parece que este no est� presente en su configuraci�n DNS... presione siguiente "
-"para continuar"
+"Parece que este no est� presente en su configuraci�n DNS... presione "
+"siguiente para continuar"
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
-"Parece que no se configur� servidor DNS con el asistente. Por favor ejecute el "
-"asistente DNS: Servidor DNS maestro."
+"Parece que no se configur� servidor DNS con el asistente. Por favor ejecute "
+"el asistente DNS: Servidor DNS maestro."
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
@@ -430,59 +473,60 @@ 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:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr "Bien. Generando ahora la configuraci�n de su DNS esclavo"
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "con esta configuraci�n:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 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:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "Nombre de computadora:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "Direcci�n IP de computadora:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr "El cliente con esta identificaci�n se quitar� de su DNS"
 
-#: ../dns_wizard/Bind.pm:232
-msgid "The DNS server is about to be configured with the following configuration"
+#: ../dns_wizard/Bind.pm:231
+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:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "Nombre de host del servidor:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr "Nombre de dominio:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr "El asistente a�adi� exitosamente al host en su DNS."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr "El asistente quit� exitosamente al host de su DNS."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 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:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurando su sistema como un servidor DNS maestro ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurando su sistema como un servidor DNS esclavo ..."
 
@@ -567,27 +611,23 @@ msgstr "Fall� la instalaci�n"
 msgid "FTP wizard"
 msgstr "Asistente de FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Asistente de configuraci�n del servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Este asistente lo ayudar� a configurar el servidor FTP para su red."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "No marque ninguna casilla si no desea activar su servidor FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Seleccione que clase de servicio FTP quiere activar:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -595,75 +635,88 @@ msgstr ""
 "Su servidor puede actuar como servidor FTP hacia su red interna (Intranet) y "
 "como un servidor FTP para la Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Activar el servidor FTP para la Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Activar el servidor FTP para la Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Admin Email: email address of FTP administrator."
 msgstr "Correo-e admin: direcci�n de correo-e del administrador FTP."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
+msgstr ""
+"Permitir resumen de FTP: permitir resumir la (des)carga sobre el servidor "
+"FTP."
+
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr "Permitir FXP: permitir transferencia de archivos por FTP."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr "Chroot home usuario: Bloquear al usuario en su directorio personal."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "FTP Proftpd server options"
 msgstr "Opciones del servidor FTP ProFTPd"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Permit root login: allow root to log on FTP server."
 msgstr "Permitir acceso de root: permitir que root se conecte al servidor FTP."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
-msgstr "Permitir resumen de FTP: permitir resumir la (des)carga sobre el servidor FTP."
-
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+#, fuzzy
+msgid "Admin email:"
 msgstr "Correo-e del admin"
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+#, fuzzy
+msgid "Permit root Login:"
 msgstr "Permitir conexi�n de root"
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+#, fuzzy
+msgid "Chroot Home user:"
 msgstr "Chroot home usuario"
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+#, fuzzy
+msgid "Allow FTP resume:"
 msgstr "Permitir resumir FTP"
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
 msgstr "Permitir FXP"
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Advertencia\n"
-"Est� usando dhcp, puede que el servidor no funcione con su configuraci�n."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Lo siento, debe ser el superusuario (root) para hacer esto..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Configurando el servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -671,7 +724,7 @@ msgstr ""
 "El asistente recolect� los par�metros siguientes\n"
 "necesarios para configurar su servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -679,35 +732,35 @@ msgstr ""
 "Para aceptar estos valores, y configurar su servidor, haga clic sobre el "
 "bot�n Siguiente o utilice el bot�n Anterior para corregirlos"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "deshabilitado"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "habilitado"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Servidor FTP Intranet:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Servidor de FTP Internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr "Correo-e del admin"
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr "Permitir conexi�n de root"
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr "Chroot home usuario"
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr "Permitir resumir FTP"
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr "Permitir FXP"
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "El asistente configur� exitosamente su servidor FTP Intranet/Internet"
 
@@ -736,8 +789,8 @@ msgid ""
 "Path to data: specify your source directory, should be base of an Mandrake "
 "installation."
 msgstr ""
-"Ruta a los datos: especifique su directorio fuente, deber�a ser la base de una "
-"instalaci�n Mandrake."
+"Ruta a los datos: especifique su directorio fuente, deber�a ser la base de "
+"una instalaci�n Mandrake."
 
 #: ../installsrv_wizard/Installsrv.pm:71
 msgid "Destination directory could not be '/var/install/'"
@@ -752,15 +805,15 @@ msgid ""
 "Error, source directory must be a directory with full Mandrake installation "
 "directory."
 msgstr ""
-"Error, el directorio fuente debe ser un directorio con un directorio de instalaci�n "
-"de Mandrake completo."
+"Error, el directorio fuente debe ser un directorio con un directorio de "
+"instalaci�n de Mandrake completo."
 
 #: ../installsrv_wizard/Installsrv.pm:79
 msgid "Destination directory already in use, please choose another one."
 msgstr "El directorio de destino ya est� en uso, por favor, seleccione otro."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr "Configurar� su servidor de instalaci�n con dichos par�metros"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1034,7 +1087,7 @@ msgstr ""
 "El asistente recolect� los par�metros siguientes\n"
 "necesarios para configurar su servicio de Noticias de Internet:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1053,7 +1106,8 @@ msgid "Polling Interval:"
 msgstr "Intervalo de consulta:"
 
 #: ../news_wizard/Inn.pm:96
-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 ""
 "El asistente configur� exitosamente el servicio de noticias de Internet de "
 "su servidor."
@@ -1154,8 +1208,8 @@ msgid ""
 "NISDOMAIN=your_nis_domain in /etc/sysconfig/network file, and do a: "
 "nisdomainname your_nis_domain."
 msgstr ""
-"Deber�a reajustar su nombre de dominio NIS. Para un servidor NIS necesita "
-"un nombre de dominio NIS correcto, distinto a 'localdomain' o vac�o. A�ada "
+"Deber�a reajustar su nombre de dominio NIS. Para un servidor NIS necesita un "
+"nombre de dominio NIS correcto, distinto a 'localdomain' o vac�o. A�ada "
 "NISDOMAIN=su_dominio_nis en el archivo /etc/sysconfig/network, y ejecute "
 "nisdomainname su_dominio_nis."
 
@@ -1172,8 +1226,8 @@ msgid ""
 "Client can automatically mount their home directory when they log on a NIS "
 "client computer network."
 msgstr ""
-"Los clientes pueden montar autom�ticamente sus directorios personales cuando se "
-"conectan en una red de computadoras NIS."
+"Los clientes pueden montar autom�ticamente sus directorios personales cuando "
+"se conectan en una red de computadoras NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:76 ../nisautofs_wizard/Nisautofs.pm:97
 msgid "NIS server with autofs map"
@@ -1181,7 +1235,8 @@ msgstr "Servidor NIS + Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:76
 msgid "Setup a Nis server with autofs map, auto.home and auto.master files."
-msgstr "Configurar un servidor NIS con autofs, y archivos auto.home y auto.master."
+msgstr ""
+"Configurar un servidor NIS con autofs, y archivos auto.home y auto.master."
 
 #: ../nisautofs_wizard/Nisautofs.pm:84
 msgid "What do you want to do ?"
@@ -1208,8 +1263,8 @@ msgid ""
 "Home NIS: home directory for users on NIS server. This directory will be "
 "export through NFS server."
 msgstr ""
-"Home NIS: directorio personal para los usuarios en el servidor NIS. Este directorio "
-"ser� exportado a trav�s de un servidor NFS."
+"Home NIS: directorio personal para los usuarios en el servidor NIS. Este "
+"directorio ser� exportado a trav�s de un servidor NFS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:97
 msgid "NIS domain: NIS domain for your NIS server."
@@ -1275,22 +1330,25 @@ msgstr "Error, deber�a ser un directorio"
 
 #: ../nisautofs_wizard/Nisautofs.pm:135
 msgid "Error nisdomainame should be correct (not none or localdomain)"
-msgstr "Error, nombre de dominio NIs deber�a ser correcto (no 'localdomain' o vac�o)"
+msgstr ""
+"Error, nombre de dominio NIs deber�a ser correcto (no 'localdomain' o vac�o)"
 
 #: ../nisautofs_wizard/Nisautofs.pm:135
 msgid ""
 "Please adjust with domainname command or in /etc/sysconfig/network file "
 "(NISDOMAIN=yournisdomain)"
 msgstr ""
-"Por favor, ajuste con el comando domainname o en el archivo "
-"/etc/sysconfig/network (NISDOMAIN=su_dominio_nis)"
+"Por favor, ajuste con el comando domainname o en el archivo /etc/sysconfig/"
+"network (NISDOMAIN=su_dominio_nis)"
 
 #: ../nisautofs_wizard/Nisautofs.pm:141
 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."
+msgstr ""
+"El asistente configur� exitosamente su m�quina para ser un cliente NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:148
-msgid "The wizard successfully configured your machine to be a NIS with autofs map."
+msgid ""
+"The wizard successfully configured your machine to be a NIS with autofs map."
 msgstr "El asistente configur� exitosamente su m�quina para NIS con autofs."
 
 #: ../nisautofs_wizard/Nisautofs.pm:302
@@ -1309,27 +1367,42 @@ msgstr "Configurando su sistema como cliente NIS..."
 msgid "Nis Client"
 msgstr "Cliente NIS"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Asistente Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Servidor de correo"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Servidor de correo"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Asistente de configuraci�n del correo de Internet"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Este asistente lo ayudar� a configurar los servicios de Correo de Internet "
 "para su red."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Direcci�n de correo saliente"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1337,7 +1410,7 @@ msgstr ""
 "Esta deber�a elegirse consistentemente con la direcci�n que utiliza para el "
 "correo entrante."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1345,19 +1418,27 @@ msgstr ""
 "Puede seleccionar el tipo de direcci�n que mostar� el correo saliente en los "
 "campos \"De:\" y \"Responder-a\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Nombre de dominio enmascarado:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Advertencia:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Ha ingresado una direcci�n vacia para la pasarela de correo."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1366,15 +1447,21 @@ msgstr ""
 "de su red local. Presione Siguiente para continuar, o Anterior para ingresar "
 "un valor."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "�El enmascarado no es bueno!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Pasarela de Correo de Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1384,7 +1471,7 @@ msgstr ""
 "tipodedominio\"; por ejemplo, si su proveedor es \"proveedor.com\", el "
 "servidor de correo de Internet por lo general es \"smtp.proveedor.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1392,15 +1479,17 @@ msgstr ""
 "Su servidor enviar� el correo saliente a trav�s de una pasarela de correo, "
 "la cual tomar� la responsabilidad del envio final."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nombre del servidor de correo:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
-msgstr "Lo predeterminado es a�adir $myhostname, que est� bien para sitios peque�os."
+#: ../postfix_wizard/Postfix.pm:125
+#, fuzzy
+msgid "The default is to append myhostname which is fine for small sites."
+msgstr ""
+"Lo predeterminado es a�adir $myhostname, que est� bien para sitios peque�os."
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1408,15 +1497,15 @@ msgstr ""
 "El par�metro myorigin especifica el dominio del cual parece venir el correo "
 "enviado localmente"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Configurando el correo de Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1424,28 +1513,35 @@ msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su servicio de Correo de Internet:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Forma de la direcci�n"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:104
-msgid "The wizard successfully configured your Internet Mail service of your server."
+#: ../postfix_wizard/Postfix.pm:149
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "El asistente configur� exitosamente el servicio de Correo de Internet para "
 "su servidor."
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "Configurando su servidor Postfix."
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Servidor Postfix"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Configurando su servidor Postfix."
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - acceso restringido s�lo a este servidor"
@@ -1497,7 +1593,8 @@ msgid "Proxy port:"
 msgstr "Puerto del proxy:"
 
 #: ../proxy_wizard/Squid.pm:81
-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 ""
 "Presione Siguiente si desea mantener este valor, o Anterior para corregir su "
 "elecci�n."
@@ -1515,14 +1612,16 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Debe elegir un puerto mayor que 1024 y menor que 65535"
 
 #: ../proxy_wizard/Squid.pm:92
-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 ""
 "Cach� de disco es la cantidad de espacio en disco que se puede utilizar para "
 "almacenar el cach� en el disco."
 
 #: ../proxy_wizard/Squid.pm:92
 msgid "For your information, here is /var/spool/squid space on disk:"
-msgstr "Para su informaci�n, aqu� tiene el tama�o de /var/spool/squid en disco:"
+msgstr ""
+"Para su informaci�n, aqu� tiene el tama�o de /var/spool/squid en disco:"
 
 #: ../proxy_wizard/Squid.pm:92
 msgid ""
@@ -1610,7 +1709,8 @@ msgid "Configuring the Proxy"
 msgstr "Configurando el Proxy"
 
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
-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 ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su proxy:"
@@ -1624,7 +1724,8 @@ msgid "Access Control:"
 msgstr "Control de acceso:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "El asistente configur� exitosamente su servidor proxy."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1639,15 +1740,6 @@ msgstr "Proxy Squid"
 msgid "PXE Wizard"
 msgstr "Asistente PXE"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-"Necesita volver a ajustar su nombre de dominio. Para un servidor DNS, necesita "
-"un nombre de dominio correcto, distinto de 'localdomain' o vac�o. Lance "
-"drakconnect para ajustarlo."
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Configurar un servidor PXE"
@@ -1682,19 +1774,19 @@ msgid ""
 "an operating system loaded through the network."
 msgstr ""
 "Este asistente lo ayudar� a configurar el servidor PXE. PXE (Pre-boot "
-"Execution Environment) es un protocolo dise�ado por Intel que permite que las "
-"computadoras arranquen desde la red. PXE se almacena en la ROM de las "
+"Execution Environment) es un protocolo dise�ado por Intel que permite que "
+"las computadoras arranquen desde la red. PXE se almacena en la ROM de las "
 "tarjetas de red de nueva generaci�n. Cuando arranca la computadora, el BIOS "
-"carga la ROM PXE en memoria y la ejecuta. Se muestra un men� que permite "
-"que se arranque la computadora con un sistema operativo cargado desde la red."
+"carga la ROM PXE en memoria y la ejecuta. Se muestra un men� que permite que "
+"se arranque la computadora con un sistema operativo cargado desde la red."
 
 #: ../pxe_wizard/Pxe.pm:105
 msgid ""
 "This wizard will provide a pxe service, and ability to add/remove/modify "
 "boot images."
 msgstr ""
-"Este asistente proveer� servicios PXE, y la posibilidad de a�adir/quitar/modificar "
-"im�genes de arranque."
+"Este asistente proveer� servicios PXE, y la posibilidad de a�adir/quitar/"
+"modificar im�genes de arranque."
 
 #: ../pxe_wizard/Pxe.pm:127
 msgid "Add a boot image"
@@ -1706,7 +1798,9 @@ msgstr "Nombre PXE: Nombre en el men� PXE (una palabra/n�mero, sin espacios)"
 
 #: ../pxe_wizard/Pxe.pm:127
 msgid "Path to image: full path to image (need network boot image)"
-msgstr "Ruta a la imagen: ruta completa a la imagen (imagen de arranque de red necesaria)"
+msgstr ""
+"Ruta a la imagen: ruta completa a la imagen (imagen de arranque de red "
+"necesaria)"
 
 #: ../pxe_wizard/Pxe.pm:137
 msgid "Choose PXE boot image you want to remove from PXE server."
@@ -1734,11 +1828,14 @@ msgstr "Imagen de arranque a configurar:"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Install directory: full path to MDK install server directory"
-msgstr "Directorio de instalaci�n: ruta completa al directorio del servidor de instalaci�n Mandrake"
+msgstr ""
+"Directorio de instalaci�n: ruta completa al directorio del servidor de "
+"instalaci�n Mandrake"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Installation method: choose nfs/http to install via nfs/http."
-msgstr "M�todo de instalaci�n: elija nfs/http para instalar por medio de NFS/HTTP"
+msgstr ""
+"M�todo de instalaci�n: elija nfs/http para instalar por medio de NFS/HTTP"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Options to add to PXE boot disk"
@@ -1749,8 +1846,9 @@ msgid ""
 "Server IP: IP address of server which contain installation directory. You "
 "can create one with MDK install server wizard."
 msgstr ""
-"IP del servidor: direcci�n IP del servidor que contiene el directorio de instalaci�n. "
-"Puede crear uno con el asistente de servidor de instalaci�n Mandrake."
+"IP del servidor: direcci�n IP del servidor que contiene el directorio de "
+"instalaci�n. Puede crear uno con el asistente de servidor de instalaci�n "
+"Mandrake."
 
 #: ../pxe_wizard/Pxe.pm:155 ../pxe_wizard/Pxe.pm:211
 msgid "Boot image to modify:"
@@ -1773,8 +1871,11 @@ msgid "ACPI option: Advanced Configuration and Power Interface"
 msgstr "Opci�n ACPI: Interfaz avanzada de energ�a y configuraci�n"
 
 #: ../pxe_wizard/Pxe.pm:163
-msgid "Network client interface: through which interface client should be installed."
-msgstr "Interfaz de red cliente: a trav�s de qu� interfaz se deber�a instalar el cliente."
+msgid ""
+"Network client interface: through which interface client should be installed."
+msgstr ""
+"Interfaz de red cliente: a trav�s de qu� interfaz se deber�a instalar el "
+"cliente."
 
 #: ../pxe_wizard/Pxe.pm:163
 msgid "Ramsize: adjust ramsize on boot disk."
@@ -1809,8 +1910,8 @@ msgid ""
 "This will configure all needed default configurations files to set a PXE "
 "server."
 msgstr ""
-"Esto configurar� todos los archivos de configuraci�n predeterminados necesarios "
-"para un servidor PXE."
+"Esto configurar� todos los archivos de configuraci�n predeterminados "
+"necesarios para un servidor PXE."
 
 #: ../pxe_wizard/Pxe.pm:174
 msgid "We need to use a special dhcpd.conf with PXE parameter."
@@ -1827,10 +1928,12 @@ msgstr "Por favor, elija una imagen de un directorio distinto a %s."
 
 #: ../pxe_wizard/Pxe.pm:186
 msgid "Please provide a correct name in PXE entry (one word)."
-msgstr "Por favor, proporcione un nombre correcto en la entrada PXE (una palabra)"
+msgstr ""
+"Por favor, proporcione un nombre correcto en la entrada PXE (una palabra)"
 
 #: ../pxe_wizard/Pxe.pm:190
-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 a�adir/quitar/modificar la imagen de arranque PXE, antes debe ejecutar "
 "'Configurar servidor PXE'."
@@ -1927,8 +2030,10 @@ msgstr ""
 "impresoras para las estaciones de trabajo que no corren sistemas Linux."
 
 #: ../samba_wizard/Samba.pm:71
-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."
+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:76
 msgid "Samba needs to know the Windows Workgroup it will serve."
@@ -2012,7 +2117,8 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:119
 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."
+msgstr ""
+"Note que el acceso todav�a necesita contrase�as adecuadas a nivel de usuario."
 
 #: ../samba_wizard/Samba.pm:126
 msgid "Allow hosts:"
@@ -2094,7 +2200,8 @@ msgstr "lista de escritura:"
 
 #: ../samba_wizard/Samba.pm:182
 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"
+msgstr ""
+"Seleccione las impresoras de los usuarios conocidos a las que desea acceder"
 
 #: ../samba_wizard/Samba.pm:189
 msgid "Enable all printers"
@@ -2162,7 +2269,8 @@ msgstr "Entonces, su servidor ser� el servidor local de la hora para su red."
 
 #: ../time_wizard/Ntp.pm:82
 msgid "press next to begin, or cancel to leave this wizard"
-msgstr "presione Siguiente para comenzar, o Cancelar para salir de este asistente"
+msgstr ""
+"presione Siguiente para comenzar, o Cancelar para salir de este asistente"
 
 #: ../time_wizard/Ntp.pm:87
 msgid ""
@@ -2210,7 +2318,8 @@ msgstr ""
 
 #: ../time_wizard/Ntp.pm:124
 msgid "Press next to start the time servers test."
-msgstr "Presione Siguiente para comenzar con la prueba de servidores de la hora."
+msgstr ""
+"Presione Siguiente para comenzar con la prueba de servidores de la hora."
 
 #: ../time_wizard/Ntp.pm:124
 msgid "Testing the time servers availability"
@@ -2250,7 +2359,8 @@ msgstr "Configuraci�n del servidor de la hora guardada"
 
 #: ../time_wizard/Ntp.pm:165
 msgid "Your server can now act as a time server for your local network."
-msgstr "Ahora su servidor puede actuar como un servidor de la hora para su red local."
+msgstr ""
+"Ahora su servidor puede actuar como un servidor de la hora para su red local."
 
 #: ../web_wizard/Apache.pm:38
 msgid "Web wizard"
@@ -2331,7 +2441,8 @@ msgstr "subdirectorio http del usuario : ~/"
 
 #: ../web_wizard/Apache.pm:107
 msgid "Type the path of the directory you want being the document root."
-msgstr "Ingrese la ruta del directorio que desea que sea la ra�z de los documentos."
+msgstr ""
+"Ingrese la ruta del directorio que desea que sea la ra�z de los documentos."
 
 #: ../web_wizard/Apache.pm:110
 msgid "Document Root:"
@@ -2369,6 +2480,25 @@ msgstr "Directorio de usuario:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "El asistente configur� exitosamente su servidor web Intranet/Internet"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "No marque ninguna casilla si no desea activar su servidor FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Advertencia\n"
+#~ "Est� usando dhcp, puede que el servidor no funcione con su configuraci�n."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For a DNS server you need a correct "
+#~ "domainname, not egal to localdomain or none. Launch drakconnect to adjust "
+#~ "it."
+#~ msgstr ""
+#~ "Necesita volver a ajustar su nombre de dominio. Para un servidor DNS, "
+#~ "necesita un nombre de dominio correcto, distinto de 'localdomain' o "
+#~ "vac�o. Lance drakconnect para ajustarlo."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
@@ -3324,7 +3454,3 @@ msgstr "El asistente configur� exitosamente su servidor web Intranet/Internet"
 
 #~ msgid "with the Proxy configuration."
 #~ msgstr "con la configuraci�n del proxy."
-
-#~ msgid "Enable"
-#~ msgstr "Activado"
-
diff --git a/po/et.po b/po/et.po
index dd4920e9..aacf3437 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-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-30 02:00+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "seadistuste nõustaja"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -27,9 +27,9 @@ msgstr "seadistuste nõustaja"
 msgid "Warning."
 msgstr "Hoiatus."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -37,12 +37,12 @@ msgid "Error."
 msgstr "Viga."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -83,22 +83,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "See nõustaja aitab Teil lisada uue kliendi kohalikule DNS-ile."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Kliendi andmed:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,26 +108,27 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Arvuti nimi:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "Arvuti IP aadress:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -172,7 +173,7 @@ msgstr "Kliendi IP:"
 msgid "The wizard successfully added the client."
 msgstr "Nõustaja lisas edukalt kliendi."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP nõustaja"
 
@@ -187,60 +188,89 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "See nõustaja aitab seadistada Teie serveri DHCP teenused."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "DHCP kasutatav aadresside vahemik"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Valige aadresside vahemik, mida DHCP teenus eraldab tööjaamadele; kui Teil "
 "ei ole just erilisi vajadusi, võite rahumeeli nõustuda pakutavate "
 "väärtustega."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Väikseim IP aadress:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Suurim IP aadress:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Liides, mida DHCP server peab jälgima"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Määratud IP aadresside vahemik ei ole korrektne."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Määratud IP aadresside vahemik ei asu serveri võrguaadresside vahemikus."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "Serveri IP ei tohi olla vahemikus."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP serveri seadistamine"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja DHCP teenuse seadistamiseks:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "keelatud"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "lubatud"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Liides:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Nõustaja seadistas edukalt serveri DHCP teenused."
 
@@ -248,7 +278,7 @@ msgstr "Nõustaja seadistas edukalt serveri DHCP teenused."
 msgid "You need to readjust your hostname."
 msgstr "Teil tuleb täpsustada masinanime."
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
@@ -258,12 +288,12 @@ msgstr ""
 "domeeninimi, mitte localdomain või üldse puuduma. Käivitage täpsutamiseks "
 "Drakconnect."
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "Esmane nimeserver"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "Teisene nimeserver"
 
@@ -297,27 +327,28 @@ msgstr ""
 "tagatakse kohalikus võrgus aadresside korrektne lahendamine, suunates samas "
 "kõik muud nimepäringud väljaspool asuvale nimeserverile."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "Mida soovite ette võtta:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr "Valige nimekirjast masin, mida soovite eemaldada."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "Masina eemaldamine olemasolevast DNS seadistusest."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "Eemaldatav masin:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "Arvuti nimi:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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 "
@@ -326,11 +357,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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr "Esmase nimeserveri IP aadress:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -338,11 +369,11 @@ msgstr ""
 "Edastatakse ainult sellised päringud, mille suhtes server ei ole kompetentne "
 "ja millele puuduvad puhvris vastused."
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr "Teie edastusserveri IP"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
@@ -350,22 +381,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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "Väline DNS:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr "Otsingudomeeni lisamine"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -376,29 +407,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:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr "Vaikimisi otsitav domeeninimi:"
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 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:172
+#: ../dns_wizard/Bind.pm:171
 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:177
+#: ../dns_wizard/Bind.pm:176
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -406,11 +437,11 @@ msgstr ""
 "Paistab, et see masin on juba DNS seadistuses... vajutage jätkamiseks nupule "
 "'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "Viga:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -418,7 +449,7 @@ msgstr ""
 "Paistab, et seda masinat DNS seadistuses ei ole... vajutage jätkamiseks "
 "nupule 'Järgmine'"
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -426,7 +457,7 @@ msgstr ""
 "Paistab, et nõustaja abil ei ole seadistatud ühtki nimeserverit. Palun "
 "käivitage DNS nõustaja: esmane nimeserver."
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
@@ -434,60 +465,60 @@ msgstr ""
 "Paistab, et see ei ole esmane nimeserver, vaid teisene. Seepärast ei saa ka "
 "masinat lisada/eemaldada."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr "Olgu, nüüd tekitame Teie allutatud DNS seadistuse"
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "seadistusega:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr "Teie DNS-ile lisatakse selline klient"
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "Arvuti nimi:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "Arvuti IP aadress:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr "Teie DNS-ist eemaldatakse selline klient"
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "Nimeserver seadistatakse järgmise seadistusega"
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "Serveri nimi:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr "Domeeninimi:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr "Nõustaja lisas edukalt DNS-ile kliendi."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Nõustaja eemaldas edukalt DNS-ist kliendi."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Nõustaja seadistas edukalt Teie serveri DNS teenused."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Süsteemi seadistamine esmaseks nimeserveriks..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Süsteemi seadistamine teiseseks nimeserveriks..."
 
@@ -573,107 +604,112 @@ msgstr "Paigaldamine ebaõnnestus"
 msgid "FTP wizard"
 msgstr "FTP nõustaja"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP serveri seadistamise nõustaja"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "See nõustaja aitab seadistada Teie võrgu FTP serveri."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Ärge märkige ühtegi kastikest, kui Te ei soovi oma FTP serverit aktiveerida."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Valige FTP teenus, mida soovite aktiveerida:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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 "Server toimib FTP serverina nii kohtvõrgus (intranet) kui Internetis."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "FTP serveri lubamine intraneti jaoks"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "FTP serveri lubamine Interneti jaoks"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Admin Email: email address of FTP administrator."
 msgstr "Administraatori e-posti aadress: FTP haldaja e-posti aadress."
 
-#: ../ftp_wizard/Proftpd.pm:90
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
+msgstr ""
+"FTP taastamise lubamine: üles- või allalaadimise taastamise lubamine FTP "
+"serveril."
+
+#: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Allow FXP: allow file transfer via other ftp."
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr "FXP lubamine: failiedastuse lubamine muu FTP vahendusel."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr "Chroot Home kasutaja: kasutaja piiratakse enda kodukataloogiga."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "FTP Proftpd server options"
 msgstr "FTP Proftpd serveri valikud"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 "Administraatori sisselogimise lubamine: administraatoril on lubatud FTP "
 "serverile sisse logida."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
-msgstr ""
-"FTP taastamise lubamine: üles- või allalaadimise taastamise lubamine FTP "
-"serveril."
-
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+#, fuzzy
+msgid "Admin email:"
 msgstr "Administraatori e-posti aadress"
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+#, fuzzy
+msgid "Permit root Login:"
 msgstr "Administraatori sisselogimise lubamine"
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+#, fuzzy
+msgid "Chroot Home user:"
 msgstr "Chroot Home kasutaja"
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+#, fuzzy
+msgid "Allow FTP resume:"
 msgstr "FTP taastamise lubamine"
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
 msgstr "FXP lubamine"
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
-"Hoiatus\n"
-"Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Vabandust, selleks peab olema administraator..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP serveri seadistamine"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -681,7 +717,7 @@ msgstr ""
 "Nõustaja kogus järgmised andmed,\n"
 " mida on vaja FTP serveri seadistamiseks"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -689,35 +725,35 @@ msgstr ""
 "Nende väärtustega nõustumiseks ja serveri seadistamiseks vajutage nupule "
 "'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "keelatud"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "lubatud"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intraneti FTP server:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Interneti FTP server:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr "Administraatori e-posti aadress"
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr "Administraatori sisselogimise lubamine"
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr "Chroot Home kasutaja"
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr "FTP taastamise lubamine"
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr "FXP lubamine"
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Nõustaja seadistas edukalt intraneti/Interneti FTP serveri"
 
@@ -766,7 +802,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr "Sihtkataloog on juba kasutusel, palun valige mõni muu."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr "Teie paigaldusserver seadistatakse järgmiste parameetritega"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1037,7 +1073,7 @@ msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja\n"
 " uudistegruppide teenuse seadistamiseks:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1313,25 +1349,40 @@ msgstr "Süsteemi seadistamine NIS kliendiks..."
 msgid "Nis Client"
 msgstr "NIS klient"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfixi nõustaja"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Meiliserver"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Meiliserver"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "E-posti teenuse seadistamise nõustaja"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "See nõustaja aitab seadistada Teie võrgu e-posti teenused."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Väljuvate kirjade aadress"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1339,7 +1390,7 @@ msgstr ""
 "See peaks olema kooskõlas aadressiga, mida Te kasutate sisenevate kirjade "
 "jaoks."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1347,19 +1398,27 @@ msgstr ""
 "Võite valida aadressi, mida väljuv kiri näitab väljadel \"Kellelt:\" ja "
 "\"Vastus:\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maskeraadi domeeni nimi"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Hoiatus:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Meililüüsi aadress on tühi."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1368,15 +1427,21 @@ msgstr ""
 "oma kohtvõrku. Jätkamiseks vajutage nupule 'Järgmine' või nupule 'Tagasi', "
 "kui soovite midagi muuta."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Selline ei ole hea maskeraad!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Meililüüs"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1386,7 +1451,7 @@ msgstr ""
 "näiteks teenusepakkuja on \"pakkuja.ee\", siis on meiliserver tavaliselt "
 "\"smtp.pakkuja.ee\" või \"mail.pakkuja.ee\""
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1394,16 +1459,17 @@ msgstr ""
 "Server saadab väljuvad kirjad läbi meililüüsi, mis hoolitseb nende "
 "päralejõudmise eest."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Meiliserveri nimi:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+#, fuzzy
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 "Vaikimisi lisatakse $myhostname, mis kõlbab hästi väikestele kohtadele."
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1411,42 +1477,48 @@ msgstr ""
 "Parameeter myorigin määrab domeeni, kust kohalikult postitatud meil näitab "
 "end tulevat"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "E-posti serveri seadistamine"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja e-posti teenuse seadistamiseks:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Aadressi vorm"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Nõustaja seadistas edukalt Teie e-posti teenuse."
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "Postfix serveri seadistamine"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Postfix server"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Postfix serveri seadistamine"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - ligipääs on lubatud ainult käesolevale serverile"
@@ -1624,7 +1696,8 @@ msgid "Access Control:"
 msgstr "Ligipääsu kontroll:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Nõustaja seadistas edukalt Teie vahendaja serveri."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1639,15 +1712,6 @@ msgstr "Squid vahendaja"
 msgid "PXE Wizard"
 msgstr "PXE nõustaja"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-"Teil tuleb täpsustada domeeninime. Nimeserveril peab olema korrektne "
-"domeeninimi, mitte localdomain või üldse puuduma. Käivitage täpsutamiseks "
-"Drakconnect."
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "PXE serveri seadistamine"
@@ -2367,3 +2431,24 @@ msgstr "Kasutaja kataloog:"
 #: ../web_wizard/Apache.pm:146
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Nõustaja seadistas edukalt intraneti/Interneti veebiserveri"
+
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Ärge märkige ühtegi kastikest, kui Te ei soovi oma FTP serverit "
+#~ "aktiveerida."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Hoiatus\n"
+#~ "Te kasutate DHCP-d, server ei pruugi Teie seadistusega töötada."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For a DNS server you need a correct "
+#~ "domainname, not egal to localdomain or none. Launch drakconnect to adjust "
+#~ "it."
+#~ msgstr ""
+#~ "Teil tuleb täpsustada domeeninime. Nimeserveril peab olema korrektne "
+#~ "domeeninimi, mitte localdomain või üldse puuduma. Käivitage täpsutamiseks "
+#~ "Drakconnect."
diff --git a/po/eu.po b/po/eu.po
index d9d0c11a..226d1c1d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-01 18:21+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "ezarpen morroia"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -28,9 +28,9 @@ msgstr "ezarpen morroia"
 msgid "Warning."
 msgstr "Oharra."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -38,12 +38,12 @@ msgid "Error."
 msgstr "Okerra."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -84,15 +84,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Morroi honek zure bertoko DNSn bezero berri bat gehitzen lagunduko dizu."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(ez daukazu izenaren ondoren domeinua jarri beharrik)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Bezero identifikazioa:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -101,7 +101,7 @@ msgstr ""
 "Ohartu emaniko IP zenbakia eta bezero izena sarean daudenen desberdina izan "
 "behar dela."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +111,30 @@ msgstr ""
 "kompainia.net adibidean bezala. Sareko makina orok izan behar du IP helbidea "
 "(desberdina), ohiko puntudun eran."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Makinaren izena:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Makinaren IP zenbakia:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Adi"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "dhcp moduan zaude, baliteke zure konfigurazioarekin zerbitzariak lan ez "
 "egitea."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -179,7 +180,7 @@ msgstr "Bezeroaren IP:"
 msgid "The wizard successfully added the client."
 msgstr "Morroiak bezeroa gehitu du."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP Morroia"
 
@@ -198,47 +199,56 @@ msgstr ""
 "dizu."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "dhcp-k erabilitako helbide tartea"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Aukeratu DHCP zerbitzuak lanestazioei emango dien helbideen tartea, behar "
 "bereziak ez badituzu, arazorik gabe onartu ditzakezu proposaturiko balioak."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "IP Helbide Txikiena:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "IP Helbide Handiena:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "dhcp zerbitzariak entzun behar duen interfazea"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Adierazitako IP heina ez da zuzena."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Adierazitako IP heina ez dago zerbitzariaren helbide heinean."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "Zerbitzariaren IP ez da heinean egon behar."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP Zerbitzaria ezartzen"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -246,11 +256,31 @@ msgstr ""
 "Morroiak, zure DHCP zerbitzua konfiguratzeko behar diren ondorengo "
 "parametroak bildu ditu:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "ezgaituta"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "gaituta"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interfazea:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Morroiak zure zerbitzariaren DHCP zerbitzuak konfiguratu ditu."
 
@@ -258,20 +288,20 @@ msgstr "Morroiak zure zerbitzariaren DHCP zerbitzuak konfiguratu ditu."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS zerbitzaria"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS zerbitzaria"
@@ -309,72 +339,73 @@ msgstr ""
 "konputagailuen izenentzako, bertokoak ez diren izenen eskaerak kanpoko DNS "
 "batera berbidaliko ditu."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Ukatu ostalariei: "
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Ondorioztatutako domeinu izena"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNS Zerbitzaria ezartzen"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Kanpoko ataria"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -382,118 +413,118 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Hau ez da helbide zuzena... sakatu hurrengoa jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Hau ez da helbide zuzena... sakatu hurrengoa jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Hau ez da helbide zuzena... sakatu hurrengoa jarraitzeko"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Okerra"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS (ezarpena)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Ondorioztatutako domeinu izena"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Zerbitzariaren IP helbidea:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Zerbitzari Izena:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "Nis Domeinua:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Morroiak bezeroa gehitu du."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Morroiak bezeroa gehitu du."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Morroiak arrakastaz ezarri du zure zerbitzariaren DNS zerbitzua."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Zure sistema Nis+Autofs(nfs) zerbitzari bezala konfiguratzen ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Zure sistema Nis+Autofs(nfs) zerbitzari bezala konfiguratzen ..."
@@ -585,28 +616,24 @@ msgstr "Instalazioak hutsegin du"
 msgid "FTP wizard"
 msgstr "FTP morroia"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP Zerbitzariaren Konfigurazio Morroia"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Morroi honek zure sarerako FTP Zerbitzaria konfiguratzen lagunduko dizu."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Ez markatu lauki bat ere ez baduzu FTP Zerbitzaria aktibatu nahi."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP Zerbitzaria"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Aukeratu gaitu nahi duzun FTP zerbitzu mota:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -614,75 +641,76 @@ msgstr ""
 "Zure zerbitzariak zure barne sarerako (intraneta) FTP Zerbitzari bezala lan "
 "egin dezake eta Interneterako FTP Zerbitzari bezala."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Gaitu FTP Zerbitzaria Intraneterako"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Gaitu FTP Zerbitzaria Interneterako"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Baimendu ostalariak:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Oharra\n"
-"dhcp moduan zaude, baliteke zure ezarpenarekin zerbitzariak lan ezin egitea."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Barkatu, root izan behar duzu hau egiteko..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP Zerbitzaria konfiguratzen"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -690,7 +718,7 @@ msgstr ""
 "Morroiak, zure FTP Zerbitzaria konfiguratzeko behar\n"
 "diren hurrengo parametroak bildu ditu"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -698,35 +726,35 @@ msgstr ""
 "Balio hauek onartu, eta zure zerbitzaria konfiguratzeko, klikatu Hurrengoa "
 "botoia edo erabili Atzera botoia hauek zuzentzeko"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "ezgaituta"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "gaituta"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet FTP Zerbitzaria:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet FTP Zerbitzaria:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Morroiak zure Intranet/Internet FTP Zerbitzaria konfiguratu du"
 
@@ -774,7 +802,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1060,7 +1088,7 @@ msgstr ""
 "Morroiak zure Interneteko Berrien Zerbitzua konfiguratzeko\n"
 "behar diren hurrengo parametroak bildu ditu:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1340,27 +1368,42 @@ msgstr "Zure sistema Nis Bezero bezala konfiguratzen ..."
 msgid "Nis Client"
 msgstr "Nis Bezeroa"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix morroia"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Posta zerbitzaria"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Posta zerbitzaria"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet Posta Konfigurazio Morroia"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Morroi honek zure sarerako Internet Posta Zerbitzuak konfiguratzen lagunduko "
 "dizu."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Kanporantz zuzendutako Posta Helbidea"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1368,7 +1411,7 @@ msgstr ""
 "Hau barrurantz zuzendutako postarentzako erabiltzen duzun helbidearekin bat "
 "etorri beharko litzateke"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1376,19 +1419,27 @@ msgstr ""
 "Aukeratu dezakezu kanporantz zuzendutako postak \"Nork:\" eta \"Erantzun-honi"
 "\" eremuetan erakutsiko duen helbide mota."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maskarada domeinu izena:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Oharra:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Helbide hutsa sartu duzu posta atariarentzat."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1397,15 +1448,21 @@ msgstr ""
 "saretik kanpora bidali. Sakatu Hurrengoa jarraitzeko, edo Atzera balio bat "
 "sartzeko."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskaratzea ez da ona!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet Posta Ataria"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1415,7 +1472,7 @@ msgstr ""
 "behar dira; adibidez, zure hornitzailea \"hornitzailea.com\" bada, bere "
 "interneteko posta zerbitzaria normalean \"smtp.hornitzailea.com\" da."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1423,29 +1480,29 @@ msgstr ""
 "Zure zerbitzariak kanporantz zuzendurikoa posta atari baten bitartez "
 "bidaliko du, honek hartuko du azke emanaldiaren ardura."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Posta Zerbitzari Izena:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Internet Posta konfiguratzen"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1453,29 +1510,34 @@ msgstr ""
 "Morroiak zure Internet Posta Zerbitzua konfiguratzeko behar diren hurrengo "
 "parametroak bildu ditu:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Helbidearen tankera"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Morroiak zure zerbitzariaren Internet Posta Zerbitzua konfiguratu du."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTP Zerbitzaria konfiguratzen"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Inprimaketa Zerbitzaria:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP Zerbitzaria konfiguratzen"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - sarbidea mugatuta zerbitzari honetara soilik"
@@ -1654,7 +1716,8 @@ msgid "Access Control:"
 msgstr "Sarrera Kontrola:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Morroiak zure proxy zerbitzaria konfiguratu du."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1672,12 +1735,6 @@ msgstr "Squid morroia"
 msgid "PXE Wizard"
 msgstr "PXE morroia"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Ezarri PXE zerbitzaria"
@@ -2416,6 +2473,17 @@ msgstr "Erabiltzailearen direktorioa:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Morroiak zure Intranet/Internet Web Zerbitzariak konfiguratu ditu"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Ez markatu lauki bat ere ez baduzu FTP Zerbitzaria aktibatu nahi."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Oharra\n"
+#~ "dhcp moduan zaude, baliteke zure ezarpenarekin zerbitzariak lan ezin "
+#~ "egitea."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/fa.po b/po/fa.po
index c956a192..bfba02b6 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-10 01:04+0200\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "جادوگر تنظیمات"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,9 +31,9 @@ msgstr "جادوگر تنظیمات"
 msgid "Warning."
 msgstr "هشدار"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "خطا."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -87,15 +87,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "این جادوگر به شما در افزودن یک کارگیر جدید به DNS محلی‌تان کمک خواهد کرد."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(لازم ندارد نام دامنه را بعد از نام بنوسید)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "شناسایی کارگیر:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -103,7 +103,7 @@ msgid ""
 msgstr ""
 "توجه داشته باشید که نشانی آی پی و نام دامنه داده شده باید در شبکه یگانه باشد."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,28 +113,29 @@ msgstr ""
 "شبکه یا  clientname.company.net. هر ماشینی در شبکه باید یک نشانی یگانه‌ی "
 "اینترنتی، به روش املای نقطه‌ای داشته باشد."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "نام ماشین:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "شماره آی‌پی ماشین:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "هشدار\\nشما در dhcp هستید, کارگزار ممکن است با تنظیم شما کار نکند."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -181,7 +182,7 @@ msgstr "نشانی آی پی:"
 msgid "The wizard successfully added the client."
 msgstr "جادوگر با موفقیت کارگیر را اضافه کرد."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "جادوگر DHCP"
 
@@ -198,51 +199,60 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "این جادوگر به شما در تنظیم سرویس‌های DHCP کارگزارتان کمک خواهد کرد."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "گستره نشانی‌های استفاده شده توسط dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "گستره‌ی نشانی‌های گذارده شده بر رایانه‌های کار توسط سرویس DHCP را انتخاب "
 "نمایید؛ اگر شما احتیاجات مخصوصی ندارید می‌توانید ارزش‌های پیشنهاد شده را با "
 "خیال راحت بپذیرید."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "کوچکترین نشانی آی‌پی:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "بزرگترین نشانی آی‌پی:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "گستره‌ی تایین شده‌ی آی‌پی درست نمی‌باشد"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "گستره آی‌پی مشخص شده در گستره‌ی نشانی کارگزار شبکه نمی‌باشد"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "آی‌پی کارگزار نباید در گستره باشد"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "تنظیم کارگزار DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -250,11 +260,31 @@ msgstr ""
 "این جادوگر اجزای لازم بدنبال آمده را برای تنظیم سرویس DHCP شما جمع آوری "
 "نموده است"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "غیرفعال"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "فعال"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "جادوگر با موفقیت سرویس‌های DHCP کارگزارتان را تنظیم نمود."
 
@@ -262,20 +292,20 @@ msgstr "جادوگر با موفقیت سرویس‌های DHCP کارگزارت
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "کارگزار NFS "
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "کارگزار NFS "
@@ -312,72 +342,73 @@ msgstr ""
 "سرویس محلی DNS را برای نام‌های رایانه‌ها عرضه خواهد‌ کرد، تقاضاهای غیر-محلی به "
 "یک DNS خارجی فرستاده می‌شود."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "منع میزبانان:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "نام دامنه حساب شده"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "تنظیم کردن کارگزار DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "دروازه‌ی بیرونی"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -385,117 +416,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "این یک نشانی معتبر نمی‌باشد... تکمه بعد را برای ادامه فشار دهید"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "این یک نشانی معتبر نمی‌باشد... تکمه بعد را برای ادامه فشار دهید"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "این یک نشانی معتبر نمی‌باشد... تکمه بعد را برای ادامه فشار دهید"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "خطا."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "جادوگر DNS (تنظیمات)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "نام دامنه حساب شده"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "نشانی آی پی کارگزار:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "نام کارگزار:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "جادوگر با موفقیت کارگیر را اضافه کرد."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "جادوگر با موفقیت کارگیر را اضافه کرد."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "جادوگر با موفقیت سرویس‌های DNS کارگزارتان را تنظیم نمود."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "تنظیم کردن کارگزار DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "تنظیم کردن کارگزار DNS"
@@ -596,28 +627,23 @@ msgstr "نصب شکست خورد"
 msgid "FTP wizard"
 msgstr "جادوگر FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "جادوگر تنظیمات کارگزار FTP "
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "این جادوگر به شما در تنظیم کارگزار FTP شبکه‌تان کمک می‌کند."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"اگر نمی‌خواهید کارگزار FTP خود را فعال کنید هیچ جعبه‌ای را انتخاب ننمایید. "
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "کارگزار FTP "
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "نوع سرویس FTP را که می‌خواهید فعال کنید را انتخاب نمایید:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -625,74 +651,76 @@ msgstr ""
 "کارگزار شما می‌تواند مانند یک کارگزار FTP برای شبکه‌ی داخلی (اینترانت) شما و "
 "برای اینترنت عمل کند."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "فعال کردن کارگزار FTP برای اینترانت (اینترنت داخلی)"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "فعال کردن کارگزار FTP برای اینترنت "
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "اجازه میزبانان:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
-msgstr "هشدار\\nشما در dhcp هستید, کارگزار ممکن است با تنظیم شما کار نکند."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "متاسفم، شما برای انجام این کار باید مدیر سیستم باشید..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "تنظیم کردن کارگزار FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -701,7 +729,7 @@ msgstr ""
 "جادوگر اجزای بدنبال آمده‌ی مورد نیاز برای تنظیم کارگزار FTP شما را جمع آوری "
 "کرد"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -710,35 +738,35 @@ msgstr ""
 "برای پذیرش این ارزش‌ها و تنظیم کارگزارتان، تکمه بعد را کلیک کنید یا از تکمه "
 "برگشت برای تصحیح آنها استفاده نمایید."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "غیرفعال"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "فعال"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "کارگزار FTP اینترانت:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "کارگزار FTP اینترنت:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "جادوگر با موفقیت کارگزار FTP اینترنت/اینترانت شما را تنظیم کرد"
 
@@ -786,7 +814,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1070,7 +1098,7 @@ msgstr ""
 "این جادوگر اجزای بدنبال آمده‌ی لازم برای تنظیم سرویس اخبار اینترنت شما را جمع "
 "آوری نمود:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1347,31 +1375,46 @@ msgstr ""
 msgid "Nis Client"
 msgstr "نشانی آی پی:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "جادوگر پسوند"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "نام کارگزار پست:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "نام کارگزار پست:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "جادوگر تنظیمات پست اینترنت"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "این جادوگر به شما در تنظیم سرویس‌های پست اینترنت شبکه‌تان کمک می‌کند."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "نشانی پست ارسال شونده"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "این باید دائماً با نشانی که برای پست آمده استفاده می‌کنید انتخاب شود."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1379,19 +1422,27 @@ msgstr ""
 "شما می‌توانید نوع نشانی که پست خروجی در منطقه‌های \"از:\" و \"جواب-به\" نشان "
 "خواهد داد را انتخاب نمایید."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "نام دامنه نقاب زده شده:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "هشدار:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "شما یک نشانی خالی برای دروازه‌ی پست وارد نمودید."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1400,15 +1451,21 @@ msgstr ""
 "شبکه‌تان را نمی‌دهد. برای ادامه تکمه بعد را فشار داده، یا برگردید و یک ارزش را "
 "وارد نمایید."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "نقاب خوبی نیست!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "دروازه پست اینترنت"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1418,7 +1475,7 @@ msgstr ""
 "مثال، اگر شرکت عرضه کننده‌ی اینترنت شما \"provider.com\" باشد, کارگزار پست "
 "اینترنت شما معمولاً \"smtp.provider.com\" می‌باشد."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1426,29 +1483,29 @@ msgstr ""
 "کارگزار شما پست خروجی را به دروازه‌ی پست خواهد فرستاد، که ترتیب تحویل نهایی "
 "آنها را می‌دهد."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "نام کارگزار پست:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "تنظیم کردن پست اینترنت"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1456,29 +1513,34 @@ msgstr ""
 "جادوگر اجزای بدنبال آمده لازم را برای تنظیم سرویس پست اینترنت شما جمع آوری "
 "نمود:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "از نشانی"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "این جادوگر با موفقیت سرویس پست اینترنت کارگزار شما را تنظیم نمود."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "تنظیم کردن کارگزار FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "کارگزار چاپ:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "تنظیم کردن کارگزار FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "میزبان محلی - فقط دسترسی محدود به این کارگزار"
@@ -1658,7 +1720,8 @@ msgid "Access Control:"
 msgstr "کنترل دسترسی:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "جادوگر با موفقیت کارگزار پراکسی شما را تنظیم نمود."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1676,12 +1739,6 @@ msgstr "جادوگر Squid"
 msgid "PXE Wizard"
 msgstr "جادوگر FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2403,6 +2460,16 @@ msgstr "شاخه‌ی کاربر:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "جادوگر با موفقیت کارگزار وب اینترنت/اینترانت شما را تنظیم نمود"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "اگر نمی‌خواهید کارگزار FTP خود را فعال کنید هیچ جعبه‌ای را انتخاب ننمایید. "
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr "هشدار\\nشما در dhcp هستید, کارگزار ممکن است با تنظیم شما کار نکند."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/fi.po b/po/fi.po
index acec8f7a..8ae47cac 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fi - MDK Linux Release 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-30 01:40+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "asetusvelho"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "asetusvelho"
 msgid "Warning."
 msgstr "Varoitus."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -43,12 +43,12 @@ msgid "Error."
 msgstr "Virhe."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -88,15 +88,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Tämä velho auttaa sinua lisäämään asiakkaan paikalliseen DNS-palveluun."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Asiakkaan tiedot:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,26 +114,27 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Koneen nimi:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "Koneen IP-osoite:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -179,7 +180,7 @@ msgstr "Asiakas-IP:"
 msgid "The wizard successfully added the client."
 msgstr "Velho lisäsi asiakkaan onnistuneesti."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP Velho"
 
@@ -196,48 +197,57 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Tämä velho auttaa sinua asettamaan palvelimesi DHCP-palvelun."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "DHCP:n käytössä oleva osoiteavaruus"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Valitse osoiteavaruus josta työasemien osoitteet DHCP palvelulla määrätään; "
 "mikäli sinulla ei ole erityistarpeita, voit turvallisesti hyväksyä ehdotetut "
 "arvot."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Matalin IP-osoite:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Korkein IP-osoite:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Liitäntä, jota DHCP-palvelimen on kuunneltava"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Annettu IP-osoiteavaruus on virheellinen."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Annettu IP-osoiteavaruus ei ole palvelimen verkon osoiteavaruudessa."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "Palvelimen IP ei saa olla tästä osoiteavaruudesta."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Asetetaan DHCP-palvelin"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -245,11 +255,31 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan DHCP-palvelusi "
 "asettamiseksi:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "Poistettu käytöstä"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "Käytössä"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Liitäntä:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Velho asetti palvelimesi DHCP-palvelun onnistuneesti."
 
@@ -257,7 +287,7 @@ msgstr "Velho asetti palvelimesi DHCP-palvelun onnistuneesti."
 msgid "You need to readjust your hostname."
 msgstr "Sinun täytyy uudelleenmäärittää koneesi nimi."
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
@@ -267,12 +297,12 @@ msgstr ""
 "oikean verkkoalueen nimi, joka ei saa olla localdomain tai none. Käytä "
 "drakconnect muokataaksesi sitä."
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "Isäntä DNS-palvelin"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "Orja DNS-palvelin"
 
@@ -306,27 +336,28 @@ msgstr ""
 "tarjoaa paikallisen DNS-palvelun paikallisille työasemille, sekä ei-"
 "paikallisten hakujen edelleenlähettämisen ulkoiselle DNS palvelimelle."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "Mitä haluat tehdä:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr "Valitse kone jota haluat poistaa seuraavassa listauksessa."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "Poista kone olemassaolevasta dns-asetuksesta."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "Poista kone:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "Tietokoneen nimi:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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 "
@@ -335,11 +366,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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr "DNS isäntäpalvelimen IP-osoite:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -347,11 +378,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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr "Edelleenlähettäjän IP-osoite:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
@@ -359,15 +390,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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "Ulkoinen DNS:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr "Lisää etsittävä verkkoalue"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -375,7 +406,7 @@ msgstr ""
 "Tämän palvelimen verkkoaluetta lisätään automaattisesti, joten sitä ei "
 "tarvitse lisätä tässä."
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -387,28 +418,28 @@ msgstr ""
 "verkkoalueen nimi. Tätä voidaan muuttaa listaamalla kaikki toivotut "
 "verkkoalueen hakupolut \"search\" avainsanan jälkeen."
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr "Oletusverkkoalue jossa etsitään:"
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 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:172
+#: ../dns_wizard/Bind.pm:171
 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:177
+#: ../dns_wizard/Bind.pm:176
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -416,11 +447,11 @@ msgstr ""
 "Näyttää siltä että tuo kone on jo DNS asetuksissasi... paina 'seuraava' "
 "jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -428,7 +459,7 @@ msgstr ""
 "Näyttää siltä ettei tämä kone ole DNS asetuksissasi... paina 'seuraava' "
 "jatkaaksesi"
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -436,7 +467,7 @@ 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:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
@@ -444,60 +475,60 @@ 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:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr "Ok, nyt luon DNS-orja asetuksesi"
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "näillä asetuksella:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 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:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "Tietokoneen nimi:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "Tietokoneen IP-osoite:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr "Asiakas näillä tunnisteilla poistetaan DNS-palvelusta"
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "DNS-palvelinta ollaan asettamassa seuraavilla asetuksilla:"
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "Palvelimen konenimi:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr "Verkkoalue:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr "Velho lisäsi koneen DNS-palveluun onnistuneesti."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Velho poisti koneen DNS-palvelusta onnistuneesti."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Velho asetti palvelimesi DNS-palvelun onnistuneesti."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Asetetaan järjestelmäsi DNS Isäntäpalvelimeksi ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Asetetaan järjestelmäsi DNS orjapalvelimeksi ..."
 
@@ -582,27 +613,23 @@ msgstr "Asennus epäonnistui"
 msgid "FTP wizard"
 msgstr "FTP velho"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP-palvelimen asetusvelho"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Tämä velho auttaa sinua asettamaan FTP-palvelimen verkollesi."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Älä aseta yhtäkään ruutua jos et halua käynnistää FTP-palvelinta."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP-palvelin"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Valitse FTP-palvelun tyyppi jota haluat käyttää:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -610,78 +637,89 @@ msgstr ""
 "Palvelimesi voi toimia FTP-palvelimena paikallisverkolle (intranet), sekä "
 "FTP-palvelimena Internetin käyttäjille."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Ota käyttöön FTP-palvelin paikallisverkolle"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Ota käyttöön FTP-palvelin Internetiin."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Admin Email: email address of FTP administrator."
 msgstr "Ylläpitäjän sähköposti: FTP ylläpitäjän sähköpostiosoite."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
+msgstr ""
+"salli jatkettava FTP salli jatkettava siirto (ylös/alas) ftp palvelimella."
+
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr "Salli FXP: salli tiedostonsiirtoa toisten ftp-palvelimien kautta."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 "Aseta käyttäjät Chroot:iin: Rajoittaa käyttäjät omiin kotihakemistoihin."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "FTP Proftpd server options"
 msgstr "Ftp Proftpd palvelinasetukset"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 "Salli root login: sallii kirjautuminen root-tunnuksella ftp-palvelimelle."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
-msgstr ""
-"salli jatkettava FTP salli jatkettava siirto (ylös/alas) ftp palvelimella."
-
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+#, fuzzy
+msgid "Admin email:"
 msgstr "Ylläpitäjän sähköposti"
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+#, fuzzy
+msgid "Permit root Login:"
 msgstr "Salli kirjautuminen root tunnuksella"
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+#, fuzzy
+msgid "Chroot Home user:"
 msgstr "aseta kotikäyttäjät chroot:iin"
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+#, fuzzy
+msgid "Allow FTP resume:"
 msgstr "Salli jatkettava FTP"
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
 msgstr "Salli FXP"
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
-"Varoitus\n"
-"Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Valitan, sinun pitää olla pääkäyttäjä tehdäksesi tämän..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Asetetaan FTP-palvelin"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -689,7 +727,7 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan\n"
 "FTP-palvelimesi asettamiseksi"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -697,35 +735,35 @@ msgstr ""
 "Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
 "'Edellinen' korjataksesi asetuksia"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "Poistettu käytöstä"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "Käytössä"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet FTP Palvelin:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet FTP Palvelin:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr "Ylläpitäjän sähköposti"
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr "Salli kirjautuminen root tunnuksella"
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr "aseta kotikäyttäjät chroot:iin"
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr "Salli jatkettava FTP"
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr "Salli FXP"
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Velho asetti Intranet/Internet FTP-palvelimesi onnistuneesti"
 
@@ -778,7 +816,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr "Kohdehakemisto on jo käytössä, ole hyvä ja valitse toinen."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr "Asetan nyt asennuspalvelimesi näillä parametreilla"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1050,7 +1088,7 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan\n"
 "Internet uutisryhmäpalvelun asettamiseksi:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1326,31 +1364,46 @@ msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi ..."
 msgid "Nis Client"
 msgstr "Nis-asiakas:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix velho"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Sähköpostipalvelin"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Sähköpostipalvelin"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet sähköpostiasetukset"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "Tämä velho auttaa asettamaan Internet sähköpostipalvelut verkollesi"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Lähtevän postin osoite"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Tämä pitäisi olla yhtenäinen saapuvan sähköpostin osoitteen kanssa."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1358,19 +1411,27 @@ msgstr ""
 "Voit valita osoitemuodon jonka lähtevä sähköposti näyttää kentissä: "
 "\"Keneltä (From)\" ja \"Vastausosoite (Reply-to)\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maskeeratun verkkoalueen nimi:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Varoitus:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Jätit sähköpostin yhdyskäytävä -asetuksen tyhjäksi."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1379,15 +1440,21 @@ msgstr ""
 "paikallisverkkosi ulkopuolelle. Paina 'Seuraava' jatkaaksesi, tai 'Takaisin' "
 "korjataksesi asetuksia."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskeeraus ei hyvä!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet sähköpostin yhdyskäytävä"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1397,7 +1464,7 @@ msgstr ""
 "\"; eli jos esimerkiksi palveluntarjoajasi on \"tarjoaja.fi\", niin "
 "sähköpostipalvelimen nimi on yleensä \"smtp.tarjoaja.fi\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1405,15 +1472,16 @@ msgstr ""
 "Postipalvelimesi lähettää lähtevän postin postiyhdyskäytävän kautta, joka "
 "vastaa lopullisen lähetyksen perillemenosta."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Sähköpostipalvelimen nimi:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+#, fuzzy
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr "Oletuksena lisätään $myhostname joka rittää pienille verkoille."
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
@@ -1421,15 +1489,15 @@ msgstr ""
 "Parametri 'myorigin=' määrittää mistä verkkoalueesta paikallisesti lähetetyt "
 "viestit näyttää tulevan"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Asetetaan Internet sähköposti"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1437,27 +1505,33 @@ msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan Internet "
 "sähköpostipalvelun asettamiseksi:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Osoitteen muoto"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Velho asetti palvelimesi Internet sähköpostipalvelun onnistuneesti."
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "Asetetaan Postfix-palvelimesi."
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Postfix palvelin"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Asetetaan Postfix-palvelimesi."
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Paikallispalvelin - käyttö sallittu ainoastaan tästä palvelimesta."
@@ -1638,7 +1712,8 @@ msgid "Access Control:"
 msgstr "Käyttörajoitus:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Velho asetti välityspalvelimen onnistuneesti."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1653,15 +1728,6 @@ msgstr "Squid välityspalvelin"
 msgid "PXE Wizard"
 msgstr "PXE-velho"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. 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. Käytä "
-"drakconnect muokataaksesi sitä."
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Aseta PXE-palvelin"
@@ -2384,3 +2450,22 @@ msgstr "Käyttäjien hakemisto:"
 #: ../web_wizard/Apache.pm:146
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Velho asetti Intranet/Internet WWW-palvelimesi onnistuneesti."
+
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Älä aseta yhtäkään ruutua jos et halua käynnistää FTP-palvelinta."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Varoitus\n"
+#~ "Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For a DNS server you need a correct "
+#~ "domainname, not egal to localdomain or none. 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. Käytä drakconnect muokataaksesi sitä."
diff --git a/po/fr.po b/po/fr.po
index 034e3089..4f322500 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-28 15:58+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: french <cooker-i18n@linux-mandrake.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "assistant de configuration"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "assistant de configuration"
 msgid "Warning."
 msgstr "Attention."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -43,12 +43,12 @@ msgid "Error."
 msgstr "Erreur."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -67,7 +67,9 @@ msgstr "Vous devez d'abord lancer l'assistant Serveur DNS"
 msgid ""
 "A client of your local network is a machine connected to the network having "
 "its own name and IP address."
-msgstr "Un client pour votre r�seau local est une machine du r�seau ayant son propre nom et sa propre adresse IP."
+msgstr ""
+"Un client pour votre r�seau local est une machine du r�seau ayant son propre "
+"nom et sa propre adresse IP."
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "Press next to begin, or Cancel to leave this wizard."
@@ -86,15 +88,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Cet assistant vous aide � ajouter un nouveau client dans votre DNS"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identification du client�:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
@@ -102,7 +104,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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,28 +114,29 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nom de la machine�:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "Adresse IP de la machine�:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Attention"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Vous �tes en DHCP, le serveur pourrait ne pas marcher avec cette "
 "configuration."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -179,7 +182,7 @@ msgstr "Adresse IP�:"
 msgid "The wizard successfully added the client."
 msgstr "L'assistant a ajout� le client au DNS."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Assistant de configuration DHCP"
 
@@ -197,48 +200,57 @@ msgstr ""
 "Cet assistant vous aide � configurer les services DHCP de votre serveur."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Plages d'adresses utilis�es par DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Choisissez la plage d'adresses assign�e aux postes de travail par le service "
 "DHCP; sauf en cas de besoin sp�cifique, vous pouvez accepter les valeurs "
 "propos�es."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Adresse IP la plus basse�:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Adresse IP la plus haute�:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Interface sur laquelle le serveur dhcp doit �couter"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "La plage d'adresses IP sp�cifi�e est incorrecte"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "La plage d'adresses IP sp�cifi�e n'est pas dans celle du serveur."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "L'adresse IP du serveur ne doit pas �tre dans la plage."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Configuration du serveur DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -246,11 +258,32 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
 "votre service DHCP :"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+# desactiv�
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "d�sactiv�"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "activ�"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interface�:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 "L'assistant a configur� avec succ�s les services DHCP de votre serveur."
@@ -259,7 +292,7 @@ msgstr ""
 msgid "You need to readjust your hostname."
 msgstr "SVP reajuster votre nom d'ordinateur."
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
@@ -268,12 +301,12 @@ msgstr ""
 "R�ajustez le nom de votre domaine. Pour configurer un serveur DNS vous avez "
 "besoin d'un nom de domaine correct. Lancez drakconnect pour l'ajuster"
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "Serveur DNS ma�tre"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "Serveur DNS secondaire"
 
@@ -307,27 +340,28 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "Que voulez faire�?"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr "Choisissez l'ordinateur que vous voulez retirer."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "Enleve un ordinateur de la configuration DNS."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "Enlever un h�te�:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "Nom de la machine�:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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 "
@@ -336,11 +370,11 @@ msgstr ""
 "Un serveur DNS esclave sert de server de backup a un serveur DNSprimaire, au "
 "cas ou votre server princiapl n'est pas joignable."
 
-#: ../dns_wizard/Bind.pm:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr "Adresse IP du serveur DNS ma�tre�:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -348,12 +382,12 @@ msgstr ""
 "Le transfert est utilis� que pour les requ�tes pour lequel notre servern'est "
 "pas authoritaire et, si celui-ci qui ne possede pas la reponse dans soncache."
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 #, fuzzy
 msgid "IP of your forwarder"
 msgstr "Serveur DNS externe"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
@@ -361,21 +395,21 @@ msgstr ""
 "Si vous ne connaissez pas de server externe, ou si vous ne savez pas ceque "
 "c'est, ne mettez rien."
 
-#: ../dns_wizard/Bind.pm:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "DNS externe�:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr "Ajouter un domaine de recherche"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -383,43 +417,43 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr "Domaine de recherche par d�faut�:"
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Cette adresse IP est incorrecte... Appuyez sur Suivant pour continuer"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 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:177
+#: ../dns_wizard/Bind.pm:176
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "Erreur�:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -427,7 +461,7 @@ msgstr ""
 "Aucune configuration DNS n'a �t� mise en place au travers du Wizard DNS."
 "Lancez le wizard DNS en choisissant: Serveur DNS maitre."
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
@@ -435,61 +469,60 @@ msgstr ""
 "Il semble que vous ne soyez pas un serveur DNS primaire. Il est donc "
 "impossible d'ajouter/retirer des ordinateurs."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr "Configuration d'un serveur DNS esclave en cours"
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "avec cette configuration�:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "Nom de la machine�:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "Adresse IP du serveur�:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr "Cet ordinateur va etre retirer."
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
-msgstr ""
-"Le serveur DNS va etre configur� comme suit"
+msgstr "Le serveur DNS va etre configur� comme suit"
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "Nom du serveur�:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr "Nom du domaine�:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr "L'assistant a ajout� avec succ�s le client au DNS."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr "L'assistant a ajout�  avec succ�s le client au DNS."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 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:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurer votre syst�me en tant que serveur DNS ma�tre ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurer votre syst�me en tant que serveur DNS secondaire ..."
 
@@ -575,27 +608,23 @@ msgstr "L'installation a �chou�"
 msgid "FTP wizard"
 msgstr "Assistant FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Assistant de configuration du FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Cet assistant vous aide � configurer un serveur FTP pour votre r�seau."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Ne cocher aucune case si vous ne voulez pas activer le serveur FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Serveur FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "S�lectionnez le type de service que vous d�sirez activer"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -603,76 +632,91 @@ msgstr ""
 "Votre serveur peut servir de serveur FTP pour votre r�seau local (intranet) "
 "ainsi que pour l'Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Activer le service FTP pour le r�seau local"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Activer le serveur FTP pour l'internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Admin Email: email address of FTP administrator."
 msgstr "Adresse Email: addresse email de l'administrateur du FTP."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
-msgstr "Autorise le FXP: autoriser le transfert au travers d'autre serveur FTP."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
+msgstr "Reprise des transferts: autoriser la reprise des transferts FTP."
+
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FXP: allow file transfer via other FTP."
+msgstr ""
+"Autorise le FXP: autoriser le transfert au travers d'autre serveur FTP."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
-msgstr "Chroot des utilisateurs: bloquer les utilisateurs dans leur r�pertoire personnel."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Chroot Home user: the users will only see their home directory."
+msgstr ""
+"Chroot des utilisateurs: bloquer les utilisateurs dans leur r�pertoire "
+"personnel."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "FTP Proftpd server options"
 msgstr "Options du serveur FTP Proftpd"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
-msgstr "Autoriser les connections de root�: permet � root de se connecter au serveur FTP."
-
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
-msgstr "Reprise des transferts: autoriser la reprise des transferts FTP."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Permit root login: allow root to log on FTP server."
+msgstr ""
+"Autoriser les connections de root�: permet � root de se connecter au serveur "
+"FTP."
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+#, fuzzy
+msgid "Admin email:"
 msgstr "Adresse email de l'administrateur"
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+#, fuzzy
+msgid "Permit root Login:"
 msgstr "Autoriser root � se connecter"
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+#, fuzzy
+msgid "Chroot Home user:"
 msgstr "Bloquer utilisateurs dans leur r�pertoire."
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+#, fuzzy
+msgid "Allow FTP resume:"
 msgstr "Autoriser la reprise des transferts FTP"
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
 msgstr "Autorise FXP"
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Attention\n"
-"Vous �tes en DHCP, le serveur pourrait ne pas marcher avec cette "
-"configuration."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "D�sol�, vous devez �tre root pour faire ceci..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Configuration du service FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -680,7 +724,7 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants\n"
 "n�cessaires � la configuration de de votre serveur FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -688,36 +732,35 @@ msgstr ""
 "Pour accepter ces valeurs et configurer votre serveur, cliquez sur le bouton "
 "��Suivant�� ou utilisez le bouton ��Pr�c�dent�� pour les corriger"
 
-# desactiv�
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "d�sactiv�"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "activ�"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Service FTP pour l'intranet�:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Service FTP pour Internet�:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr "Adresse email de l'administrateur"
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr "Autoriser root � se connecter"
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr "Bloquer utilisateurs dans leur r�pertoire."
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr "Autoriser la reprise des transferts FTP"
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr "Autorise FXP"
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "L'assistant a configur� avec succ�s votre serveur FTP Intranet/Internet"
@@ -731,7 +774,8 @@ msgid ""
 "Easily configure a Mandrake server installation directory, with NFS and HTTP "
 "access."
 msgstr ""
-"Configurer facilement un serveur d'installation Mandrake, avec acces NFS et HTTP."
+"Configurer facilement un serveur d'installation Mandrake, avec acces NFS et "
+"HTTP."
 
 #: ../installsrv_wizard/Installsrv.pm:56
 msgid "Destination directory: copy file in which directory ?"
@@ -746,8 +790,8 @@ msgid ""
 "Path to data: specify your source directory, should be base of an Mandrake "
 "installation."
 msgstr ""
-"R�pertoire contenant les donn�es: specifier le r�pertoire contenant la base"
-"d'un CD d'installtion Mandrake."
+"R�pertoire contenant les donn�es: specifier le r�pertoire contenant la "
+"based'un CD d'installtion Mandrake."
 
 #: ../installsrv_wizard/Installsrv.pm:71
 msgid "Destination directory could not be '/var/install/'"
@@ -768,8 +812,9 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
-msgstr "Je vais configurer votre serveur d'installation avec les parametres suivant"
+msgid "Your install server will be configured with those parameters"
+msgstr ""
+"Je vais configurer votre serveur d'installation avec les parametres suivant"
 
 #: ../installsrv_wizard/Installsrv.pm:91
 #, fuzzy
@@ -1041,7 +1086,7 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants\n"
 "n�cessaires pour configurer votre Service de forums :"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1322,27 +1367,42 @@ msgstr "Configurer votre syst�me en tant que client NIS ..."
 msgid "Nis Client"
 msgstr "Client NIS"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Assistant Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Serveur de messagerie (Postfix)"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Serveur de messagerie (Postfix)"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Assistant de configuration de la messagerie"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Cet assistant vous aide � configurer le service de Courrier �lectronique de "
 "votre r�seau."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Format des messages sortants"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1350,7 +1410,7 @@ msgstr ""
 "Ce choix doit �tre coh�rent avec l'adresse que vous utilisez pour recevoir "
 "le courrier entrant."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1358,19 +1418,27 @@ msgstr ""
 "Vous pouvez s�lectionner le format d'adresse que les messages sortants vont "
 "avoir dans les champs ��From:�� et ��Reply-to��."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Masquage du nom de domaine :"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Attention :"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Vous avez saisi une adresse vide pour la passerelle. Vous risquez de"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1379,15 +1447,21 @@ msgstr ""
 "courrier hors de votre r�seau local. Cliquez sur Suivant pour continuer, ou "
 "Pr�c�dent pour modifier."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquage d'adresse incorrect�!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Passerelle Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1397,7 +1471,7 @@ msgstr ""
 "typedomaine��; par exemple, si votre fournisseur est ��fournisseur.fr��, le "
 "serveur de courrier est souvent ��smtp.fournisseur.fr��."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1405,29 +1479,29 @@ msgstr ""
 "Votre serveur va envoyer tous les messages sortants vers une passerelle, qui "
 "s'occupera de la livraison finale."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Passerelle pour la messagerie�:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Configuration de la messagerie Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1435,31 +1509,36 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
 "votre Service de Courrier �lectronique :"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Forme de l'adresse�:"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "L'assistant a configur� avec succ�s les services de messagerie Internet pour "
 "votre r�seau."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Configuration du service FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Partage d'imprimante�:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Configuration du service FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - acc�s uniquement pour cet ordinateur"
@@ -1641,7 +1720,8 @@ msgid "Access Control:"
 msgstr "Contr�le d'acc�s"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr ""
 "L'assistant a configur� avec succ�s le service proxy Squid de votre serveur."
 
@@ -1660,15 +1740,6 @@ msgstr "Assistant Squid"
 msgid "PXE Wizard"
 msgstr "Assistant PXE"
 
-#: ../pxe_wizard/Pxe.pm:72
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. 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. Lancez drakconnect pour l'ajuster"
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Configurer un serveur PXE"
@@ -1754,7 +1825,8 @@ msgstr "Image de d�marrage � configurer�:"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Install directory: full path to MDK install server directory"
-msgstr "R�pertoire d'installation: chemin complet du serveur d'installation Mandrake."
+msgstr ""
+"R�pertoire d'installation: chemin complet du serveur d'installation Mandrake."
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Installation method: choose nfs/http to install via nfs/http."
@@ -2411,6 +2483,26 @@ msgstr ""
 "L'assistant a configur� avec succ�s le service Web intranet/Internet sur "
 "votre serveur."
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Ne cocher aucune case si vous ne voulez pas activer le serveur FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Attention\n"
+#~ "Vous �tes en DHCP, le serveur pourrait ne pas marcher avec cette "
+#~ "configuration."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For a DNS server you need a correct "
+#~ "domainname, not egal to localdomain or none. 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. Lancez drakconnect pour l'ajuster"
+
 #~ msgid "Setup a ldap server."
 #~ msgstr "Configurer un serveur LDAP."
 
diff --git a/po/he.po b/po/he.po
index 57a80611..a69b9aa7 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-17 10:59+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "אשף הגדרות"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,9 +31,9 @@ msgstr "אשף הגדרות"
 msgid "Warning."
 msgstr "אזהרה."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "שגיאה"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -84,22 +84,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "אשף זה יעזור לך להוסיף לקוח חדש ל-DNS המקומי."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(אין צורך בהקלדת מרחב הכתובות [domain] לאחר השם)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "זיהוי לקוח:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +108,28 @@ msgstr ""
 "הלקוח שלך ברשת יזוהה לפי שם כדלהלן: clientname.company.net. לכל מחשב ברשת "
 "חייבת להיות כתובת IP (ייחודית) בהתאם לתחביר המקובל."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "שם המחשב:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "כתובת IP של המחשב:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -172,7 +173,7 @@ msgstr "כתובת IP של הלקוח:"
 msgid "The wizard successfully added the client."
 msgstr "האשף הוסיף את הלקוח בהצלחה."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "אשף DHCP"
 
@@ -187,57 +188,86 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "אשף זה יעזור לך בהגדרת שרותי DHCP של השרת שלך."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "טווח הכתובות בשימוש DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "נא לבחור את טווח הכתובות המוקצות לתחנות העבודה על-ידי שרות ה-DHCP. אם אין לך "
 "צרכים מיוחדים, ניתן לאשר בבטחה את הערכים המוצעים."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "כתובת ה IP הנמוכה:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "כתובת ה-IP הגבוהה:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "השער שעל שרת ה DHCP להאזין לו"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "טווח כתובות ה-IP המוגדר אינו תקין."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "טווח כתובות ה-IP המוגדר לא נמצא בטווח כתובות שרת הרשת."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "אסור שכתובת ה IP של השרת תהיה בטווח."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "הגדרת שרת ה-DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "אשף זה אסף את הנתונים הבאים אשר נדרשים להגדרת שרות ה DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "חסום"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "מאופשר"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "ממשק:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרותי DHCP של השרת שלך."
 
@@ -245,20 +275,20 @@ msgstr "אשף זה סיים בהצלחה את הגדרת שרותי DHCP של �
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "שרת NFS:"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "שרת NFS:"
@@ -295,72 +325,73 @@ msgstr ""
 "עבור שמות מחשבים מקומיים, כאשר בקשות לכתובות שאינן מקומיות יופנו לשרת DNS "
 "חיצוני."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "הגבלת תחנות:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "שם מרחב כתובות (domain) מחושב"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "הגדרת שרת ה-DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "שער (gateway) חיצוני"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -368,117 +399,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "כתובת זאת אינה חוקית... נא לבחור 'המשך' בכדי להתקדם"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "כתובת זאת אינה חוקית... נא לבחור 'המשך' בכדי להתקדם"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "כתובת זאת אינה חוקית... נא לבחור 'המשך' בכדי להתקדם"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "שגיאה"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "אשף (הגדרות) DNS"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "שם מרחב כתובות (domain) מחושב"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "כתובת שרת IP:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "שם שרת:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "האשף הוסיף את הלקוח בהצלחה."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "האשף הוסיף את הלקוח בהצלחה."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "אשף זה סיים להגדיר בהצלחה את שרותי ה-DNS של השרת שלך"
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "הגדרת שרת ה-DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "הגדרת שרת ה-DNS"
@@ -570,27 +601,23 @@ msgstr "ההתקנה נכשלה"
 msgid "FTP wizard"
 msgstr "אשף FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "אשף הגדרת שרת FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "אשף זה יעזור לך להגדיר את שרת ה-FTP (העברת קבצים) ברשת שלך."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "אין לסמן אף תיבה אם אין ברצונך להפעיל את שרת ה-FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "שרת FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "נא לבחור את סוג שירות ה-FTP שברצונך לאפשר"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -598,75 +625,76 @@ msgstr ""
 "השרת שלך יכול לתפקד כשרת FTP כלפי הרשת המקומית (רשת מקומית) וכשרת FTP כלפי "
 "האינטרנט."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "אפשור שרת ה-FTP עבור הרשת המקומית"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "אפשור שרת ה-FTP עבור האינטרנט"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "אפשור תחנות:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"אזהרה\n"
-" הנך בהגדרת DHCP, השרת עלול שלא לעבוד עם תצורה זו."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "צר לי, עליך להיות מנהל בכדי לבצע פעולה זו..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "הגדרת שרת ה-FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -674,7 +702,7 @@ msgstr ""
 "אשף זה אסף את הנתונים הבאים\n"
 "הנדרשים להגדרת שרת ה-FTP שלך"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -682,35 +710,35 @@ msgstr ""
 "לאישור ערכים אלו, ולהגדרת השרת, נא לבחור 'המשך' או לבחור 'חזור' על-מנת "
 "לשנותם."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "חסום"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "מאופשר"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "שרת FTP ברשת המקומית::"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "שרת FTP באינטרנט:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-FTP שלך עבור האינטרנט/רשת מקומית"
 
@@ -758,7 +786,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1037,7 +1065,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr "האשף אסף את הנתונים הבאים הנדרשים בכדי להגדיר את שרת קבוצות הדיון שלך:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1312,31 +1340,46 @@ msgstr "הגדרת המערכת שלך כלקוח NIS ..."
 msgid "Nis Client"
 msgstr "לקוח NIS"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "אשף Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "שרת דואר"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "שרת דואר"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "אשף הגדרת דואר אינטרנטי"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "אשף זה יעזור לך להגדיר שרותי דואר אינטרנטי עבור הרשת שלך."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "כתובת דואר יוצא:"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "יש לבחור זאת באופן עקבי עם הכתובת המשמשת עבור דואר נכנס."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1344,19 +1387,27 @@ msgstr ""
 "יש באפשרותך לבחור את סוג הכתובות שייראו בדואר יוצא בשדה ה\"מאת:\" ובשדה ה"
 "\"כתובת לתשובה\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "מסיכת שם מתחם"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "אזהרה:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "לא הוגדרה כתובת כלשהי עבור שרת הדואר (שדה הכתובת ריק)."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1364,15 +1415,21 @@ msgstr ""
 "בחירה זו אפשרית, אולם היא לא תאפשר משלוח דוא\"ל מחוץ לרשת המקומית. נא לבחור "
 "'המשך' או 'חזור' על-מנת להכניס ערך."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "הגדרת המיסוך (Masquerade) אינה טובה!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "שרת דואר אינטרנט"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1382,63 +1439,68 @@ msgstr ""
 "הספק שלך הוא \"provider.com\", אזי שם שרת הדואר האינטרנטי יהיה בדרך-כלל "
 "\"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "השרת שלך ישלח דוא\"ל יוצא דרך שרת דואר יוצא, שיטפל במשלוח ליעד הסופי."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "שם שרת הדואר:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "הגדרת דואר אינטרנטי"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "אשף זה אסף את הנתונים הבאים הנדרשים להגדרת שרות הדואר האינטרנטי:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "תבנית הכתובת"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרות הדואר האינטרנטי בשרת שלך."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "הגדרת שרת ה-FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "שרת הדפסה:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "הגדרת שרת ה-FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "שרת מקומי - הגישה מוגבלת לשרת זה בלבד"
@@ -1609,7 +1671,8 @@ msgid "Access Control:"
 msgstr "בקרת גישה:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "אשף זה סיים בהצלחה את הגדרת השרת המתווך שלך."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1626,12 +1689,6 @@ msgstr "אשף Squid"
 msgid "PXE Wizard"
 msgstr "אשף PXE"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "הגדרת שרת PXE"
@@ -2342,6 +2399,16 @@ msgstr "ספריית משתמש:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "האשף סיים בהצלחה את הגדרת שרת אחסון אתרי הרשת המקומית/אינטרנט שלך"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "אין לסמן אף תיבה אם אין ברצונך להפעיל את שרת ה-FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "אזהרה\n"
+#~ " הנך בהגדרת DHCP, השרת עלול שלא לעבוד עם תצורה זו."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/hi.po b/po/hi.po
index be607c27..05baca99 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-26 18:12+0530\n"
 "Last-Translator: Dhananjaya Sharma <dysxhi@yahoo.co.in>\n"
 "Language-Team: Hindi, India <dysxhi@yahoo.co.in>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "संरचना विज़ार्ड"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -28,9 +28,9 @@ msgstr "संरचना विज़ार्ड"
 msgid "Warning."
 msgstr "चेतावनी ।"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -38,12 +38,12 @@ msgid "Error."
 msgstr "त्रुटि ।"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -83,15 +83,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "यह जादूगरी आपकी एक नये ग्राहक को आपके स्थानीय डीएनएस में जोड़ने में सहायता करेगी ।"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(आपको नाम के बाद डोमेन को अंकित करने की आवश्यकता नहीं है)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "ग्राहक पहचान:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
@@ -99,7 +99,7 @@ msgstr ""
 "कृपया ध्यान रहे कि निर्दिष्ट किया हुआ आई०पी० पता और ग्राहक का नाम  नेटवर्क में अद्वितीय "
 "होना चाहिए ।"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,26 +109,27 @@ msgstr ""
 "मेंनेटवर्क पर, प्रत्येक मशीन के पास एक (अद्वितीय) आई०पी० पता सामान्य डौटेड वाक्य-विन्यास "
 "में होना चाहिए ।"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "मशीन का नाम:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "मशीन का आई०पी० पता:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -174,7 +175,7 @@ msgstr "ग्राहक आई०पी०:"
 msgid "The wizard successfully added the client."
 msgstr "जादूगरी ने ग्राहक को सफ़लतापूर्वक जोड़ा ।"
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "डीएचसीपी जादूगरी"
 
@@ -190,47 +191,56 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "यह जादूगरी, आपके सर्वर की डीएचसीपी सेवाओं को संरचित करने में सहायता करेगी ।"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "डीएचसीपी के द्वारा उपयोग मे लाये गये पतों की सीमा"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "डीएचसीपी सेवाओं के द्वारा कार्य-केंद्रों को दिये गये पतों की सीमा का चयन करें,जब तक कि "
 "आपकी विशेष आवश्यकतायें ना हो, आप प्रस्तावित मूल्यों कोसुरक्षा-पूर्वक ग्रहण कर सकते है ।"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "निम्नतम आई०पी० पता:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "उच्चतम आई०पी० पता:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "इन्टरफ़ेस जिसे डीएचसीपी सर्वर को अवश्य सुनना चाहिए"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "निर्दिष्ट की हुई आई०पी० श्रंखला वैध नहीं है ।"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "निर्दिष्ट की हुई आई०पी० श्रंखला, सर्वर पते की सीमा में नहीं है ।"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "सर्वर का आई०पी सीमा के अंदर नहीं होना चाहिए ।"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "डीएचसीपी सर्वर को संरचित किया जा रहा है"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -238,11 +248,31 @@ msgstr ""
 "इस जादूगरी ने निम्नलिखित मानकों को एकत्रित किया है जो कि आपके डीएचसीपी सेवाओंको संरचित "
 "करने के लिए आवश्यक है:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "निष्क्रिय"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "सक्रिय"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "इन्टरफ़ेस:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "जादूगरी ने, आपके सर्वर की डीएचसीपी सेवाओं को सफ़लता-पूर्वक संरचित किया ।"
 
@@ -250,7 +280,7 @@ msgstr "जादूगरी ने, आपके सर्वर की डी
 msgid "You need to readjust your hostname."
 msgstr "आपको अपने होस्ट के नाम को पुनः ठीक करने की आवश्यकता है।"
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
@@ -260,12 +290,12 @@ msgstr ""
 "एक ठीक डोमेन के नाम जो कि स्थानीय डोमेन के समकक्ष नहीं होना चाहिए या कुछ भी नहींकी "
 "आवश्यकता है । ठीक करने के लिए ड्रैककनेक्ट को आरम्भ करें ।"
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "स्वामी डीएनएस सर्वर"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "दास डीएनएस सर्वर"
 
@@ -299,27 +329,28 @@ msgstr ""
 "स्थानीय संगणकों के नामों के लिए, अस्थानीय प्राथनाओं को एक बाह्य सर्वर को भेजते हुए, एक "
 "स्थानीय डीएनएस सेवा प्रदान करेगी।"
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "आप क्या करना चाहते है:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr "उस होस्ट का चयन जिसे आप निम्नलिखित सूची में से हटाना चाहते है।"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "विद्यमान डीएनएस संरचना में से एक होस्ट को हटाना। "
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "होस्ट को हटाना"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "कम्प्यूटर का नाम:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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 "
@@ -328,12 +359,12 @@ msgstr ""
 "एक दास नाम-सर्वर आपके मुख्य नाम-सर्वर का कुछ भार हल्का करेगा,और उस स्थिति में जब आपके "
 "मास्टर सर्वर तक पहुँच सम्भव ना हो, तब एक बैक-अप सर्वर की भांति भी कार्य करेगा ।"
 
-#: ../dns_wizard/Bind.pm:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "स्वामी डीएनएस सर्वर का आईपी पता:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -341,11 +372,11 @@ msgstr ""
 "अग्रप्रेषण सिर्फ़ उन प्रश्नों के लिए होता है, जिनके लिए सर्वर प्राधिकारपूर्ण नहीं हैऔर उसके कैश "
 "में उत्तर नहीं है।"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr "आपके अग्रप्रेषणकर्ता का आईपी"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
@@ -353,22 +384,22 @@ msgstr ""
 "तो यदि आपको इसकी आवश्यकता है और आप अपने अग्रप्रेषणकर्ता का आईपी जानते है,तो इसका आईपी "
 "पता बतायें, यदि आप नहीं जानते है तो खाली छोड़ दें"
 
-#: ../dns_wizard/Bind.pm:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "बाह्य डीएनएस:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr "खोज डोमेन को जोड़ना"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 "इस सर्वर का डोमेननाम को स्वतः ही जोड़ा गया, और आपकोयहाँ जोड़ने की आवश्यकता नहीं है।"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -379,27 +410,27 @@ msgstr ""
 "होता है । डिफ़ाल्ट के तौर पर, इसमें सिर्फ़ स्थानीय डोमेननाम होता है । इच्छ्ति डोमेन खोज पथ "
 "कोऔर उसके बाद खोज-कुँजी-शब्दों को सूचीबद्व करके, इसे परिवर्तित किया जा सकता है"
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr "खोजने के लिए डिफ़ाल्ट डोमेन नाम:"
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "आपके आगे-भेजे-जाने-वाले-के-लिए, यह एक मान्य आई पता नहीं है...जारी रखने के लिए अगला बटन "
 "को दबायें"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 "यह एक मान्य स्वामी डीएनएस आईपी पता नहीं है...जारी रखने के लिए अगला बटन को दबायें"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr "यह एक मान्य आईपी पता नहीं है...जारी रखने के लिए अगला बटन को दबायें"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -407,18 +438,18 @@ msgstr ""
 "ऐसा लगता है कि होस्ट पहिले से ही आपके डीएनएस संरचना में है...अगला बटन को जारी रखने के "
 "लिए दबायें"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "त्रुटि:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 "ऐसा लगता है कि यह आपके डीएनएस संरचना में नहीं है...अगला बटन को जारी रखने के लिए दबायें"
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -426,7 +457,7 @@ msgstr ""
 "ऐसा लगता है कि किसी भी डीएनएस सर्वर को विजार्ड द्वारा स्थापित किया गया है ।कॄपया "
 "डीएनएस विजार्ड को चलायें: Master DNS server (ंमास्टर डीएनएस सर्वर) ।"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
@@ -434,60 +465,60 @@ msgstr ""
 "ऐसा लगता है कि आप एक मास्टर डीएनएस सर्वर नहीं है, बल्कि सिर्फ़ एक दास-सर्वर है ।अतैव मै "
 "होस्ट को जोड़/हटा नहीं सकता हूँ ।"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr "ठीक है, अब आपके डीएनएस दास संरचना का निर्माण किया जा रहा है"
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "इस संरचना के साथ:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr "इस पहचान से साथ ग्राहक को आपके डीएनएस से जोड़ा जायेगा"
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "कम्प्य़ूटर का नाम:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "कम्प्यूटर का आईपी पता:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr "इस पहचान से साथ ग्राहक को आपके डीएनएस से हटाया जायेगा"
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr "निम्नलिखित संरचना के साथ, डीएनएस सर्वर अब संरचित होने ही जा रहा है"
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "सर्वर होस्ट का नाम:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr "डोमेन का नाम:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr "विजार्ड ने होस्ट को सफ़लतापूर्वक आपके डीएनएस में जोड़ा ।"
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr "विजार्ड ने होस्ट को सफ़लतापूर्वक आपके डीएनएस में से हटाया ।"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "विजार्ड ने होस्ट को सफ़लतापूर्वक आपके सर्वर की डीएनएस सेवा को संरचित कर दिया है।"
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "आपके तंत्र को एक स्वामी डीएनएस सर्वर की भांति संरचित किया जा रहा है ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "आपके तंत्र को एक दास डीएनएस सर्वर की भांति संरचित किया जा रहा है ..."
 
@@ -572,28 +603,24 @@ msgstr "संसाधन असफ़ल रहा"
 msgid "FTP wizard"
 msgstr "एफ़टीपी जादूगरी"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "एफ़टीपी सर्वर संरचना जादूगरी"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "यह जादूगरी आपके नेटवर्क के लिए एक एफ़टीपी सर्वर को संरचित करने में सहायता प्रदान करेगा।"
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "बक्से को चिंहित ना करें, यदि आप आपके एफ़टीपी सर्वर को शुरू नहीं करना चाहते है।"
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "एफ़टीपी सर्वर"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "चयन करें जिस प्रकार की एफ़टीपी सेवा को आप सक्रिय करना चाहते है:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -601,78 +628,88 @@ msgstr ""
 "आपका सर्वर, एक एफ़टीपी सर्वर की भांति आपके आंतरिक नेटवर्क (इन्ट्रानेट) की तरफ़ व्यवहार कर "
 "सकता हैऔर इन्टरनेट के लिए एक एफ़टीपी सर्वर की भांति।"
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "एफ़टीपी सर्वर को इन्ट्रानेट के लिए समर्थ बनाये"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "एफ़टीपी सर्वर को इन्टरनेट के लिए समर्थ बनाये"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Admin Email: email address of FTP administrator."
 msgstr "विपत्र प्रबंध: एफ़टीपी रखवाले का विपत्र पता ।"
 
-#: ../ftp_wizard/Proftpd.pm:90
+#: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Allow FXP: allow file transfer via other ftp."
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
+msgstr ""
+"एफ़टीपी को पुनः आरंभ करने की अनुमति: एफ़टीपी सर्वर पर अपलोड या डॉउनलोड को पुनः आरंभ "
+"करने की अनुमति देना"
+
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr "एफ़एक्सपी अनुमति: संचिका हस्तांतरण को अन्य एफ़टीपी द्वारा अनुमति।"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr "सीएचरूट होम उपयोगकर्ता: उपयोगकर्ता को उनकी गृह निर्देशिका में सीमित करना।"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "FTP Proftpd server options"
 msgstr "एफ़टीपी प्रोएफ़टीपीडी सर्वर के विकल्प"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Permit root login: allow root to log on FTP server."
 msgstr "रूट संत्रारम्भ को आज्ञापत्र: रूट को एफ़टीपी सर्वर पर लॉग करने की अनुमति।"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
-msgstr ""
-"एफ़टीपी को पुनः आरंभ करने की अनुमति: एफ़टीपी सर्वर पर अपलोड या डॉउनलोड को पुनः आरंभ "
-"करने की अनुमति देना"
-
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+#, fuzzy
+msgid "Admin email:"
 msgstr "विपत्र प्रबंध"
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+#, fuzzy
+msgid "Permit root Login:"
 msgstr "रूट संत्रारम्भ को आज्ञापत्र"
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+#, fuzzy
+msgid "Chroot Home user:"
 msgstr "सीएचरूट होम उपयोगकर्ता"
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+#, fuzzy
+msgid "Allow FTP resume:"
 msgstr "एफ़टीपी को पुनः आरंभ करने की अनुमति"
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
 msgstr "एफ़एक्सपी को अनुमति"
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"चेतावनी\n"
-"आप डीएचसीपी में है, सर्वर इस संरचना के साथ हो सकता है कि कार्य ना करें ।"
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "क्षमा करें, यह करने के लिए आपको महा-उपयोगकर्ता होना चाहिए..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "एफ़टीपी सर्वर को संरचित किया जा रहा है"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -680,7 +717,7 @@ msgstr ""
 "इस जादूगरी ने निम्नलिखित मानकों को एकत्रित कर लिया है\n"
 "जो कि आपके एफ़टीपी सर्वर को संरचित करने के लिए आवश्यक है"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -688,35 +725,35 @@ msgstr ""
 "इस मूल्यों को स्वीकार करने के लिए, और अपने सर्वर को संरचित करने के लिए, अगला बटन पर "
 "क्लिक करें या पिछ्ला बटन का उपयोग करके उन्हें शुद्ध करें"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "निष्क्रिय"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "सक्रिय"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "इन्ट्रानेट एफ़टीपी सर्वर:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "आंतरिक एफ़टीपी सर्वर:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr "विपत्र प्रबंध"
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr "रूट संत्रारम्भ को आज्ञापत्र"
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr "सीएचरूट होम उपयोगकर्ता"
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr "एफ़टीपी को पुनः आरंभ करने की अनुमति"
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr "एफ़एक्सपी को अनुमति"
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "इस जादूगरी ने आपका इन्ट्रानेट/इन्टरनेट एफ़टीपी सर्वर को सफ़लता-पूर्वक संरचित दिया है"
 
@@ -768,7 +805,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr "गंतव्य निर्देशिका पहिले से उपयोग में है, कॄपया किसी अन्य का चयन करें।"
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr "मै आपके संसाधन सर्वर को इन पैरामीटरों के साथ संरचित करूगा"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1039,7 +1076,7 @@ msgstr ""
 "इस जादूगरी ने निम्नलिखित मानकों को एकत्रित कर लिया है \n"
 "जो कि आपके इन्टरनेट समाचार सेवा को संरचित करने के लिए आवश्यक है:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1321,33 +1358,48 @@ msgstr "आपके तंत्र को एक एनआईएस ग्र�
 msgid "Nis Client"
 msgstr "एनआईएस ग्राहक"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "पोस्टफ़िक्स जादूगरी"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "विपत्र सर्वर"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "विपत्र सर्वर"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "इन्टरनेट विपत्र संरचना जादूगरी"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "यह जादूगरी आपके नेटवर्क के लिए इन्टरनेट विपत्र सेवाओं को संरचित करने के लिए सहायता करेगी।"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "बर्हिगमन विपत्र पता"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 "इसका चयन लगातार उस पते के साथ होना चाहिए, जिसे आप आगमन विपत्र के लिए कर रहे है।"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1355,19 +1407,27 @@ msgstr ""
 "आप पते का प्रकार का चयन कर सकते है जिसे बर्हिगमन विपत्र  \"द्वारा:\" और \"को-उत्तर\" "
 "प्रविष्टियों में दिखायेगी।"
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "मासक्यूरेड डोमेन का नाम"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "चेतावनी:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "आपने विपत्र द्वार के लिए एक शून्य पता बताया है।"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1376,15 +1436,21 @@ msgstr ""
 "विपत्र भेजने की अनुमति नहीं देगी। जारी रखने के लिए अगला बटन को दबायें, या एक मूल्य को "
 "बताने के लिए, पिछला को।"
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "मासक्यूरेड अच्छा नहीं है!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "इन्टरनेट विपत्र द्वार"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1394,7 +1460,7 @@ msgstr ""
 "यदि आपका प्रदानकर्ता \"प्रदानकर्ता.कॉम\" है, तो इन्टरनेट विपत्र सर्वर सामान्यता "
 "\"एसएमटीपी.प्रदानकर्ता.कॉम\" होगा।"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1402,30 +1468,31 @@ msgstr ""
 "आपका सर्वर बाहर जाने वाली को एक विपत्र द्वार से भेजेगी, यह अंतिम प्रतिपादन का ख्याल "
 "रखेगी।"
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "विपत्र सर्वर का नाम:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+#, fuzzy
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr "$myhostname को सबसे अंत में जोड़ना डिफ़ाल्ट है जो कि लघु स्थलों के लिए उचित है।"
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 "myorigin पैरामीटर डोमेन को बताता है जिससे स्थानीय-प्रेषित विपत्र आते हुए प्रतीत होते है"
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr "माईऑरिजिन् (myorigin):"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "इन्टरनेट विपत्र की संरचना की जा रही है"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1433,28 +1500,34 @@ msgstr ""
 "यह जादूगरी निम्नलिखित मानकों को एकत्रित करेगी जो कि आपकी इन्टरनेट विपत्र सेवा कोसंरचित "
 "करने में आवश्यक होगें:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "पते का प्रकार"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr "माईऑरिजिन् (myorigin)"
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "इस जादूगरी ने आपके सर्वर की इन्टरनेट विपत्र सेवा को सफ़लता-पूर्वक संरचित कर दिया है।"
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "आपके पोस्टफ़िक्स सर्वर को संरचित किया जा रहा है ।"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "पोस्टफ़िक्स सर्वर"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "आपके पोस्टफ़िक्स सर्वर को संरचित किया जा रहा है ।"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "स्थानीय होस्ट - पहूँच सिर्फ़ इस सर्वर तक ही सीमित"
@@ -1633,7 +1706,8 @@ msgid "Access Control:"
 msgstr "पहूँच नियंत्रण:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "जादूगरी ने आपके प्रोक्सी सर्वर को सफ़लता-पूर्वक संरचित कर दिया है।"
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1648,15 +1722,6 @@ msgstr "एसक्वीड प्रोक्सी"
 msgid "PXE Wizard"
 msgstr "पीएक्सई विजार्ड"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-"आपको अपने डोमेननाम को पुनः ठीक करने की आवश्यकता है। एक डीएनएस सर्वर के लिए, आपको एक "
-"ऐसे ठीक डोमेन के नामकी आवश्यकता है जो कि स्थानीय डोमेन के समकक्ष ना हो या कुछ-नहीं हो । "
-"ठीक करने के लिए ड्रैककनेक्ट को आरम्भ करें ।"
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "पीएक्सई सर्वर को स्थापित करें"
@@ -2380,6 +2445,25 @@ msgstr "उपयोगकर्ता निर्देशिका:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "इस जादूगरी ने आपका इन्ट्रानेट/इन्टरनेट वेब सर्वर को सफ़लता-पूर्वक संरचित कर दिया है"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "बक्से को चिंहित ना करें, यदि आप आपके एफ़टीपी सर्वर को शुरू नहीं करना चाहते है।"
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "चेतावनी\n"
+#~ "आप डीएचसीपी में है, सर्वर इस संरचना के साथ हो सकता है कि कार्य ना करें ।"
+
+#~ msgid ""
+#~ "You need to readjust your domainname. For a DNS server you need a correct "
+#~ "domainname, not egal to localdomain or none. Launch drakconnect to adjust "
+#~ "it."
+#~ msgstr ""
+#~ "आपको अपने डोमेननाम को पुनः ठीक करने की आवश्यकता है। एक डीएनएस सर्वर के लिए, आपको "
+#~ "एक ऐसे ठीक डोमेन के नामकी आवश्यकता है जो कि स्थानीय डोमेन के समकक्ष ना हो या कुछ-"
+#~ "नहीं हो । ठीक करने के लिए ड्रैककनेक्ट को आरम्भ करें ।"
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/hu.po b/po/hu.po
index 768dd1fd..4221089d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-15 00:50+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Be�ll�t�svar�zsl�"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -36,9 +36,9 @@ msgstr "Be�ll�t�svar�zsl�"
 msgid "Warning."
 msgstr "Figyelmeztet�s"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -46,12 +46,12 @@ msgid "Error."
 msgstr "Hiba."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -95,15 +95,15 @@ 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."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "A kliens azonos�t�sa:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -111,7 +111,7 @@ msgid ""
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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, "
@@ -121,22 +121,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "A g�p neve:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "A g�p IP-c�me:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Figyelmeztet�s"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -144,7 +145,7 @@ msgstr ""
 "kiszolg�l� nem m�k�dik az aktu�lis be�ll�t�ssal."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -191,7 +192,7 @@ msgstr "A kliens IP-c�me:"
 msgid "The wizard successfully added the client."
 msgstr "A var�zsl� sikeresen felvette a klienst."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP-var�zsl�"
 
@@ -210,51 +211,60 @@ msgstr ""
 "be�ll�t�s�hoz."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "A DHCP �ltal haszn�lt c�mtartom�ny"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Jel�lje ki azon c�mtartom�nyt, amelyb�l a DHCP szolg�ltat�s a "
 "munka�llom�soknak oszt ki c�meket. Ha nincsenek k�l�nlegesebb ig�nyei, "
 "elfogadhatja a felk�n�lt �rt�keket."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Legalacsonyabb IP-c�m:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Legmagasabb IP-c�m:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "A megadott IP-c�mtartom�ny helytelen"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "A megadott IP-c�mtartom�ny nincs benne a h�l�zati c�mtartom�nyban"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "A kiszolg�l� IP-c�me nem lehet benne a tartom�nyban"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "A DHCP-kiszolg�l� be�ll�t�sa"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -262,11 +272,31 @@ msgstr ""
 "A var�zsl� a k�vetkez�, a DHCP-szolg�ltat�s be�ll�t�s�hoz sz�ks�ges "
 "param�tereket gy�jt�tte �ssze:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "kikapcsolva"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "bekapcsolva"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l� DHCP-szolg�ltat�sait."
 
@@ -274,20 +304,20 @@ msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l� DHCP-szolg�ltat�sait."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS-kiszolg�l�"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS-kiszolg�l�"
@@ -325,72 +355,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Letiltott g�pek:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "A meghat�rozott tartom�nyn�v"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "A DNS-kiszolg�l� be�ll�t�sa"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "K�ls� �tj�r�"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -398,117 +429,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "�rv�nytelen c�m. A folytat�shoz nyomja le a \"K�vetkez�\" gombot."
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "�rv�nytelen c�m. A folytat�shoz nyomja le a \"K�vetkez�\" gombot."
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "�rv�nytelen c�m. A folytat�shoz nyomja le a \"K�vetkez�\" gombot."
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Hiba."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS-var�zsl� (be�ll�t�s)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "A meghat�rozott tartom�nyn�v"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "A kiszolg�l� IP-c�me:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Kiszolg�l�n�v:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "A var�zsl� sikeresen felvette a klienst."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "A var�zsl� sikeresen felvette a klienst."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l� DNS-szolg�ltat�sait."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "A DNS-kiszolg�l� be�ll�t�sa"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "A DNS-kiszolg�l� be�ll�t�sa"
@@ -609,30 +640,25 @@ msgstr "A telep�t�s nem siker�lt."
 msgid "FTP wizard"
 msgstr "FTP-var�zsl�"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP-kiszolg�l�-be�ll�t�svar�zsl�"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Ez a var�zsl� seg�ts�get ny�jt az FTP-kiszolg�l�nak a h�l�zathoz val� "
 "be�ll�t�s�hoz."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Ha nem k�v�nja aktiv�lni az FTP-kiszolg�l�t, ne jel�lje ki egyik opci�t sem."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP-kiszolg�l�"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "V�lassza ki, milyen fajta FTP-szolg�ltat�st szeretne aktiv�lni:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -640,76 +666,76 @@ msgstr ""
 "Az �n kiszolg�l�ja ny�jthat FTP-szolg�ltat�sokat a bels� h�l�zat (intranet) "
 "fel� �s az internet fel� is."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Az FTP-kiszolg�l� bekapcsol�sa az intranet sz�m�ra"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Az FTP-kiszolg�l� bekapcsol�sa az internet sz�m�ra"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Enged�lyezett g�pek:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Figyelmeztet�s\\nJelenleg DHCP-m�dban van, ez�rt elk�pzelhet�, hogy a "
-"kiszolg�l� nem m�k�dik az aktu�lis be�ll�t�ssal."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "A m�velethez rendszergazdai jogosults�g sz�ks�ges."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Az FTP-kiszolg�l� be�ll�t�sa"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -718,7 +744,7 @@ msgstr ""
 "A var�zsl� a k�vetkez�, az FTP-kiszolg�l� be�ll�t�s�hoz sz�ks�ges "
 "param�tereket gy�jt�tte �ssze:"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -727,35 +753,35 @@ msgstr ""
 "Az �rt�kek elfogad�s�hoz �s a kiszolg�l� be�ll�t�s�hoz nyomja le a "
 "\"K�vetkez�\" gombot; jav�t�shoz az \"El�z�\" gombot."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "kikapcsolva"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "bekapcsolva"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranetes FTP-kiszolg�l�:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internetes FTP-kiszolg�l�:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "A var�zsl� sikeresen be�ll�totta az intranetes/internetes FTP-kiszolg�l�t."
@@ -804,7 +830,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1091,7 +1117,7 @@ msgstr ""
 "A var�zsl� a k�vetkez�, az internetes h�rszolg�ltat�s be�ll�t�s�hoz "
 "sz�ks�ges param�tereket gy�jt�tte �ssze:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1374,33 +1400,48 @@ msgstr ""
 msgid "Nis Client"
 msgstr "A kliens IP-c�me:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix-var�zsl�"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Levelez�kiszolg�l� neve:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Levelez�kiszolg�l� neve:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internetes levelez�si be�ll�t�svar�zsl�"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Ez a var�zsl� seg�ts�get ny�jt a h�l�zat internetes "
 "levelez�szolg�ltat�sainak be�ll�t�s�hoz."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Kimeneti lev�lc�m"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Ez a bej�v� levelekhez haszn�lt c�mnek megfelel�en v�lasztand� ki."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1409,19 +1450,27 @@ msgstr ""
 "\" (\"From\") �s \"V�laszc�m\" (\"Reply-to\") mez�iben."
 
 # a kimen� emailekhez haszn�land� domainnevet kell megadni az ut�na lev� mez�ben
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Tartom�nyn�v a maszkol�shoz:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Figyelmeztet�s:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "�res c�met adott meg a levelez��tj�r�nak."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1430,15 +1479,21 @@ msgstr ""
 "val� lev�lk�ld�sre. A folytat�shoz nyomja le a \"K�vetkez�\" gombot; egy "
 "�rt�k megad�s�hoz az \"El�z�\" gombot."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "A maszkol�s (masquerade) nem megfelel�."
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internetes levelez��tj�r�"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1449,7 +1504,7 @@ msgstr ""
 "\", akkor az internetes levelez�kiszolg�l�� �ltal�ban \"smtp.szolg�ltat�.com"
 "\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1457,29 +1512,29 @@ msgstr ""
 "A kiszolg�l� a kimen� leveleket egy levelez�si �tj�r� (mail gateway) fel� "
 "fogja elk�ldeni, amely a v�gs� k�zbes�t�sr�l gondoskodni fog."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Levelez�kiszolg�l� neve:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Az internetes levelez�s be�ll�t�sa"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1487,31 +1542,36 @@ msgstr ""
 "A var�zsl� a k�vetkez�, az internetes levelez�szolg�ltat�s be�ll�t�s�hoz "
 "sz�ks�ges param�tereket gy�jt�tte �ssze:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "A c�m form�tuma"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "A var�zsl� sikeresen be�ll�totta az �n kiszolg�l�j�n az internetes "
 "levelez�szolg�ltat�st."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Az FTP-kiszolg�l� be�ll�t�sa"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Postfix"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Az FTP-kiszolg�l� be�ll�t�sa"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Helyi g�p - az el�r�s csak err�l a kiszolg�l�r�l lehets�ges"
@@ -1693,7 +1753,8 @@ msgid "Access Control:"
 msgstr "Hozz�f�r�skezel�s:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "A var�zsl� sikeresen be�ll�totta a proxy-kiszolg�l�t."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1711,12 +1772,6 @@ msgstr "Squid"
 msgid "PXE Wizard"
 msgstr "FTP-var�zsl�"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2463,6 +2518,19 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "A var�zsl� sikeresen be�ll�totta az intranetes/internetes webkiszolg�l�t."
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Ha nem k�v�nja aktiv�lni az FTP-kiszolg�l�t, ne jel�lje ki egyik opci�t "
+#~ "sem."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Figyelmeztet�s\\nJelenleg DHCP-m�dban van, ez�rt elk�pzelhet�, hogy a "
+#~ "kiszolg�l� nem m�k�dik az aktu�lis be�ll�t�ssal."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/id.po b/po/id.po
index 4f2ec79f..89e19431 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-03-13 17:14+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Nusantara - Bahasa Indonesia <id@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Dukun Konfigurasi"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -28,9 +28,9 @@ msgstr "Dukun Konfigurasi"
 msgid "Warning."
 msgstr "Peringatan"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr "Error Wizard."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -84,22 +84,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Dukun ini membantu Anda menambahkan klien baru di DNS lokal Anda."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identifikasi klien:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +108,30 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nama mesin:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Nomor IP mesin:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Peringatan\\nAnda ada di dhcp, server mungkin tak jalan dg konfigurasi Anda."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -175,7 +176,7 @@ msgstr "IP Klien:"
 msgid "The wizard successfully added the client."
 msgstr "Sang dukun sukses menambah klien."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Konfigurator DHCP"
 
@@ -191,60 +192,89 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Alat ini membantu konfigurasi layanan DHCP server Anda."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Kisaran alamat dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Pilih kisaran alamat stasiunkerja layanan DHCP; kecuali ada maksud khusus, "
 "terimalah nilai yg disarankan."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Alamat IP Terendah:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Alamat IP Tertinggi:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Kisaran IP tak benar"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Kisaran IP tak berada dalam kisaran alamat jaringan server"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP server tak boleh berupa kisaran"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurasi Server DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "Parameter konfigurasi layanan DHCP telah terkumpul:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "non aktif"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "aktif"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Layanan DHCP server sukses dikonfigurasikan."
 
@@ -252,20 +282,20 @@ msgstr "Layanan DHCP server sukses dikonfigurasikan."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Server NFS"
@@ -302,72 +332,73 @@ msgstr ""
 "memberikan layanan DNS lokal utk nama komputer lokal, dg permintaan non-"
 "lokal diteruskan ke DNS luar."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Tolak host:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nama domain terhitung"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurasi Server DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Gateway eksternal"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -375,117 +406,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, 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:172
+#: ../dns_wizard/Bind.pm:171
 #, 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:177
+#: ../dns_wizard/Bind.pm:176
 #, 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Error Wizard."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Konfigurator DNS"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Nama domain terhitung"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Alamat IP Server:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Nama Server:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Sang dukun sukses menambah klien."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Sang dukun sukses menambah klien."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Layanan DNS server Anda sukses dikonfigurasikan."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurasi Server DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurasi Server DNS"
@@ -585,27 +616,23 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "Konfigurator FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Dukun Konfigurasi Server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Alat ini membantu konfigurasi Server FTP jaringan Anda."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Jangan tandai kotak jika Anda tak ingin mengaktifkan Server FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Pilih jenis layanan FTP yg ingin diaktifkan:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -613,82 +640,83 @@ msgstr ""
 "Server Anda dapat berperan sbg Server FTP terhadap jaringan internal "
 "(intranet) dan Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Aktifkan Server FTP utk Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Aktifkan Server FTP Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Izinkan host:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Peringatan\\nAnda ada di dhcp, server mungkin tak jalan dg konfigurasi Anda."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Maaf, Anda harus jadi root..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Konfigurasi Server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "Parameter konfigurasi Server FTP telah terkumpul"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -697,35 +725,35 @@ msgstr ""
 "Klik Maju utk menerima nilai dan mengkonfigurasikan server, atau Kembali utk "
 "membetulkannya."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "non aktif"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "aktif"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Server FTP Intranet:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Server FTP Internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Server FTP Intranet/Internet sukses dikonfigurasikan"
 
@@ -773,7 +801,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1055,7 +1083,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr "Parameter konfigurasi Layanan Berita Internet telah terkumpul:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1332,31 +1360,46 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP Klien:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Konfigurator Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Nama Server Mail:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Nama Server Mail:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Konfigurator Mail Internet"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "Alat ini membantu konfigurasi layanan Mail Internet jaringan Anda."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Alamat Mail Keluar"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Ini harus dipilih konsisten dg alamat yg Anda pakai utk mail masuk."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1364,20 +1407,28 @@ msgstr ""
 "Anda dapat memilih jenis alamat yg tampak di kolom \"From:\" dan \"Reply-to"
 "\" mail keluar."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Nama domain terhitung"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Peringatan:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Anda memasukkan alamat kosong utk gateway mail."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1385,15 +1436,21 @@ msgstr ""
 "Pilihan Anda dapat diterima, tapi Anda takkan dapat mengirim mail ke luar "
 "jaringan lokal. Tekan Maju utk melanjutkan, atau Kembali utk mengisi nilai."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Topeng tak bagus!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Gateway Mail Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1403,7 +1460,7 @@ msgstr ""
 "jika provider Anda \"provider.com\", server mail internet biasanya \"smtp."
 "provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1411,57 +1468,62 @@ msgstr ""
 "Server Anda akan mengirim mail keluar via gateway mail, yg bertanggung jawab "
 "atas pengiriman akhir."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nama Server Mail:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurasi Mail Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "Parameter konfigurasi Layanan Mail Internet telah terkumpul:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Format Alamat"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Layanan Mail Internet server Anda sukses dikonfigurasikan."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Konfigurasi Server FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server Cetak:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Konfigurasi Server FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Host lokal - akses terbatas pada server ini saja"
@@ -1639,7 +1701,8 @@ msgid "Access Control:"
 msgstr "Kontrol Akses:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Server proksi Anda sukses dikonfigurasikan."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1657,12 +1720,6 @@ msgstr "Konfigurator squid"
 msgid "PXE Wizard"
 msgstr "Konfigurator FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2379,6 +2436,17 @@ msgstr "Direktori pengguna:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Server Web Intranet/Internet sukses dikonfigurasikan"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Jangan tandai kotak jika Anda tak ingin mengaktifkan Server FTP."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Peringatan\\nAnda ada di dhcp, server mungkin tak jalan dg konfigurasi "
+#~ "Anda."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/is.po b/po/is.po
index 9b1b2144..9b1dd7be 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-13 21:31GMT\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Stillingarálfur"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,9 +31,9 @@ msgstr "Stillingarálfur"
 msgid "Warning."
 msgstr "Aðvörun"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "Villa."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -81,47 +81,48 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -164,7 +165,7 @@ msgstr ""
 msgid "The wizard successfully added the client."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr ""
 
@@ -179,6 +180,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr ""
 
@@ -186,48 +191,72 @@ msgstr ""
 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."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "óvirkt"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "virkt"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 
@@ -235,20 +264,20 @@ msgstr ""
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Vefmiðlari"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Vefmiðlari"
@@ -279,70 +308,71 @@ msgid ""
 "with non-local requests forwarded to an outside DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Notandanafn:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Vefmiðlari"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -350,108 +380,108 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Villa."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Stillingarálfur"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Notandanafn:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr ""
 
@@ -548,139 +578,137 @@ msgstr ""
 msgid "FTP wizard"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "óvirkt"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "virkt"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr ""
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 
@@ -728,7 +756,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -994,7 +1022,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1257,125 +1285,158 @@ msgstr ""
 msgid "Nis Client"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Vefmiðlari"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Vefmiðlari"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Aðvörun:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Vefmiðlari"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+msgid "Configuring your Postfix server....."
+msgstr ""
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr ""
@@ -1531,7 +1592,7 @@ msgid "Access Control:"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+msgid "The wizard have successfully configured your proxy server."
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1546,12 +1607,6 @@ msgstr ""
 msgid "PXE Wizard"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
diff --git a/po/it.po b/po/it.po
index a76ca305..af90593e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-11-25 18:51+0000\n"
 "Last-Translator: Marco De Vitis <mdv@spin.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "assistente di configurazione"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,9 +32,9 @@ msgstr "assistente di configurazione"
 msgid "Warning."
 msgstr "Attenzione."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -42,12 +42,12 @@ msgid "Error."
 msgstr "Errore."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -90,15 +90,15 @@ msgstr ""
 "Questo assistente ti aiuter� ad aggiungere un nuovo client ai dati del "
 "servizio DNS locale."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identificazione client"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -107,7 +107,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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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, "
@@ -117,29 +117,30 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nome del computer:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Indirizzo IP del computer:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Stai utilizzando il DHCP, il server potrebbe non funzionare con questa "
 "configurazione."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -185,7 +186,7 @@ msgstr "Indirizzo del client:"
 msgid "The wizard successfully added the client."
 msgstr "L'assistente ha aggiunto con successo il client."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Configurazione DHCP"
 
@@ -203,50 +204,59 @@ msgstr ""
 "Questo assistente ti aiuter� a configurare il servizio DHCP sul server."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Intervallo di indirizzi IP usati dal server DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Specifica l'intervallo di indirizzi IP disponibili per l'assegnazione alle "
 "macchine da parte del servizio DHCP; se non hai necessit� particolari, puoi "
 "tranquillamente accettare i valori proposti."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Indirizzo minimo:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Indirizzo massimo:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Interfaccia sulla quale deve essere in ascolto il server DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "L'intervallo di indirizzi specificato non � corretto."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "L'intervallo di indirizzi specificato non rientra nell'intervallo di "
 "indirizzi della rete a cui appartiene il server."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "L'indirizzo del server deve essere al di fuori dell'intervallo."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Configurazione del server DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -254,11 +264,31 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "servizio DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "inattivo"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "attivo"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interfaccia:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del servizio DHCP."
@@ -267,20 +297,20 @@ msgstr ""
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Server NFS"
@@ -318,72 +348,73 @@ msgstr ""
 "mentre le richieste di indirizzi esterni saranno reindirizzate ad un "
 "servizio DNS esterno."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "hosts deny:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nome di dominio calcolato"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Configurazione del server DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Gateway esterno"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -391,118 +422,118 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Questo non � un indirizzo valido... fai clic su \"Avanti\""
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Questo non � un indirizzo valido... fai clic su \"Avanti\""
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Errore"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS (configurazione)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Nome di dominio calcolato"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Indirizzo IP del server:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Nome del Server:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "L'assistente ha aggiunto con successo il client."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "L'assistente ha aggiunto con successo il client."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurazione del server DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurazione del server DNS"
@@ -595,27 +626,23 @@ msgstr "installazione non riuscita"
 msgid "FTP wizard"
 msgstr "Configurazione FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Assistente di configurazione del server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Questo assistente ti aiuter� a configurare un server FTP per la rete."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Non selezionare alcuna opzione se non vuoi attivare il server FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Seleziona il tipo di servizio FTP che vuoi attivare."
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -623,76 +650,76 @@ msgstr ""
 "Il server pu� agire come server FTP sia verso la rete locale (Intranet) che "
 "verso Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Attiva il server FTP per l'Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Attiva il server FTP per Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "hosts allow:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Attenzione:\n"
-"stai utilizzando il DHCP, il server potrebbe non funzionare con questa "
-"configurazione."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Devi essere root per poter usare questo assistente..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Configurazione del server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -700,7 +727,7 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri\n"
 "per la configurazione del server FTP."
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -708,35 +735,35 @@ msgstr ""
 "Per confermare questi valori e configurare il server premi \"Avanti\"; "
 "altrimenti, se vuoi modificarli, premi \"Indietro\"."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "inattivo"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "attivo"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Server FTP per Intranet:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Server FTP per Internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server FTP per "
@@ -786,7 +813,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1072,7 +1099,7 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "servizio di news."
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1356,27 +1383,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Indirizzo del client:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Configurazione Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Server di posta"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Server di posta"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Assistente di configurazione dei servizi di posta elettronica"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Questo assistente ti aiuter� a configurare i servizi di posta elettronica "
 "per la rete locale."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Indirizzo di posta in uscita"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1384,7 +1426,7 @@ msgstr ""
 "Questo parametro deve essere scelto coerentemente con l'indirizzo usato per "
 "la posta in arrivo."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1392,19 +1434,27 @@ msgstr ""
 "Puoi specificare il tipo di indirizzo che sar� visualizzato nei campi \"From:"
 "\" e \"Reply-To:\" della posta in uscita."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Nome dominio in uscita (masquerade):"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Attenzione:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Hai lasciato vuoto l'indirizzo del gateway di posta."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1413,15 +1463,21 @@ msgstr ""
 "spedire posta al di fuori della rete locale. Usa \"Avanti\" per proseguire, "
 "o \"Indietro\" per immettere un nome."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Dominio in uscita non valido!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Gateway di posta per Internet:"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1431,7 +1487,7 @@ msgstr ""
 "tipodominio\"; per esempio, se il tuo provider � \"provider.it\", di solito "
 "il server di posta elettronica � \"smtp.provider.it\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1439,29 +1495,29 @@ msgstr ""
 "Il tuo server invier� la posta in uscita attraverso un gateway di posta, che "
 "si occuper� di recapitarla a destinazione."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nome del server di posta:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Configurazione della posta elettronica"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1469,31 +1525,36 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "servizio di posta elettronica."
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Forma dell'indirizzo:"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del servizio di "
 "posta elettronica per Internet sul server."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Configurazione del server FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server di stampa:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Configurazione del server FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - accesso limitato a questo server"
@@ -1675,7 +1736,8 @@ msgid "Access Control:"
 msgstr "Controllo dell'accesso:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server proxy."
 
@@ -1694,12 +1756,6 @@ msgstr "Configurazione di Squid"
 msgid "PXE Wizard"
 msgstr "Configurazione FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2433,6 +2489,17 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server web"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Non selezionare alcuna opzione se non vuoi attivare il server FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Attenzione:\n"
+#~ "stai utilizzando il DHCP, il server potrebbe non funzionare con questa "
+#~ "configurazione."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/ja.po b/po/ja.po
index 63a14805..b97b0e01 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-11-19 03:24+0900\n"
 "Last-Translator: UTUMI Hirosi <*>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "設定ウィザード"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -28,9 +28,9 @@ msgstr "設定ウィザード"
 msgid "Warning."
 msgstr "警告"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -38,12 +38,12 @@ msgid "Error."
 msgstr "エラー"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -83,22 +83,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "このウィザードではローカルDNSに新規クライアントを追加します。"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(名前の後のドメインは不要です)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "クライアントの識別:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +108,30 @@ msgstr ""
 "clientname.company.net)。それぞれのマシンには個別の\n"
 "IPアドレスが必要です。"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "マシンの名前:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "マシンのIP番号:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "警告"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "現在DHCPを使っています。お使いの設定ではサーバが動かない\n"
 "かもしれません。"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -172,7 +173,7 @@ msgstr "クライアントのIP:"
 msgid "The wizard successfully added the client."
 msgstr "クライアントを追加しました。"
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCPウィザード"
 
@@ -187,58 +188,87 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "このウィザードでサーバのDHCPサービスを設定します。"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "DHCPで用いるアドレスの範囲"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "DHCPサービスがワークステーションに割り当てるアドレスの\n"
 "範囲を指定してください。特段の必要がなければ、既定値のままに\n"
 "してください。"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "下限のIPアドレス:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "上限のIPアドレス:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "DHCPサーバが参照するインタフェース"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "指定したIPの範囲は不正です。"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "指定したIPアドレスは、サーバアドレスの範囲外です。"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "このサーバのIPはこの範囲にあってはいけない"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCPサーバを設定"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "以下の情報を集めました:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "無効"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "有効"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "インタフェース:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "サーバのDHCPサービスの設定が終わりました。"
 
@@ -246,20 +276,20 @@ msgstr "サーバのDHCPサービスの設定が終わりました。"
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFSサーバ"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFSサーバ"
@@ -296,71 +326,72 @@ msgstr ""
 "This configuration will provide a local DNS service for local computers \n"
 "names, with non-local requests forwarded to an outside DNS."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "拒否ホスト:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "ニュースサーバ名:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNSサーバを設定"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -368,116 +399,116 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "無効なアドレスです..'次へ'を押すと続けます"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "無効なアドレスです..'次へ'を押すと続けます"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "無効なアドレスです..'次へ'を押すと続けます"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "エラー"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS設定ウィザード"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "ニュースサーバ名:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "サーバのバナー:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "クライアントを追加しました。"
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "クライアントを追加しました。"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "サーバのDNSサービスを設定しました。"
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "DNSサーバを設定"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "DNSサーバを設定"
@@ -578,27 +609,23 @@ msgstr "インストール失敗"
 msgid "FTP wizard"
 msgstr "FTPウィザード"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTPサーバの設定ウィザード"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "このウィザードではFTPサーバを設定します。"
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "FTPサーバを動かさない場合は全てのチェックを外してください。"
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTPサーバ"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "動作させるFTPサービスを選んでください:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -606,81 +633,82 @@ msgstr ""
 "サーバは内部ネットワーク(イントラネット)用のFTPサーバと\n"
 "インターネット用のFTPサーバとして動作します。"
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "イントラネット用のFTPサーバ"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "インターネット用のFTPサーバ"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "許可ホスト:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"警告\n"
-"現在DHCPを使っています。サーバが動かないかもしれません。"
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "rootで行ってください.."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTPサーバを設定"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "このウィザードで以下の情報を集めました:"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -688,35 +716,35 @@ msgstr ""
 "これで良ければ'次へ'をクリックしてください。もしくは'戻る'で\n"
 "内容を修正してください。"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "無効"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "有効"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "イントラネットFTPサーバ:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "インターネットFTPサーバ:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "イントラネット/インターネットFTPサーバの設定が終わりました。"
 
@@ -764,7 +792,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1044,7 +1072,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr "このウィザードで以下の情報を集めました:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1318,31 +1346,46 @@ msgstr ""
 msgid "Nis Client"
 msgstr "クライアントのIP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfixメールウィザード"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "メールサーバ名:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "メールサーバ名:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "インターネットメールの設定ウィザード"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "このウィザードではインターネットメールサービスを設定します。"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "送信メールアドレス"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "これは受信メールのアドレスとしても使われます。"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1350,19 +1393,27 @@ msgstr ""
 "送信メールが\"From:\"と\"Reply-to\"欄に表示するアドレスを\n"
 "選ぶことができます。"
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "マスカレードドメイン名:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "警告:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "メールゲートウェイに空のアドレスを入力しています。"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1371,15 +1422,21 @@ msgstr ""
 "ことはできません。'次へ'をクリックすると続けます。修正する\n"
 "場合は'戻る'をクリック"
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "マスカレードが不正"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "インターネットメールゲートウェイ"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1390,63 +1447,68 @@ msgstr ""
 "のときは、インターネットメールサーバは多くの場合\n"
 "\"smtp.provider.com\"のようになります。"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "サーバはメールゲートウェイを通して送信を行います。"
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "メールサーバ名:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "インターネットメールを設定"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "このウィザードで以下の情報を集めました:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "アドレスの形式"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "サーバのインターネットメールサービスを設定しました。"
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTPサーバを設定"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "印刷サーバ:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTPサーバを設定"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "ローカルホスト - アクセス許可をこのサーバのみに限定"
@@ -1617,7 +1679,8 @@ msgid "Access Control:"
 msgstr "アクセス制限:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "プロクシサーバを設定しました。"
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1635,12 +1698,6 @@ msgstr "Squidプロクシウィザード"
 msgid "PXE Wizard"
 msgstr "FTPウィザード"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2361,6 +2418,16 @@ msgstr "ユーザのディレクトリ:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "イントラネット/インターネットウェブサーバを設定しました"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "FTPサーバを動かさない場合は全てのチェックを外してください。"
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "警告\n"
+#~ "現在DHCPを使っています。サーバが動かないかもしれません。"
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/ko.po b/po/ko.po
index 5e0241de..e1284331 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2002-09-09 08:06+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hanafos.com>\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "���� ������"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "���� ������"
 msgid "Warning."
 msgstr "���"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -44,12 +44,12 @@ msgid "Error."
 msgstr "������ ����."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -89,22 +89,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "�� ������� ���� DNS�� �� Ŭ���̾�Ʈ�� �߰��� ���� ���Դϴ�."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(�̸� �ڿ� �������� ���� �ʿ�� �����ϴ�.)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Ŭ���̾�Ʈ �ſ�:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,22 +114,23 @@ msgstr ""
 "��. ��Ʈ������ �� ��ǻ�ʹ� ������ ���е� ������ (������) IP �ּҰ� �Ҵ�Ǿ� "
 "�־�� �մϴ�."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "��ǻ�� �̸�"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "��ǻ�� IP:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "���"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -137,7 +138,7 @@ msgstr ""
 "��."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -183,7 +184,7 @@ msgstr "Ŭ���̾�Ʈ IP:"
 msgid "The wizard successfully added the client."
 msgstr "�� Ŭ���̾�Ʈ�� �߰��Ǿ����ϴ�."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP ������"
 
@@ -199,59 +200,88 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "�� ������� DHCP ���� ������ ���� ���Դϴ�."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "DHCP���� ����� �ּ� ����"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "DHCP�� ��ǻ�͵鿡�� �Ҵ��� �ּ� ������ �����ϼ���; Ư���� ������ ���ٸ�, ����"
 "�� ������ ���� ����� �� �ֽ��ϴ�."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "���� IP �ּ�:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "�ְ� IP �ּ�:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "������ IP ������ �ùٸ��� �ʽ��ϴ�."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "������ IP ������ �ùٸ��� �ʽ��ϴ�."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP ���� ���� ��"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "�����簡 DHCP ���� ������ ���� ����� ���� ������ �����ϴ�:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "����"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "���"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "�����簡 ���������� DHCP ������ �����Ͽ����ϴ�."
 
@@ -259,20 +289,20 @@ msgstr "�����簡 ���������� DHCP ������ �����Ͽ����ϴ�."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS ����"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS ����"
@@ -309,71 +339,72 @@ msgstr ""
 "�� ���� ���� DNS ���񽺸� �����ϰ� �մϴ�. �ܺ� ��ǻ�Ϳ� ���� ��û�� �ܺ� DNS"
 "�� ���޵˴ϴ�."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "���� ������ �̸�"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNS ���� ���� ��"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "�ܺ� ����Ʈ����"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -381,117 +412,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "�ùٸ� �ּҰ� �ƴմϴ�... ����Ϸ��� [����]�� ��������."
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "�ùٸ� �ּҰ� �ƴմϴ�... ����Ϸ��� [����]�� ��������."
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "�ùٸ� �ּҰ� �ƴմϴ�... ����Ϸ��� [����]�� ��������."
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "������ ����."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS ���� ������"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "���� ������ �̸�"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "���� IP �ּ�:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "���� �̸�:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "�� Ŭ���̾�Ʈ�� �߰��Ǿ����ϴ�."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "�� Ŭ���̾�Ʈ�� �߰��Ǿ����ϴ�."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "�����簡 ���������� DNS ������ �����Ͽ����ϴ�."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "DNS ���� ���� ��"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "DNS ���� ���� ��"
@@ -591,28 +622,24 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP ������"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP ���� ���� ������"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "�� ������� FTP ���� ������ ���� ���Դϴ�."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "FTP ���񽺸� Ȱ��ȭ���� ��������, �ƹ��͵� üũ���� ������."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP ����"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Ȱ��ȭ�� FTP ������ ������ �����ϼ���:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -620,83 +647,82 @@ msgstr ""
 "�� ������ ���� ��Ʈ��(��Ʈ���)�� ���ͳ��� ���� FTP ������ �۵��� �� �ֽ���"
 "��."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "��Ʈ����� ���� FTP ���� ���"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "���ͳݿ� ���� FTP���� ���"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
-"���\\n���� DHCP�� ������Դϴ�. �� �������� ������ �۵����� ���� ���� �ֽ���"
-"��."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "�����ڸ��� �� �۾��� �� �� �ֽ��ϴ�..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP ���� ���� ��"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "�����簡 FTP ���� ������ ���� ����� ���� ������ �����ϴ�."
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -705,35 +731,35 @@ msgstr ""
 "�� ���� ����ϰ� ������ �����Ϸ���, [Ȯ��]�� ������, �ٽ� �����Ϸ���, [�ڷ�]"
 "�� ��������."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "����"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "���"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "��Ʈ��� FTP ����:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "���ͳ� FTP ����:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "�����簡 ���������� ��Ʈ���/���ͳ� FTP ������ �����Ͽ����ϴ�."
 
@@ -781,7 +807,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1062,7 +1088,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr "�����簡 ���ͳ� ���� ���� ������ ���� ����� ���� ������ �����ϴ�:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1342,65 +1368,93 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Ŭ���̾�Ʈ IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "����Ʈ�Ƚ� ������"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "���� ���� �̸�:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "���� ���� �̸�:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "���ͳ� ���� ���� ������"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "�� ������� ���ͳ� ���� ���� ������ ���� ���Դϴ�."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "������ ���� �ּ�"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "�̰��� �޴� ���Ͽ� �ּҿ� �ϰ��� �ְ� ���õǾ�� �մϴ�."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "���� ������ �̸�"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "���:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "���� ����Ʈ���� �ּҸ� �Է����� �ʾҽ��ϴ�."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "�Ž������̵尡 ���� �ʾ�!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "���ͳ� ���� ����Ʈ����"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1410,7 +1464,7 @@ msgstr ""
 "�� �����ڰ� \"korea.com\"�̶��, ���ͳ� ���� ������ �Ϲ������� \"smtp.korea."
 "com\"���� �մϴ�."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1418,57 +1472,62 @@ msgstr ""
 "�� ������ ������ ������ ���� ����Ʈ���̸� ���� ������, ���� ����Ʈ���̰� ��"
 "�� ����� ����� ���Դϴ�."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "���� ���� �̸�:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "���ͳ� ���� ���� ��"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "�����簡 ���ͳ� ���� ���� ������ ���� ����� ���� ������ �����ϴ�:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "�ּ� ����"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "�����簡 ���������� ���ͳ� ���� ������ �����Ͽ����ϴ�."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTP ���� ���� ��"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "����Ʈ ����:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP ���� ���� ��"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "����ȣ��Ʈ - �� ���������� �׼��� ���"
@@ -1642,7 +1701,8 @@ msgid "Access Control:"
 msgstr "�׼��� ����:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "�����簡 ���������� ������ ������ �����Ͽ����ϴ�."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1660,12 +1720,6 @@ msgstr "������ ������"
 msgid "PXE Wizard"
 msgstr "FTP ������"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2369,6 +2423,17 @@ msgstr "���丮:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "�����簡 ���������� ��Ʈ���/���ͳ� �� ������ �����Ͽ����ϴ�."
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "FTP ���񽺸� Ȱ��ȭ���� ��������, �ƹ��͵� üũ���� ������."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "���\\n���� DHCP�� ������Դϴ�. �� �������� ������ �۵����� ���� ���� ��"
+#~ "���ϴ�."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/lv.po b/po/lv.po
index f8befa2c..274d2652 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2002-09-18 22:09+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigur�cijas meistars"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -28,9 +28,9 @@ msgstr "Konfigur�cijas meistars"
 msgid "Warning."
 msgstr "Br�din�jums"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr "Meistara k��da."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -84,15 +84,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "�is meistars Jums pal�dz�s pievienot jaunu klientu lok�laj� DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Klienta identifik�cija:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Your client on the network will be identified by name, as in clientname."
@@ -112,29 +112,30 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Datora v�rds:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Datora IP adrese:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Br�din�jums"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Br�din�jums\\nJ�s lietojat DHCP, serveris var nestr�d�t ar �o konfigur�ciju.."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -179,7 +180,7 @@ msgstr "Klienta IP:"
 msgid "The wizard successfully added the client."
 msgstr "Meistars veiksm�gi pievienoja klientu."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP meistars"
 
@@ -197,6 +198,10 @@ msgstr ""
 "�is meistars pal�dz�s Jums nokonfigur�t DHCP servisu priek� J�su servera."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "dhcp lietotais adresu apgabals"
 
@@ -205,52 +210,76 @@ msgstr "dhcp lietotais adresu apgabals"
 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."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Izv�l�ties DHCP servisa darbastacij�m pie��iramo adresu apgabalu; ja vien "
 "Jums nav speci�las vajadz�bas, varat dro�i apstiprin�t pied�v�t�s v�rt�bas"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Zem�k� IP adrese:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Augst�k� IP adrese:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Nor�d�tais IP adresu apgabals nav korekts"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Nor�d�tais IP adresu apgabals nav korekts"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Tiek konfigur�ts DHCP serveris"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "Meistars apkopoja sekojo�us parametrus, lai konfigur�tu DHCP serveri"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "aizliegts"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "at�auts"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Meistars veiksm�gi nokonfigur�ja DHCP servisu priek� J�su servera."
 
@@ -258,20 +287,20 @@ msgstr "Meistars veiksm�gi nokonfigur�ja DHCP servisu priek� J�su servera."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS serveris"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS serveris"
@@ -302,71 +331,72 @@ msgid ""
 "with non-local requests forwarded to an outside DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Lietot�ja v�rds:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Tiek konfigur�ts DNS serveris"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "�r�j� v�rteja"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -374,113 +404,113 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Meistara k��da."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS konfigur��anas meistars"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Servera IP adrese:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Servera nosaukums:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Meistars veiksm�gi pievienoja klientu."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Meistars veiksm�gi pievienoja klientu."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Tiek konfigur�ts DNS serveris"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Tiek konfigur�ts DNS serveris"
@@ -580,110 +610,106 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP meistars"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP servera konfigur��nas meistars"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "�is meistars pal�dz�s Jums konfigur�t FTP serveri priek� J�su t�kla"
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP serveris"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Izv�lieties FTP servisa veidu, k�du v�laties aktiviz�t:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "At�aut FTP serveri Intranetam"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "At�aut �o FTP serveri priek� Interneta"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Br�din�jums\\nJ�s lietojat DHCP, serveris var nestr�d�t ar �o konfigur�ciju.."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 #, fuzzy
 msgid "Sorry, you must be root to do this..."
 msgstr "Atvainojiet, Jums j�b�t root lai veiktu �o ..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Tiek konfigur�ts FTP serveris"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "Meistars apkopoja sekojo�us parametrus, lai konfigur�tu FTP serveri"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -692,35 +718,35 @@ msgstr ""
 "Lai apstiprin�tu ��s v�rt�bas un konfigur�tu serveri, klik��iniet uz pogas "
 "N�kamais, vai ar� lietojiet pogu Iepriek��jais lai izlabotu t�s."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "aizliegts"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "at�auts"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intraneta FTP serveris:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Interneta FTP serveris:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Meistars veiksm�gi nokonfigur�ja Intraneta/Interneta FTP serveri"
 
@@ -768,7 +794,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1043,7 +1069,7 @@ msgstr ""
 "Meistars sav�ca sekojo�u inform�ciju, lai konfigur�tu J�su Interneta pasta "
 "servisu:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1317,101 +1343,129 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Klienta IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix meistars"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Pasta servera nosaukums:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Pasta servera nosaukums:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Interneta pasta konfigur��nas meistars"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "�is meistars Jums pal�dz�s konfigur�t Interneta pasta servisu priek� J�su "
 "t�kla."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Izejo�� pasta adrese"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Br�din�jums:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "J�s ievad�j�t tuk�u pasta v�rtejas adresi."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Interneta pasta v�rteja"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Pasta servera nosaukums:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Tiek konfigur�ts Interneta pasts"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1419,29 +1473,34 @@ msgstr ""
 "Meistars sav�ca sekojo�u inform�ciju, lai konfigur�tu J�su Interneta pasta "
 "servisu:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Adreses forma"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Meistars veiksm�gi nokonfigur�ja J�su servera Interneta pasta servisu"
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Tiek konfigur�ts FTP serveris"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "FTP serveris"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Tiek konfigur�ts FTP serveris"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr ""
@@ -1615,7 +1674,8 @@ msgid "Access Control:"
 msgstr "Piek�uves kontrole:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Meistars veiksm�gi nokonfigur�ja proxy serveri."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1633,12 +1693,6 @@ msgstr "Squid meistars"
 msgid "PXE Wizard"
 msgstr "FTP meistars"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2338,6 +2392,14 @@ msgstr "Direktorijs:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Meistars veiksm�gi nokonfigur�ja Intraneta/Interneta Web serveri"
 
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Br�din�jums\\nJ�s lietojat DHCP, serveris var nestr�d�t ar �o "
+#~ "konfigur�ciju.."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/mk.po b/po/mk.po
index 271a5d39..c728889c 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2002-12-07 12:44+0100\n"
 "Last-Translator: Danko Ilik <danko@mindless.com>\n"
 "Language-Team: Macedonian\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Конфигурациска самовила"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "Конфигурациска самовила"
 msgid "Warning."
 msgstr "Внимание"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -40,12 +40,12 @@ msgid "Error."
 msgstr "Самовилска грешка."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -88,15 +88,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Оваа самовила ќе Ви помогне во додавањето нов клиент во Вашиот локален DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(не мора да го пишувате доменот по името)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Клиент-идентификација:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -105,7 +105,7 @@ msgstr ""
 "Забележете дека дадениот IP број (адреса) и името на клиентот треба да бидат "
 "единствени на мрежата."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,23 @@ msgstr ""
 "company.net. Секоја машина на мрежата мора да има (единствена) IP адреса "
 "(број) во вообичаената синтакса на броеви одвоени со точки."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Име на машината:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP број на машината:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -138,7 +139,7 @@ msgstr ""
 "конфигурација."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -186,7 +187,7 @@ msgstr "Клиентско IP:"
 msgid "The wizard successfully added the client."
 msgstr "Самовилата успешно го додаде клиентот."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP самовила"
 
@@ -204,51 +205,60 @@ msgstr ""
 "Сервер."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Ранг на адреси што го користи dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Изберете го рангот на адреси доделени на компјутерите од DHCP сервисот; "
 "можете слободно да ги прифатите предложените вредности, доколку немате "
 "посебни потреби."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Најмала IP адреса:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Најголема IP адреса:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "IP рангот што е наведен не е точен"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "IP рангот што е наведен не е точен"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "Внесете го патот на директориумот што сакате да го споделите."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Конфигурирање на DHCP серверот"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -256,11 +266,31 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "DHCP сервис:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "исклучено"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "вклучено"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Самовилата успешно ги конфигурираше DHCP сервисите на Вашиот сервер."
 
@@ -268,20 +298,20 @@ msgstr "Самовилата успешно ги конфигурираше DHCP
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS сервер"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS сервер"
@@ -318,72 +348,73 @@ msgstr ""
 "сервер. Оваа конфигурација ќе нуди локален DNS сервис за локалните имиња на "
 "компјутери, а нелокалните барања ќе бидат проследени до надворешен DNS."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Недопуштени:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Пресметано име на домен"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Конфигурирање на DNS серверот"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Екстерен gateway"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -391,117 +422,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Тоа не е валидна адреса... притиснете „следно“ за да продолжите"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Тоа не е валидна адреса... притиснете „следно“ за да продолжите"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Тоа не е валидна адреса... притиснете „следно“ за да продолжите"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Самовилска грешка."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS самовила (конфигурација)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Пресметано име на домен"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Серверска IP адреса:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Серверско име:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Самовилата успешно го додаде клиентот."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Самовилата успешно го додаде клиентот."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Самовилата успешно го конфигурираше DNS сервисите на Вашиот сервер."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Конфигурирање на DNS серверот"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Конфигурирање на DNS серверот"
@@ -599,28 +630,24 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP самовила"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP сервер конфигурациска самовила"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Оваа самовила ќе Ви помогне во конфигурирање на FTP сервер за Вашата мрежа."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Не избирајте ништо ако не сакате да го активирате Вашиот FTP сервер."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP сервер"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Изберете го типот на FTP сервис што сакате да го активирате:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -628,76 +655,76 @@ msgstr ""
 "Вашиот сервер може да биде FTP сервер и кон Вашата внатрешна мрежа "
 "(интранет) и кон Интернет."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Овозможи го FTP серверот за Интернет"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Овозможи го FTP серверот за Интернет"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Допуштени:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Предупредување\\nВие сте во dhcp, серверот може да не работи со Вашата "
-"конфигурација."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Жалам, но мора да сте root за ова..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Конфигурирање на FTP серверот"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -706,7 +733,7 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "FTP сервер"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -716,35 +743,35 @@ msgstr ""
 "притиснете на копчето „следно“; или притиснете на „претходно“, ако сакате да "
 "ги поправите."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "исклучено"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "вклучено"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Интранет FTP сервер:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Интернет FTP сервер:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Самовилата успешно го конфигуирање Вашиот интранет/Интернет FTP сервер"
 
@@ -792,7 +819,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1077,7 +1104,7 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "News сервис:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1358,27 +1385,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Клиентско IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix самовила"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Име на мејл сервер:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Име на мејл сервер:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Конфигурациска самовила за електронска пошта"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Оваа самовила ќе ви помогне во конфигурирање на Internet Mail сервиси за "
 "Вашата мрежа."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Заминувачка мејл адреса"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1386,7 +1428,7 @@ msgstr ""
 "Ова треба да се избере во конзистенција со адресите што ги користите за "
 "пристигачката пошта."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1394,20 +1436,28 @@ msgstr ""
 "Можете да го изберете видот на адреса што ќе биде прикажана во заминувачката "
 "пошта, во \"From:\" и \"Reply-to\" полињата."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Пресметано име на домен"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Предупредување:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Внесовте празна вредност за адреса на мејл gateway."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1416,15 +1466,21 @@ msgstr ""
 "надвор од локалната мрежа. Притиснете „следно“ за да продолжите, или "
 "„претходно“ за да внесете вредност."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquerade-от не е во ред!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Интернет мејл gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1434,7 +1490,7 @@ msgstr ""
 "пример, ако Вашиот провајдер е \"provider.com\", интернет мејл серверот "
 "обично е \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1442,29 +1498,29 @@ msgstr ""
 "Вашиот сервер ќе ја испраќа поштата преку gateway, кој ќе се погрижи за "
 "конечната достава."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Име на мејл сервер:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Конфигурирање на Интернет пошта"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1472,30 +1528,35 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "Интернет мејл сервис:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Облик на адресата"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Самовилата успешно ги конфигурираше Интернет мејл сервисите на Вашиот сервер."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Конфигурирање на FTP серверот"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Принтер сервер:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Конфигурирање на FTP серверот"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - пристап ограничен само на овој сервер"
@@ -1679,7 +1740,8 @@ msgid "Access Control:"
 msgstr "Контрола на пристап:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Самовилата успешно го конфигурираше Вашиот proxy сервер."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1697,12 +1759,6 @@ msgstr "Squid самовила"
 msgid "PXE Wizard"
 msgstr "FTP самовила"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2438,6 +2494,18 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "Самовилата успешно го конфигурираше Вашиот интранет/Интернет веб сервер"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Не избирајте ништо ако не сакате да го активирате Вашиот FTP сервер."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Предупредување\\nВие сте во dhcp, серверот може да не работи со Вашата "
+#~ "конфигурација."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/ms.po b/po/ms.po
index 4528df42..58e777e9 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-08-22 20:07+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Konfigurasikan"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,9 +30,9 @@ msgstr "Konfigurasikan"
 msgid "Warning."
 msgstr "Amaran"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "Ralat."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -84,22 +84,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "dalam dalam lokal."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Your client on the network will be identified by name, as in clientname."
@@ -107,29 +107,30 @@ msgid ""
 "in the usual dotted syntax."
 msgstr "on dalam on IP dalam."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 #, fuzzy
 msgid "Name of the machine:"
 msgstr "Nama:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "Amaran dalam."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -175,7 +176,7 @@ msgstr "IP:"
 msgid "The wizard successfully added the client."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 #, fuzzy
 msgid "DHCP Wizard"
 msgstr "DHCP"
@@ -193,6 +194,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr ""
 
@@ -201,55 +206,79 @@ msgstr ""
 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."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr "DHCP terima."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 #, fuzzy
 msgid "Lowest IP Address:"
 msgstr "IP Alamat:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 #, fuzzy
 msgid "Highest IP Address:"
 msgstr "IP Alamat:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "IP"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "IP dalam"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP dalam"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 #, fuzzy
 msgid "Configuring the DHCP Server"
 msgstr "DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "dimatikan"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "dihidupkan"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "DHCP."
@@ -258,20 +287,20 @@ msgstr "DHCP."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Pelayan FTP"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Pelayan FTP"
@@ -305,72 +334,73 @@ msgid ""
 "with non-local requests forwarded to an outside DNS."
 msgstr "lokal lokal lokal."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "hos:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Namapengguna:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Pelayan FTP"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Luaran"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -378,112 +408,112 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Ralat."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Konfigurasikan"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Pelayan IP:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Pelayan Nama:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "DHCP."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "DHCP."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "DHCP."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "FTP"
@@ -582,152 +612,149 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP Pelayan Konfigurasikan"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "FTP Pelayan."
 
-#: ../ftp_wizard/Proftpd.pm:78
-#, fuzzy
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "FTP Pelayan."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Pelayan FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 #, fuzzy
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "FTP:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 #, fuzzy
 msgid ""
 "Your server can act as an FTP Server toward your internal network (intranet) "
 "and as an FTP Server for the Internet."
 msgstr "FTP Pelayan dan FTP Pelayan Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 #, fuzzy
 msgid "Enable the FTP Server for the Intranet"
 msgstr "FTP Pelayan"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 #, fuzzy
 msgid "Enable the FTP Server for the Internet"
 msgstr "FTP Pelayan"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "hos:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
-msgstr "Amaran dalam."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid "Configuring the FTP Server"
 msgstr "FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
 msgstr "Kepada terima dan Seterusnya Undur."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "dimatikan"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "dihidupkan"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 #, fuzzy
 msgid "Intranet FTP Server:"
 msgstr "FTP Pelayan:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 #, fuzzy
 msgid "Internet FTP Server:"
 msgstr "Internet FTP Pelayan:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 #, fuzzy
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Internet FTP"
@@ -776,7 +803,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1056,7 +1083,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr "Internet Berita:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 #, fuzzy
@@ -1336,72 +1363,100 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 #, fuzzy
 msgid "Postfix wizard"
 msgstr "FTP"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Mel Pelayan Nama:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Mel Pelayan Nama:"
+
+#: ../postfix_wizard/Postfix.pm:66
 #, fuzzy
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet Mel Konfigurasikan"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "Internet Mel."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 #, fuzzy
 msgid "Outgoing Mail Address"
 msgstr "Mel"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 #, fuzzy
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "masukan."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 #, fuzzy
 msgid ""
 "You can select the kind of address that outgoing mail will show in the "
 "\"From:\" and \"Reply-to\" field."
 msgstr "keluaran dalam dan."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Amaram:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 #, fuzzy
 msgid "You entered an empty address for the mail gateway."
 msgstr "kosong."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 #, fuzzy
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr "lokal."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 #, fuzzy
 msgid "Internet Mail Gateway"
 msgstr "Internet Mel"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1409,68 +1464,73 @@ msgid ""
 "usually \"smtp.provider.com\"."
 msgstr "Internet dalam."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "keluaran."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 #, fuzzy
 msgid "Mail Server Name:"
 msgstr "Mel Pelayan Nama:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 #, fuzzy
 msgid "Configuring the Internet Mail"
 msgstr "Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "Internet Mel:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 #, fuzzy
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Internet Mel."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Cetak Pelayan:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr ""
@@ -1643,8 +1703,9 @@ msgid "Access Control:"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
-msgstr ""
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
+msgstr "Internet FTP"
 
 #: ../proxy_wizard/Squid.pm:217
 #, fuzzy
@@ -1661,12 +1722,6 @@ msgstr "Masa"
 msgid "PXE Wizard"
 msgstr "FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2396,6 +2451,16 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Internet"
 
 #, fuzzy
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "FTP Pelayan."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr "Amaran dalam."
+
+#, fuzzy
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/mt.po b/po/mt.po
index 0c1b36d6..d62e3a91 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-10 06:34+0200\n"
 "Last-Translator: Ramon Casha <rcasha@waldonet.net.mt>\n"
 "Language-Team:  <mt@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Saħħar ta' konfigurazzjoni"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -37,9 +37,9 @@ msgstr "Saħħar ta' konfigurazzjoni"
 msgid "Warning."
 msgstr "Twissija"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -47,12 +47,12 @@ msgid "Error."
 msgstr "Problema."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -93,15 +93,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Dan is-saħħar jgħinek biex iżżid klijent ġdid fuq id-DNS lokali."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identifikazzjoni tal-klijent:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -109,7 +109,7 @@ msgid ""
 msgstr ""
 "Innota li n-numru IP u isem il-klijent iridu jkunu uniċi fuq in-network."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,22 +119,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Isem tal-kompjuter:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Numru IP tal-kompjuter:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Twissija"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -142,7 +143,7 @@ msgstr ""
 "konfigurazzjoni."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -188,7 +189,7 @@ msgstr "IP tal-klijent:"
 msgid "The wizard successfully added the client."
 msgstr "Is-saħħar żied il-klijent."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Saħħar DHCP"
 
@@ -206,52 +207,61 @@ msgstr ""
 "Dan is-saħħar jgħinek tikkonfigura s-servizzi DHCP għas-server tiegħek."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Medda ta' indirizzi użati minn dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Agħżel medda ta' indirizzi assenjati lill-kompjuters mis-servizz DHCP. Jekk "
 "m'għandekx bżonnijiet speċifiċi, tista' żżomm il-valuri proposti."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Indirizz IP minimu:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Indirizz IP massimu:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Il-medda ta' indirizzi IP speċifikat huwa ħażin"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Il-medda ta' indirizzi IP speċifikat m'huwiex fil-medda ta' indirizzi tas-"
 "server"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "L-IP tas-server ma jridx ikun f'din il-medda"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Qed jiġi kkonfigurat is-server DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -259,11 +269,31 @@ msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi konfigurat is-servizz "
 "DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "mitfi"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "attivat"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Is-saħħar ikkonfiguralek is-servizzi DHCP tas-server."
 
@@ -271,20 +301,20 @@ msgstr "Is-saħħar ikkonfiguralek is-servizzi DHCP tas-server."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Server NFS"
@@ -321,72 +351,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Iċħad kompjuters:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Isem tad-dominju misjub"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Qed jiġi kkonfigurat is-server DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Gateway estern"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -394,117 +425,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Dan m'huwiex indirizz validu... Agħfas Li jmiss biex tkompli"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Dan m'huwiex indirizz validu... Agħfas Li jmiss biex tkompli"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Problema."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Saħħar ta' konfigurazzjoni DNS"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Isem tad-dominju misjub"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Indirizz IP tas-server:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Isem is-server:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Is-saħħar żied il-klijent."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Is-saħħar żied il-klijent."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Qed jiġi kkonfigurat is-server DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Qed jiġi kkonfigurat is-server DNS"
@@ -605,27 +636,23 @@ msgstr "installazzjoni falliet"
 msgid "FTP wizard"
 msgstr "Saħħar FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Saħħar tal-konfigurazzjoni ta' server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Dan is-saħħar jgħinek tissettja server FTP għan-network tiegħek."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Tittikkja ebda kaxxa jekk ma tridx tattiva s-server FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Agħżel it-tip ta' servizz FTP li trid tattiva:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -633,76 +660,76 @@ msgstr ""
 "Is-server jista' jaġixxi bħala server FTP għan-network interna (intranet) "
 "jew bħala server FTP għall-internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Attiva s-server FTP għall-intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Attiva s-server FTP għall-internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Ippermetti kompjuters:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Twissija\\nInt qiegħed fuq dhcp. Is-server jista' ma jaħdimx b'din il-"
-"konfigurazzjoni."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Jiddispjaċini, trid tkun root biex tagħmel dan..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Qed jiġi kkonfigurat is-server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -711,7 +738,7 @@ msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi kkonfigurat is-server "
 "FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -720,35 +747,35 @@ msgstr ""
 "Biex taċċetta dawn il-valuri u tikkonfigura s-server, klikkja \"Li jmiss\", "
 "inkella agħfas Lura biex tikkoreġihom."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "mitfi"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "attivat"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Server FTP tal-intranet:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Server FTP tal-internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Is-saħħar ikkonfiguralek is-server FTP għall-intranet/internet"
 
@@ -796,7 +823,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1081,7 +1108,7 @@ msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi konfigurat is-servizz "
 "\"news\":"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1359,34 +1386,49 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP tal-klijent:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Saħħar Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Isem is-server tal-imejl:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Isem is-server tal-imejl:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Saħħar tal-konfigurazzjoni tal-imejl"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Dan is-saħħar jgħinek tikkonfigura s-servizzi tal-imejl tal-internet għan-"
 "network."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Indirizz tal-imejl li ħiereġ"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 "Dan għandu jingħazel b'mod konsistenti mal-indirizz għall-imejl li dieħel"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1394,19 +1436,27 @@ msgstr ""
 "Tista' tagħżel it-tip ta' indirizz li jidher fil-messaġġi ħerġin taħt "
 "\"Mingħand\" u \"Risposti lil\""
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Masquerade tal-isem tad-dominju:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Twissija:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Daħħalt indirizzi vojt għall-gateway tal-imejl."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1415,15 +1465,21 @@ msgstr ""
 "min-network lokali tiegħek. Agħfas \"Li jmiss\" biex tkompli, jew lura biex "
 "iddaħħal valur."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquerade mhux tajjeb!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Gateway tal-imejl tal-internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1433,7 +1489,7 @@ msgstr ""
 "dominju.tld\"; per eżempju jekk l-ISP huwa \"ditta.net.mt\", is-server tal-"
 "imejl jista' jkun \"mail.ditta.net.mt\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1441,29 +1497,29 @@ msgstr ""
 "Is-server tiegħek jibgħat l-imejl li ħiereġ lil gateway tal-imejl, li jieħu "
 "jsib id-destinazzjoni finali."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Isem is-server tal-imejl:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Qed jiġi kkonfigurat l-imejl tal-internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1471,31 +1527,36 @@ msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex tikkonfigura s-servizz tal-"
 "imejl tal-internet:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Forma tal-indirizz"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Is-saħħar ikkonfiguralek is-servizz tal-imejl lill-internet tas-server "
 "tiegħek."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Qed jiġi kkonfigurat is-server FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server tal-ipprintjar:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Qed jiġi kkonfigurat is-server FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - aċċess ristrett għal dan is-server biss"
@@ -1677,7 +1738,8 @@ msgid "Access Control:"
 msgstr "Kontroll tal-aċċess:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Is-saħħar ikkonfiguralek is-server proxy."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1695,12 +1757,6 @@ msgstr "Saħħar ta' Squid"
 msgid "PXE Wizard"
 msgstr "Saħħar FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2429,6 +2485,17 @@ msgstr "Direttorju tal-users:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Is-saħħar ikkonfiguralek il-web server tal-internet/intranet"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Tittikkja ebda kaxxa jekk ma tridx tattiva s-server FTP."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Twissija\\nInt qiegħed fuq dhcp. Is-server jista' ma jaħdimx b'din il-"
+#~ "konfigurazzjoni."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/nb.po b/po/nb.po
index 02f8c980..a377f542 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-28 21:53+0100\n"
 "Last-Translator: Per �yvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokm�l <nb@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "konfigurasjonsveiviser"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "konfigurasjonsveiviser"
 msgid "Warning."
 msgstr "Advarsel."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -43,12 +43,12 @@ msgid "Error."
 msgstr "Feil."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -88,22 +88,22 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Denne hjelperen vil hjelpe det � legge til en ny klient i din lokale DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Klient identifikasjon"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,26 +113,27 @@ msgstr ""
 "company.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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Navnet p� maskinen:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "IP-adressen til maskinen:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -178,7 +179,7 @@ msgstr "Klient IP:"
 msgid "The wizard successfully added the client."
 msgstr "Veiviseren la vellykket til en klient."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP hjelper"
 
@@ -196,47 +197,56 @@ msgstr ""
 "Denne hjelperen vil hjelpe deg � konfigurere DHCP tjenestene p� tjeneren din."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Rekke av adresser brukt av dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Velg rekke av adresser tildelt arbeidstasjonene av DHCP tjenesten; hvis du "
 "ikke har spesielle behov kan du trygt godta foresl�tte verdier."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Laveste IP adresse:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "H�yeste IP adresse:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Grensesnittet dhcp-tjenere m� lytte p�"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Den spesifiserte IP-rekken er ikke riktig."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Den spesifiserte IP-rekken er ikke i tjener nettverksadresse-rekke."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "IP-en p� tjeneren m� v�re i samme adresse-rekke."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurerer DHCP tjeneren"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -244,11 +254,31 @@ msgstr ""
 "Veiviseren samlet f�lgende parametere som trengs for � konfigurere DHCP "
 "tjenesten:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "sl�tt av"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "sl�tt p�"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Grensesnitt:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Veiviseren konfigurerte vellykket DHCP-tjenester p� tjeneren din."
 
@@ -256,7 +286,7 @@ msgstr "Veiviseren konfigurerte vellykket DHCP-tjenester p� tjeneren din."
 msgid "You need to readjust your hostname."
 msgstr "Du trenger � omjustere ditt vertsnavn."
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
@@ -266,12 +296,12 @@ msgstr ""
 "korrektdomenenavn, ikke likt localdomain eller inget. Kj�r drakconnect for � "
 "juster edet."
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "Master DNS-tjener"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "Slave DNS-tjener"
 
@@ -305,27 +335,28 @@ msgstr ""
 "din. Denne konfigurasjonen vil tilby en lokal DNS tjeneste for lokale "
 "maskinnavn, med ikke-lokale foresp�rsler sendt videre til en DNS p� utsiden."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "Hva �nsker du � gj�re:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 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:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "Fjern en vert i eksisterende dns-konfigurasjon."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "Fjern vert:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "Maskinnavn:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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 "
@@ -335,11 +366,11 @@ msgstr ""
 "vil ogs� fungere som en backuptjener, i tilfelle din master-tjener ikkekan "
 "n�s."
 
-#: ../dns_wizard/Bind.pm:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr "IP-adresse til master DNS-tjener:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -347,11 +378,11 @@ msgstr ""
 "Videresending skjer bare p� de foresp�rslene hvor tjeneren ikke erautorit�r "
 "og ikke har svaret i mellomlager."
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr "IP til din videresender"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
@@ -359,15 +390,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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "Ekstern DNS:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr "Legg til s�kedomene"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -375,7 +406,7 @@ msgstr ""
 "Domenenavn p� denne tjeren er automatisk lagt til og du trenger ikke �legge "
 "det til her."
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -383,27 +414,27 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr "Standard domenavn som skal s�kes:"
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 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:172
+#: ../dns_wizard/Bind.pm:171
 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:177
+#: ../dns_wizard/Bind.pm:176
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -411,11 +442,11 @@ msgstr ""
 "Det ser ut som om verten allerede er i din DNS-konfigurasjon... trykk "
 "nestefor � fortsette"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "Feil:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
@@ -423,7 +454,7 @@ msgstr ""
 "Det ser ut som om dette ikke er til stede i din DNS-konfigurasjon... trykk "
 "nestefor � fortsette"
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -431,7 +462,7 @@ 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:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
@@ -439,61 +470,61 @@ msgstr ""
 "Det ser ut som om du ikke er en master DNS-tjener, men bare har enslave. S� "
 "jeg kan ikke legge til/fjern vert."
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr "Ok Bygger n� din DNS slavekonfigurasjon"
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "med denne konfigurasjonen:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 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:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "Maskinnavn:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "Maskinen IP-adresse:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr "Klient med denne identifikasjonen vil bli fjernet fra din DNS"
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 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:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "Tjeners Vertsnavn:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr "Domenenavn:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr "Veiviseren la vellykket til vert i din DNS."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Veiviseren fjernet vellykket vert fra din DNS."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Veiviseren konfigurerte vellykket DNS-tjenestene p� tjeneren din."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurerer ditt system som en Master DNS-tjener ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurerer ditt system som en Slave DNS-tjener ..."
 
@@ -578,30 +609,25 @@ msgstr "Installasjon feilet"
 msgid "FTP wizard"
 msgstr "FTP hjelper"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP-tjener konfigureringshjelper"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Denne hjelperen vil hjelpe deg � konfigurere FTP-tjeneren for nettverket "
 "ditt."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Ikke merk av noen bokser hvis du ikke �nsker � aktivere FTP-tjeneren din."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP tjener"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Velg hva slags FTP tjenester du �nsker � aktivere:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -609,78 +635,88 @@ msgstr ""
 "Din tjener kan opptre som en FTP-tjener mot ditt interne nettverk "
 "(intranett) og som en FTP-tjener for Internett."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Sl� p� FTP-tjener for Intranett"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Sl� p� FTP-tjener for Internett"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Admin Email: email address of FTP administrator."
 msgstr "Adminepost: epostadresse til FTP-vedlikeholder."
 
-#: ../ftp_wizard/Proftpd.pm:90
+#: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Allow FXP: allow file transfer via other ftp."
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
+msgstr ""
+"tillat FTP-resume: tillat fortsettelse av opplastning eller nedlastning fra "
+"ftp-tjener."
+
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr "Tillat FXP: tillat filoverf�ring via andre ftper."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr "Chroot Hjemmebruker: L�s brukere i deres hjemmekatalog."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "FTP Proftpd server options"
 msgstr "Ftp Proftpd-tjeneropsjoner"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+#, fuzzy
+msgid "Permit root login: allow root to log on FTP server."
 msgstr "Tillatt root-innlogging: tillat root � logge p� ftp-tjener"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
-msgstr ""
-"tillat FTP-resume: tillat fortsettelse av opplastning eller nedlastning fra "
-"ftp-tjener."
-
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+#, fuzzy
+msgid "Admin email:"
 msgstr "Adminepost"
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+#, fuzzy
+msgid "Permit root Login:"
 msgstr "Tillat root-innlogging"
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+#, fuzzy
+msgid "Chroot Home user:"
 msgstr "Chroot Hjemmebruker"
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+#, fuzzy
+msgid "Allow FTP resume:"
 msgstr "Tillat FTP-resume"
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
 msgstr "Tillat FXP"
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
-"Advarsel\n"
-"' Du er i dhcp, tjeneren vil muligens ikke virke med din konfigurasjon."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Beklager, du m� v�re root for � gj�re dette..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Konfigurerer FTP-tjeneren"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -688,7 +724,7 @@ msgstr ""
 "Veiviseren samlet f�lgende parametere\n"
 "som trengs for � konfigurere FTP-tjeneren din"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -696,35 +732,35 @@ msgstr ""
 "For � godta disse verdiene og konfigurere tjeneren din, klikk p� Neste-"
 "knappen eller bruk Tilbake-knappen for � rette dem"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "sl�tt av"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "sl�tt p�"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranett FTP-tjener:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internett FTP-tjener:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr "Adminepost"
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr "Tillat root-innlogging"
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr "Chroot Hjemmebruker"
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr "Tillat FTP-resume"
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr "Tillat FXP"
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Veiviseren konfigurerte vellykket din Intranett/Internett FTP-tjener"
 
@@ -774,7 +810,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1059,7 +1095,7 @@ msgstr ""
 "Veiviseren samlet f�lgende parametere\n"
 "som trengs for � konfigurere Internett nyhets-tjeneren din:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1341,34 +1377,49 @@ msgstr "Konfigurerer ditt system som Nis-klient"
 msgid "Nis Client"
 msgstr "Nis-klient"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix hjelper"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Eposttjener"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Eposttjener"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internett epost konfigureringshjelper"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Denne hjelperen vil hjelpe deg med � konfigurere Internett epost tjenester "
 "for nettverket ditt."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Utg�ende epost adresse"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 "Denne b�r velges konsekvent med adressen du bruker for inng�ende epost."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1376,19 +1427,27 @@ msgstr ""
 "Du kan velge adressene som utg�ende epost vil vise i \"From:\" og \"Reply-to"
 "\" feltene."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Masker domenenavn:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Du entret en tom adresse for epost gatewayen."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1397,15 +1456,21 @@ msgstr ""
 "utenfor ditt lokale nettverk. Trykk neste for � fortsette, eller tilbake for "
 "� fylle inn en verdi."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskering ikke bra!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internett epost gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1415,7 +1480,7 @@ msgstr ""
 "hvis din tilbyder er \"provider.com\", er internett epost tjeneren vanligvis "
 "\"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1423,29 +1488,29 @@ msgstr ""
 "Tjeneren din vil sende utg�ende via en epost gateway, denne vil ta h�nd om "
 "sluttleveringen."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Navn eposttjener:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurere Internett epost"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1453,29 +1518,35 @@ msgstr ""
 "Veiviseren samlet f�lgende parametere som trengs for � konfigurere din "
 "Internett epost tjeneste:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Form adresse"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Veiviseren konfigurerte vellykket din Internett eposttjeneste for tjeneren "
 "din."
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "Konfigurerer din Postfix-tjener."
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Postfix-tjener"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Konfigurerer din Postfix-tjener."
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Lokalvert - tilgang begrenset til kun denne tjeneren"
@@ -1654,7 +1725,8 @@ msgid "Access Control:"
 msgstr "Tilgangskontroll:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Veiviseren ha vellykket konfigurert prozy-tjeneren din."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1669,16 +1741,6 @@ msgstr "Squid-veiviser"
 msgid "PXE Wizard"
 msgstr "PXE-veiviser"
 
-#: ../pxe_wizard/Pxe.pm:72
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-"Du trenger � omjustere ditt domenenavn. For en DNS-tjener trenger du et "
-"korrektdomenenavn, ikke likt localdomain eller inget. Kj�r drakconnect for � "
-"juster edet."
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Sett PXE-tjener"
@@ -2409,6 +2471,27 @@ msgstr "Brukeromr�de:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Veiviseren konfigurerte vellykket din Intranett/Internett web-tjener "
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Ikke merk av noen bokser hvis du ikke �nsker � aktivere FTP-tjeneren din."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Advarsel\n"
+#~ "' Du er i dhcp, tjeneren vil muligens ikke virke med din konfigurasjon."
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For a DNS server you need a correct "
+#~ "domainname, not egal to localdomain or none. Launch drakconnect to adjust "
+#~ "it."
+#~ msgstr ""
+#~ "Du trenger � omjustere ditt domenenavn. For en DNS-tjener trenger du et "
+#~ "korrektdomenenavn, ikke likt localdomain eller inget. Kj�r drakconnect "
+#~ "for � juster edet."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/nl.po b/po/nl.po
index 239f8104..c5f8c755 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-09 16:29+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
 "Language-Team: Nederlands <vertaling@nl.linux.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Configuratiewizard"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,9 +31,9 @@ msgstr "Configuratiewizard"
 msgid "Warning."
 msgstr "Waarschuwing"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "Fout opgetreden."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -90,15 +90,15 @@ msgstr ""
 "Deze wizard helpt u bij het toevoegen van een nieuwe client aan uw lokale "
 "DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Client-identificatie:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -106,7 +106,7 @@ msgid ""
 msgstr ""
 "Let erop dat het gegeven IP adres en clientnaam uniek zijn voor uw netwerk."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,22 +116,23 @@ msgstr ""
 "clientnaam.bedrijf.net. Iedere machine in het netwerk moet een (uniek) IP "
 "adres hebben, geschreven als: x.x.x.x."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Naam van de machine:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP adres van de machine:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -139,7 +140,7 @@ msgstr ""
 "uw instellingen."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -186,7 +187,7 @@ msgstr "Client IP adres:"
 msgid "The wizard successfully added the client."
 msgstr "De wizard heeft de client toegevoegd."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP Wizard"
 
@@ -204,53 +205,62 @@ msgstr ""
 "Deze wizard helpt u bij het configureren van de DHCP services op uw server."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Bereik van adressen die DHCP gebruikt"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Kies het bereik van de adressen die u aan de werkstations wilt toewijzen via "
 "de DHCP service; tenzij u speciale eisen heeft, kunt u de voorgestelde "
 "waardes accepteren."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Laagste IP adres:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Hoogste IP adres:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Het aangegeven IP-bereik is niet correct"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Het aangegeven IP-bereik ligt niet binnen het netwerk-adresbereik van de "
 "server"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "Het IP-adres van de server mag niet in het bereik liggen"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "De DHCP server configureren"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -258,11 +268,31 @@ msgstr ""
 "De wizard heeft de volgende instellingen verzameld om de DHCP service in te "
 "stellen:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "uitgezet"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "aangezet"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "De wizard heeft de DHCP service op uw server succesvol ingesteld."
 
@@ -270,20 +300,20 @@ msgstr "De wizard heeft de DHCP service op uw server succesvol ingesteld."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS server"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS server"
@@ -320,72 +350,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Computers niet toelaten:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Berekende domeinnaam"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "De DNS server configureren"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Externe gateway"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -393,117 +424,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Dit is geen geldig adres... klik op Volgende om verder te gaan"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Dit is geen geldig adres... klik op Volgende om verder te gaan"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Dit is geen geldig adres... klik op Volgende om verder te gaan"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Fout opgetreden."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS Wizard (configuratie)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Berekende domeinnaam"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP adres van de server:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Servernaam:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "De wizard heeft de client toegevoegd."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "De wizard heeft de client toegevoegd."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "De DNS server configureren"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "De DNS server configureren"
@@ -604,30 +635,24 @@ msgstr "installatie mislukt"
 msgid "FTP wizard"
 msgstr "FTP wizard"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP-server configuratiewizard"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Deze wizard helpt u met het instellen van de FTP server voor uw netwerk."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Kruis geen enkele instelling aan als u geen gebruik wilt maken van een FTP "
-"server."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Kies het soort FTP service dat u wilt activeren:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -635,76 +660,76 @@ msgstr ""
 "Uw server kan dienen als een FTP server voor uw interne netwerk (intranet) "
 "en als een FTP server voor internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Activeer de FTP server voor het intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Activeer de FTP server voor het internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Computers toestaan:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Waarschuwing\\nU heeft DHCP gekozen, de server werkt misschien niet goed met "
-"uw instellingen."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Helaas, u moet root zijn om dit te kunnen uitvoeren..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "De FTP server instellen"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -713,7 +738,7 @@ msgstr ""
 "De wizard heeft de volgende instellingen verzameld om uw FTP server in te "
 "stellen"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -722,35 +747,35 @@ msgstr ""
 "Om deze waarden te accepteren en uw server in te stellen, klikt u op de knop "
 "Volgende. Klik op Vorige om de waarden te corrigeren."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "uitgezet"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "aangezet"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet FTP server:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet FTP server:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "De wizard heeft uw intranet/internet FTP server succesvol geconfigureerd"
@@ -799,7 +824,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1084,7 +1109,7 @@ msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw internet nieuws service "
 "mee te configureren:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1365,27 +1390,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Client IP adres:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix wizard"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Mail server naam:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Mail server naam:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet mail configuratie wizard"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Deze wizard helpt u met het configureren van de internet mail services voor "
 "uw netwerk."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Uitgaande mail adres"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1393,7 +1433,7 @@ msgstr ""
 "Hier zou u hetzelfde adres moeten kiezen als wat u gebruikt voor inkomende "
 "mail."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1401,19 +1441,27 @@ msgstr ""
 "U kunt kiezen welk adres de uitgaande mail zal aangeven in het \"From:\" en "
 "\"Reply-to\" veld."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Masquerade-domeinnaam:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "U heeft een leeg adres opgegeven als mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1422,15 +1470,21 @@ msgstr ""
 "het lokale netwerk. Kies Volgende om verder te gaan, of Vorige om een waarde "
 "op te geven."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquerade is niet goed ingesteld!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet mail gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1440,7 +1494,7 @@ msgstr ""
 "opgegeven; als uw provider bijvoorbeeld \"provider.nl\" is, is de internet "
 "mail server meestal \"smtp.provider.nl\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1448,29 +1502,29 @@ msgstr ""
 "Uw server zal de uitgaande mail versturen via een mail gateway die zorgt "
 "voor de bezorging."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Mail server naam:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Internet mail configureren"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1478,30 +1532,35 @@ msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw internet mail service "
 "te configureren:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Vorm van het adres"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "De wizard heeft met succes de internet mail service op uw server ingesteld."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "De FTP server instellen"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Print server:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "De FTP server instellen"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - toegang beperkt tot alleen deze server"
@@ -1685,7 +1744,8 @@ msgid "Access Control:"
 msgstr "Toegangscontrole:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "De wizard heeft uw proxy server succesvol ingesteld."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1703,12 +1763,6 @@ msgstr "Squid wizard"
 msgid "PXE Wizard"
 msgstr "FTP wizard"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2439,6 +2493,19 @@ msgstr "Gebruikersmap:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "De wizard heeft uw intranet/internet web server succesvol ingesteld"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Kruis geen enkele instelling aan als u geen gebruik wilt maken van een "
+#~ "FTP server."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Waarschuwing\\nU heeft DHCP gekozen, de server werkt misschien niet goed "
+#~ "met uw instellingen."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/pl.po b/po/pl.po
index ec32ed01..59b0f79c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-12-10 23:46+0100\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "druid konfiguracji"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "druid konfiguracji"
 msgid "Warning."
 msgstr "Ostrze�enie."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr "B��d."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -84,22 +84,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Ten druid pomo�e ci doda� nowego klienta w lokalnym DNS-ie."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identyfikacja klienta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +109,28 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nazwa komputera:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Numer IP maszyny :"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Ostrze�enie"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -174,7 +175,7 @@ msgstr "IP klienta:"
 msgid "The wizard successfully added the client."
 msgstr "Druid zako�czy� z powodzeniem dodawanie klienta."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Druid DHCP"
 
@@ -191,59 +192,88 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Ten druid pomo�e ci w konfiguracji us�ug DHCP serwera."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Zakres adres�w IP wykorzystywanych przez dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Wybierz zakres adres�w przypisywanych stacjom roboczym przez us�ug� DHCP;"
 "je�li nie masz specjalnych potrzeb, mo�na bezpiecznie zaakceptowa� "
 "zaproponowane warto�ci."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Najni�szy adres IP:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Najwy�szy adres IP:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Interfejs, na kt�rym nas�uchuje serwer dhcp"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Podany zakres IP nie jest poprawny."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Podany zakres IP nie znajduje si� w zakresie adres�w sieci serwera."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "Adres IP serwera nie mo�e znajdowa� si� w zakresie."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurowanie serwera DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr ""
 "Druid zebra� poni�sze parametry wymagane do skonfigurowania us�ugi DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "wy��czone"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "w��czone"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interfejs:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Druid z powodzeniem skonfigurowa� us�ugi DHCP serwera."
 
@@ -251,20 +281,20 @@ msgstr "Druid z powodzeniem skonfigurowa� us�ugi DHCP serwera."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Serwer NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Serwer NFS"
@@ -301,71 +331,72 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Zabronione komputery:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nazwa serwera grup dysk.:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurowanie serwera DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -373,117 +404,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "To nie jest poprawny adres... naci�nij dalej aby kontynuowa�"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "To nie jest poprawny adres... naci�nij dalej aby kontynuowa�"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "To nie jest poprawny adres... naci�nij dalej aby kontynuowa�"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "B��d"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS (konfiguracja)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Nazwa serwera grup dysk.:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Baner serwera:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "Domena Nis:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Druid zako�czy� z powodzeniem dodawanie klienta."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Druid zako�czy� z powodzeniem dodawanie klienta."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Druid pomy�lnie skonfigurowa� us�ugi DNS serwera."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurowanie systemu jako serwer Nis+Autofs(nfs) ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurowanie systemu jako serwer Nis+Autofs(nfs) ..."
@@ -575,27 +606,23 @@ msgstr "Instalacja nie powiod�a si�"
 msgid "FTP wizard"
 msgstr "Druid FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Druid konfiguracji serwera FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Ten druid pomo�e ci skonfigurowa� serwer FTP dla twojej sieci."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Nie znaznaczaj �adnego pola je�li nie chcesz aktywowa� serwera FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Serwer FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Wybierz rodzaj us�ugi FTP do aktywowania:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -603,75 +630,76 @@ msgstr ""
 "Serwer mo�e pracowa� jako serwer FTP dla twojej wewn�trznej sieci (intranet) "
 "lub jako serwer FTP dla Internetu."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "W��cz serwer FTP dla Intranetu"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "W��cz serwer FTP dla Intranetu"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Dozwolone komputery:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Ostrze�enie\n"
-"Jeste� w dhcp, serwer mo�e nie pracowa� z t� konfiguracj�."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Niestety, nale�y mie� uprawnienia administratora aby to zrobi�..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Konfigurowanie serwera FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -679,7 +707,7 @@ msgstr ""
 "Druid zebra� poni�sze parametry\n"
 "wymagane do skonfigurowania twojego serwera FTP."
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -687,35 +715,35 @@ msgstr ""
 "Aby zaakceptowa� te warto�ci i skonfigurowa� serwer, kliknij przycisk Dalej "
 "lub u�yj przycisku Wstecz aby je poprawi�."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "wy��czone"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "w��czone"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranetowy serwer FTP:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internetowy serwer FTP:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Druid pomy�lnie skonfigurowa� tw�j serwera FTP dla Intranetu/Internetu"
 
@@ -763,7 +791,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1045,7 +1073,7 @@ msgstr ""
 "Druid zebra� poni�sze parametry wymagane\n"
 "do skonfigurowania us�ugi internetowych grup dyskusyjnych:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1324,27 +1352,42 @@ msgstr "Konfigurowanie systemu jako klient Nis ..."
 msgid "Nis Client"
 msgstr "Klient Nis"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Druid Postfiksa"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Serwer poczty"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Serwer poczty"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Druid konfiguracji poczty internetowej"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Ten druid pomo�e ci skonfigurowa� internetowe us�ugi pocztowe dla twojej "
 "sieci."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Adres poczty wychodz�cej"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1352,7 +1395,7 @@ msgstr ""
 "To powinno by� wybrane sp�jnie z adresem wykorzystywanym przy poczcie "
 "przychodz�cej."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1360,19 +1403,27 @@ msgstr ""
 "Mo�na wybra� rodzaj adresu wy�wietlanego do poczty przychodz�cej w polu \"Od:"
 "\" i \"Odpowiedz do:\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Nazwa domeny maskarady:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Ostrze�enie:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Wprowadzono pusty adres dla bramki pocztowej."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1381,15 +1432,21 @@ msgstr ""
 "zewn�trz sieci lokalnej. Naci�nij Dalej aby kontynuowa�, lub Wstecz aby "
 "wprowadzi� warto��."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskarada jest niepoprawna!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Bramka poczty internetowej"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1399,7 +1456,7 @@ msgstr ""
 "dla przyk�adu, je�li tw�j dostawca to \"dostawca.com\", serwer poczty "
 "internetowej to zazwyczaj \"smtp.dostawca.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1407,29 +1464,29 @@ msgstr ""
 "Tw�j serwer wy�le poczt� wychodz�c� przez bramk� pocztow�, kt�ra zadba o "
 "dostarczenie jej do odbiorcy."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nazwa serwera poczty:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurowanie poczty internetowej"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1437,29 +1494,34 @@ msgstr ""
 "Druid zebra� poni�sze parametry wymagane do skonfigurowania internetowej "
 "us�ugi pocztowej:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Posta� adresu"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Druid pomy�lnie skonfigurowa� internetow� us�ug� pocztow� serwera."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Konfigurowanie serwera FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Serwer wydruku:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Konfigurowanie serwera FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Komputer lokalny - dost�p limitowany tylko do tego serwera"
@@ -1642,7 +1704,8 @@ msgid "Access Control:"
 msgstr "Kontrola dost�pu:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Druid pomy�lnie skonfigurowa� serwer po�rednicz�cy."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1660,12 +1723,6 @@ msgstr "Druid us�ugi Squid"
 msgid "PXE Wizard"
 msgstr "Druid PXE"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Ustaw serwer PXE"
@@ -2395,6 +2452,16 @@ msgstr "Katalog u�ytkownika:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Druid pomy�lnie skonfigurowa� tw�j serwer WWW Intranetowy/Internetowy"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Nie znaznaczaj �adnego pola je�li nie chcesz aktywowa� serwera FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Ostrze�enie\n"
+#~ "Jeste� w dhcp, serwer mo�e nie pracowa� z t� konfiguracj�."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/pt.po b/po/pt.po
index cc99b275..f818b545 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-12-02 07:16+0000\n"
 "Last-Translator: José Carlos D. S. Saraiva <jose.d.s.saraiva@clix.pt>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "assistente de configuração"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "assistente de configuração"
 msgid "Warning."
 msgstr "Cuidado."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -43,12 +43,12 @@ msgid "Error."
 msgstr "Erro."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -91,22 +91,22 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Este assistente vai ajudar-lo a adicionar um novo cliente no seu DNS local."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(não é preciso escrever o domínio detrás do nome)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identificação do cliente :"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "Note que o numero IP e o nome dados deveriam ser únicos na rede."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +116,28 @@ msgstr ""
 "net. Cada maquina na rede precisa de ter um endereço IP (único), na forma "
 "habitual separada com pontos."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nome da maquina :"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Numero IP da maquina :"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Cuidado"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -182,7 +183,7 @@ msgstr "IP Cliente :"
 msgid "The wizard successfully added the client."
 msgstr "O assistente consegui adicionar o cliente."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Assistente DHCP"
 
@@ -200,48 +201,57 @@ msgstr ""
 "Este assistente vai ajudar-lo a configurar os serviços DHCP do seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Zona de endereços utilizada por dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Escolha a zona de endereços atribuidos às maquinas pelo serviço DHCP, a "
 "menos que precise de algo especial, pode aceitar sem perigo os valores "
 "propostos."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "O mais baixo endereço IP :"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "O mais alto endereço IP :"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Interface que o servidor dhcp deve escutar"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "O intervalo IP indicado não é correcto."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "O intervalo IP indicado não está no intervalo do servidor."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "O IP do servidor não pode estar no intervalo."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "A configurar o Servidor DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -249,11 +259,31 @@ msgstr ""
 "O assistente recuperou os parametros seguintes necessários para configurar o "
 "seu serviço DHCP :"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "inactivo"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "activo"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "O assistente conseguiu configurar os serviços DHCP do seu servidor."
 
@@ -261,20 +291,20 @@ msgstr "O assistente conseguiu configurar os serviços DHCP do seu servidor."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Servidor NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Servidor NFS"
@@ -311,72 +341,73 @@ msgstr ""
 "Esta configuração vai fornecer um serviço DNS local para os nomes das "
 "maquinas locais, com os pedidos não locais dirigidos para um DNS exterior."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Recusar os anfitriões :"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nome de Dominio Calculado"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "A configurar o Servidor DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Portao exterior"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -384,117 +415,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Isto não é um endereço valido... carregue em seguinte para continuar"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Isto não é um endereço valido... carregue em seguinte para continuar"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Isto não é um endereço valido... carregue em seguinte para continuar"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Erro"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Assistente Dns (configuração)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Nome de Dominio Calculado"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Endereço IP do servidor :"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Nome do Servidor :"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "O assistente consegui adicionar o cliente."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "O assistente consegui adicionar o cliente."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "O assistente conseguiu configurar os serviços DNS do seu servidor."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "A configurar o Servidor DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "A configurar o Servidor DNS"
@@ -587,28 +618,24 @@ msgstr "a instalação falhou"
 msgid "FTP wizard"
 msgstr "Assistente FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Assistente de Configuração de Servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Este assistente vai ajudar-lo a configurar o servidor FTP para a sua rede."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Não carregue em nada se não deseja activar o seu servidor FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Escolha o tipo de serviço FTP que deseja activar :"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -616,75 +643,76 @@ msgstr ""
 "O seu servidor pode agir como um servidor FTP para a sua rede interna "
 "(intranet) e para o Internet"
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Autoriza o servidor FTP para o Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Autoriza o servidor FTP para o Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Anfitriões autorizados :"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Cuidado\n"
-"Está em dhcp, o servidor pode não funcionar com a sua configuração."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Desculpe, deve ser root para fazer isto..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "A configurar o Servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -692,7 +720,7 @@ msgstr ""
 "O assistente recuperou os seguintes parâmetros necessários para configurar o "
 "seu servidor FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -700,35 +728,35 @@ msgstr ""
 "Para aceitar estes valores, e configurar o seu servidor, carregue em "
 "Seguinte ou utilize o botão Voltar para mudá-los"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "inactivo"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "activo"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Servidor FTP Intranet :"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Servidor Internet FTP :"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "O assistente conseguiu configurar o seu servidor FTP Intranet/Internet"
 
@@ -776,7 +804,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1061,7 +1089,7 @@ msgstr ""
 "O assistente recuperou os parâmetros seguintes\n"
 "necessários para configurar o seu serviço de Internet News"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1342,27 +1370,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP Cliente :"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Assistente Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Servidor de correio"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Servidor de correio"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Assistente de Configuração do Correio Internet"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Este assistente vai ajudar-lo a configurar o serviço de Correio Internet "
 "para a sua rede."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Endereço do correio enviado"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1370,7 +1413,7 @@ msgstr ""
 "Isto deveria ser escolhido em função do endereço que escolheu para o correio "
 "recebido."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1378,19 +1421,27 @@ msgstr ""
 "Pode escolher o tipo de endereço que o correio expedido vai indicar nas "
 "zonas \"From:\" e \"Reply-to:\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Nome de Dominio Masquerade :"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Atenção :"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Você deixou vazio o endereço da ponte do correio."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1399,15 +1450,21 @@ msgstr ""
 "fora da sua rede local. Carregue em Seguinte para continuar, ou Voltar para "
 "mudar um valor."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "O masquerade não é bom !"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Ponte do Correio Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1417,7 +1474,7 @@ msgstr ""
 "tipodedominio\"; por exemplo, se o seu fornecedor é \"fornecedor.com\", o "
 "servidor de correio Internet é habitualmente \"smtp.fornecedor.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1425,29 +1482,29 @@ msgstr ""
 "O seu servidor vai enviar o correio através uma ponte de correio, que vai "
 "ocupar-se do resto do envio."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nome do Servidor de Correio :"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "A configurar o Correio Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1455,31 +1512,36 @@ msgstr ""
 "O assistente recuperou os parametros seguintes necessários para configurar o "
 "seu serviço de Correio Internet :"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Forma do Endereço"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "O assistente conseguiu configurar o serviço de Correio Internet do seu "
 "servidor."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "A configurar o Servidor FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Servidor de Impressão :"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "A configurar o Servidor FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Anfitrião local - acesso reservado a este servidor unicamente"
@@ -1660,7 +1722,8 @@ msgid "Access Control:"
 msgstr "Controlo de Acesso :"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "O assistente conseguiu configurar o seu servidor proxy."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1678,12 +1741,6 @@ msgstr "Assistente Squid"
 msgid "PXE Wizard"
 msgstr "Assistente FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2411,6 +2468,16 @@ msgstr "Directoria do utilizador :"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "O assistente conseguiu configurar o seu servidor Web Intranet/Internet"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Não carregue em nada se não deseja activar o seu servidor FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Cuidado\n"
+#~ "Está em dhcp, o servidor pode não funcionar com a sua configuração."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5bf1355d..07f37ffc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-11-16 18:57-0300\n"
 "Last-Translator: Tiago Cruz <tiagocruz@linuxdicas.com.br>\n"
 "Language-Team: Português do Brasil <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Assistente de configuração"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "Assistente de configuração"
 msgid "Warning."
 msgstr "Aviso"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -43,12 +43,12 @@ msgid "Error."
 msgstr "Erro."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -90,22 +90,22 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "O assistente ajudará você a adicionar um novo cliente em seu DNS local."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identificação do Cliente:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "Note que o número de IP e o nome do cliente devem ser únicos na rede"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +115,28 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Nome da máquina:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Número de IP da máquina:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -181,7 +182,7 @@ msgstr "IP do cliente:"
 msgid "The wizard successfully added the client."
 msgstr "O assistente adicionou o cliente com sucesso."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Assistente DHCP"
 
@@ -199,51 +200,60 @@ msgstr ""
 "Este assistente ajudará você a configurar o serviço DHCP de seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Intervalo de endereços usados pelo dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Selecione o intervalo de endereços atribuídos às estações de trabalho pelo "
 "serviço de DHCP. A menos que você tenha necessidades especiais, você pode "
 "aceitar os valores propostos com segurança."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Menor endereço IP"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Maior endereço IP"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 #, fuzzy
 msgid "Interface the dhcp server must listen to"
 msgstr "Interface do dhcp server deve escutar"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "O intervalo de IP especificado não está correto"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "O intervalo de IP especificado não está no intervalo de endereço da rede do "
 "servidor"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "O IP do servidor não pode estar no intervalo de endereços"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Configurando o servidor DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -251,11 +261,31 @@ msgstr ""
 "O assistente coletou os seguintes parâmetros necessários para configurar seu "
 "serviço de DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "desabilitado"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "habilitado"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "O assistente configurou com sucesso o serviço DHCP de seu servidor."
 
@@ -263,20 +293,20 @@ msgstr "O assistente configurou com sucesso o serviço DHCP de seu servidor."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Servidor NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Servidor NFS"
@@ -313,72 +343,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Bloquear hosts:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nome do domínio do computador"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Configurando o servidor DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Gateway externo"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -386,117 +417,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Este não é um endereço válido... pressione próximo para continuar"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Este não é um endereço válido... pressione próximo para continuar"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Este não é um endereço válido... pressione próximo para continuar"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Erro."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Assistente DNS (configuração)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Nome do domínio do computador"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Endereço de IP do servidor:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Nome do Servidor:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "O assistente adicionou o cliente com sucesso."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "O assistente adicionou o cliente com sucesso."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "O assistente configurou com sucesso o serviço DNS de seu servidor."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurando o servidor DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurando o servidor DNS"
@@ -597,28 +628,24 @@ msgstr "a instalação falhou"
 msgid "FTP wizard"
 msgstr "Assistente de FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Assistente de configuração para o servidor de FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "O assistente ajudará você a configurar o servidor de FTP para sua rede."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Não marque nenhuma caixa se não quiser ativar seu servidor de FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Servidor de FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Selecione o tipo de serviço FTP que você quer ativar:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -626,75 +653,76 @@ msgstr ""
 "Seu servidor pode agir como um servidor de FTP para sua rede interna "
 "(Intranet) e como um servidor de FTP para a Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Habilita o servidor FTP para a Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Habilita o servidor de FTP para a Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Permitir hosts:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Aviso\n"
-"Você está em dhcp; o servidor pode não funcionar com sua configuração"
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Desculpe, você precisa ser root para esta operação..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Configurando o servidor de FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -702,7 +730,7 @@ msgstr ""
 "O assistente coletou os seguintes parâmetros\n"
 "necessários para configurar seu servidor de FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -710,35 +738,35 @@ msgstr ""
 "Para aceitar estes valores e configurar seu servidor clique no botão próximo "
 "ou então use o botão voltar para corrigir."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "desabilitado"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "habilitado"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Servidor de FTP para intranet"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Servidor Internet de FTP:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "O assistente configurou com sucesso sua servidor de FTP para internet/"
@@ -788,7 +816,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1073,7 +1101,7 @@ msgstr ""
 "O assistente coletou os seguintes parâmetros necessários\n"
 "para configurar seu serviço de Notícias da Internet:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1354,27 +1382,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP do cliente:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Assistente do Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Nome do Servidor de Mensagens:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Nome do Servidor de Mensagens:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Assistente de Configuração de Correio Eletrônico"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Este assistente ajudará você a configurar os serviços de Correio da Internet "
 "para a sua rede."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Endereço de mensagem enviada"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1382,7 +1425,7 @@ msgstr ""
 "A escolha deve ser consistente com o endereço que você usa para receber "
 "mensagens."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1390,19 +1433,27 @@ msgstr ""
 "Você pode selecionar o tipo de endereço que os emails enviados mostrarão nos "
 "campos \"From:\" and \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Nome de domínio Mascarado"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Aviso:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Você digitou um endereço vazio no gateway para correio"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1411,15 +1462,21 @@ msgstr ""
 "para fora da sua rede local. Pressione Continuar, ou volte para informar um "
 "valor."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Máscara inválida!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Gateway para Correio na Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1429,7 +1486,7 @@ msgstr ""
 "tipodedomínio\"; por exemplo, se ser o seu provedor é \"provedor.com\", o "
 "servidor de envio de correio será normalmente \"smtp.provedor.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1437,29 +1494,29 @@ msgstr ""
 "Seu servidor enviará mensagens por um gateway de correio que se encarregará "
 "da entrega final."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nome do Servidor de Mensagens:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Configurando o Internet Mail"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1467,31 +1524,36 @@ msgstr ""
 "O assistente coletou os parâmetros necessários para configurar seu Serviço "
 "de Correio na Internet:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Estrutura do Endereço"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "O assistente configurou com sucesso seu serviço de correio da internet no "
 "seu servidor."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Configurando o servidor de FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Servidor de impressão"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Configurando o servidor de FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - acesso restrito a apenas este servidor"
@@ -1671,7 +1733,8 @@ msgid "Access Control:"
 msgstr "Controle de acesso:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "O assistente configurou com sucesso seu servidor proxy."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1689,12 +1752,6 @@ msgstr "Assistente do Squid"
 msgid "PXE Wizard"
 msgstr "Assistente de FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2430,6 +2487,16 @@ msgstr "Diretório de usuário:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "O assistente configurou com sucesso seu servidor de Internet/Intranet"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Não marque nenhuma caixa se não quiser ativar seu servidor de FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Aviso\n"
+#~ "Você está em dhcp; o servidor pode não funcionar com sua configuração"
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/ro.po b/po/ro.po
index 22773f8b..8e7d883e 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-12-16 17:15+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "asistent de configurare"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "asistent de configurare"
 msgid "Warning."
 msgstr "Avertisment."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr "Eroare."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -86,15 +86,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Acest asistent vă va ajuta să adăugaţi un client nou în DNS-ul local."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identificare client:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +113,28 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Numele maşinii : "
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Numărul IP al maşinii :"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Avertisment"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -179,7 +180,7 @@ msgstr "IP client:"
 msgid "The wizard successfully added the client."
 msgstr "Asistentul a adăugat clientul cu succes."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Asistent DHCP"
 
@@ -198,47 +199,56 @@ msgstr ""
 "dumneavostră."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Gama de adrese utilizate de DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Selectaţi gama de adrese alocate staţiilor de lucru de către serviciul DHCP; "
 "dacă nu aveţi nevoi speciale, puteţi accepta valorile propuse."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Cea mai mică adresă IP:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Cea mai mare adresă IP:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Interfaţa pe care trebuie să asculte serverul dhcp"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Gama de adrese IP specificată nu este corectă."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Gama de adrese IP specificată nu este în gama de adrese a serverului."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "IP-ul serverului nu trebuie să fie în gamă."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Configurez serverul DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -246,11 +256,31 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea "
 "serviciului DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "Dezactivat"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "Activat"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Interfaţă:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Asistentul a configurat cu succes serviciile DHCP al serverului dvs."
 
@@ -258,20 +288,20 @@ msgstr "Asistentul a configurat cu succes serviciile DHCP al serverului dvs."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Server NFS"
@@ -309,71 +339,72 @@ msgstr ""
 "numele calculatoarelor locale, cu cererile ne-locale transmise către un DNS "
 "exterior."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Refuză gazdele:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Nume server de ştiri:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Configurez serverul DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -381,116 +412,116 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, 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:172
+#: ../dns_wizard/Bind.pm:171
 #, 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:177
+#: ../dns_wizard/Bind.pm:176
 #, 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Eroare"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Dns (configurare)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Nume server de ştiri:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Antet server:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Asistentul a adăugat clientul cu succes."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Asistentul a adăugat clientul cu succes."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Configurez serverul DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Configurez serverul DNS"
@@ -582,29 +613,25 @@ msgstr "Instalarea a eşuat"
 msgid "FTP wizard"
 msgstr "Asistent FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Asistent de configurare server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Acest asistent vă va ajuta la configurarea serverului FTP pentru reţeaua "
 "dumneavoastră."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Dacă nu vreţi să activaţi serverul FTP, nu bifaţi nici o căsuţă."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Selectaţi ce fel de serviciu FTP doriţi să activaţi:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -612,75 +639,76 @@ msgstr ""
 "Serverul dvs. poate acţiona ca un server FTP către reţeaua dvs. internă "
 "(intranet) şi ca un server FTP pentru Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Activează serverul FTP pentru Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Activează serverul FTP pentru Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Permite gazdelor:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Avertisment\n"
-"Sunteţi în DHCP, serverul poate nu va rula în configuraţia dvs."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Regret, trebuie să fiţi root pentru a face aceasta..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Configurez serverul FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -688,7 +716,7 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari\n"
 "pentru configurarea serverului FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -696,35 +724,35 @@ msgstr ""
 "Pentru a accepta aceste valori şi a configura serverul, faceţi clic pe "
 "Următorul sau folosiţi butonul Înapoi pentru corecţii"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "Dezactivat"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "Activat"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Server FTP în Intranet:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Server FTP în Internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Asistentul a configurat cu succes serverul dvs. FTP pentru Intranet/Internet."
@@ -773,7 +801,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1056,7 +1084,7 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari\n"
 "pentru configurarea serviciului de ştiri din Internet:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1337,27 +1365,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP client:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Asistent POSTFIX"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Server de email"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Server de email"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Asistent de configurare email Internet"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Acest asistent vă va ajuta la configurarea serviciilor de poştă de Internet "
 "pentru reţeaua dumneavoastră."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Adresa de mail pt. ieşire"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1365,7 +1408,7 @@ msgstr ""
 "Aceasta ar trebui aleasă în mod consistent cu adresa pe care o folosiţi "
 "pentru poşta de sosire."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1373,19 +1416,27 @@ msgstr ""
 "Puteţi selecta ce fel de adresă va fi afişată în câmpurile \"De la:\" şi "
 "\"Răspuns la\" pentru poşta de plecare."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Nume de domeniu 'mascaradat':"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Avertisment:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Nu aţi introdus adresa gateway-ului de mail."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1394,15 +1445,21 @@ msgstr ""
 "reţelei dvs. locale. Apăsaţi Următorul pentru a continua sau Înapoi pentru a "
 "introduce o valoare."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Mascarada nu funcţionează!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Poartă mail Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1412,7 +1469,7 @@ msgstr ""
 "\"; de exemplu, dacă furnizorul dvs. este \"provider.com\", adresa "
 "serverului său de mail este de obicei \"smtp.provicer.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1420,29 +1477,29 @@ msgstr ""
 "Serverul dvs. va trimite poşta printr-un gateway de mail, ce va avea grijă "
 "de transmiterea finală."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Nume server de mail:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Configurez poşta de Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1450,31 +1507,36 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea "
 "serviciului de poştă de Internet:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Forma adresei"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Asistentul a configurat cu succes serviciul de poştă în Internet a "
 "serverului dvs."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Configurez serverul FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server de tipărire:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Configurez serverul FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - acces numai de la acest server"
@@ -1655,7 +1717,8 @@ msgid "Access Control:"
 msgstr "Control acces:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Asistentul a configurat cu succes serviciul Proxy al serverului dvs."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1673,12 +1736,6 @@ msgstr "Asistent SQUID"
 msgid "PXE Wizard"
 msgstr "Asistent FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2416,6 +2473,16 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "Asistentul a configurat cu succes serverul dvs. Web pentru Intranet/Internet."
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Dacă nu vreţi să activaţi serverul FTP, nu bifaţi nici o căsuţă."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Avertisment\n"
+#~ "Sunteţi în DHCP, serverul poate nu va rula în configuraţia dvs."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/ru.po b/po/ru.po
index 03e25d20..ba277642 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-02 16:19+0200\n"
 "Last-Translator: Alice Lafox <alice@lafox.net>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "мастер настройки"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "мастер настройки"
 msgid "Warning."
 msgstr "Предупреждение."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr "Ошибка."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -84,15 +84,15 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Этот мастер поможет вам добавить нового клиента в ваш локальный DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(вам не нужно вводить домен после имени)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Идентификация клиента:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -100,7 +100,7 @@ msgid ""
 msgstr ""
 "Помните, что указанный IP-адрес и имя клиента должны быть уникальными в сети."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +110,28 @@ msgstr ""
 "net. Каждая машина в сети должна иметь (уникальный) IP-адрес с обычным "
 "точечным синтаксисом."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Имя машины:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP-адрес машины:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -176,7 +177,7 @@ msgstr "IP клиента:"
 msgid "The wizard successfully added the client."
 msgstr "Мастер успешно добавил клиента."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Мастер DHCP"
 
@@ -193,48 +194,57 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Этот мастер поможет вам настроить сервисы DHCP вашего сервера."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Диапазон адресов, используемых dhcp:"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Выберите диапазон адресов, назначаемых рабочим станциям сервисом DHCP; вы "
 "можете спокойно принять предложенные значения, до тех пор, пока вам не "
 "понадобятся специальные."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Нижний IP-адрес:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Верхний IP-адрес:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Интерфейс сервера dhcp должен слушать"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Указанный диапазон IP-адресов является неверным."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Указанный диапазон IP-адресов не входит в диапазон адресов сервера."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "IP-адрес сервера должен быть вне диапазона."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Настраивается сервер DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -242,11 +252,31 @@ msgstr ""
 "Мастер собрал следующие параметры, необходимые для настройки вашего сервиса "
 "DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "отключен"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "включен"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Мастер успешно настроил сервисы DHCP вашего сервера."
 
@@ -254,20 +284,20 @@ msgstr "Мастер успешно настроил сервисы DHCP ваш�
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Сервер NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Сервер NFS"
@@ -304,71 +334,72 @@ msgstr ""
 "предоставит локальный сервис DNS для имен локальных компьютеров с запросами "
 "имен, перенаправляемыми за пределы DNS."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Запрещенные хосты:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Имя сервера новостей"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Настраивается сервер DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -376,117 +407,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Этот адрес недействителен... нажмите Далее для продолжения"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Этот адрес недействителен... нажмите Далее для продолжения"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Этот адрес недействителен... нажмите Далее для продолжения"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Ошибка"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS (настройка)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Имя сервера новостей"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Баннер сервера:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "Nis Domain:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Мастер успешно добавил клиента."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Мастер успешно добавил клиента."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Мастер успешно настроил сервисы DNS вашего сервера."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Настройка системы в качестве сервера Nis+Autofs(nfs) ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Настройка системы в качестве сервера Nis+Autofs(nfs) ..."
@@ -578,27 +609,23 @@ msgstr "Установка завершилась неудачей"
 msgid "FTP wizard"
 msgstr "Мастер FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Мастер настройки сервера FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Этот мастер поможет вам настроить сервер FTP для вашей сети."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Не ставьте ни одной галочки, если вы не хотите включать сервер FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Сервер FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Выберите тип сервиса FTP, который вы хотите включить:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -606,75 +633,76 @@ msgstr ""
 "Ваш сервер может работать как сервер FTP в вашей внутренней сети (интранет) "
 "и как сервер FTP для Интернет."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Включить сервер FTP для Интранет"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Включить сервер FTP для Интернета"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Разрешенные хосты:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Предупреждение\n"
-"Вы используете dhcp, сервер может не работать с вашей конфигурацией."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Извините, для этого вы должны иметь права root'a..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Настраивается сервер FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -682,7 +710,7 @@ msgstr ""
 "Мастер собрал следующие параметры,\n"
 "необходимые для настройки вашего сервера FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -690,35 +718,35 @@ msgstr ""
 "Чтобы принять эти значения и настроить свой сервер, нажмите на кнопку Далее "
 "или используйте кнопку Назад, чтобы их исправить"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "отключен"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "включен"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Интранет сервер FTP"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Интернет-сервер FTP:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Мастер успешно настроил ваш Интернет/Интранет сервер FTP"
 
@@ -766,7 +794,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1047,7 +1075,7 @@ msgstr ""
 "Мастер собрал следующие параметры,\n"
 "необходимые для настройки вашего сервиса новостей Интернета:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1325,26 +1353,41 @@ msgstr "Настройка системы в качестве клиента Nis
 msgid "Nis Client"
 msgstr "Nis клиент:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Мастер Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Почтовый сервер"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Почтовый сервер"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Мастер настройки почты Интернет"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Этот мастер поможет вам настроить сервисы почты Интернета для вашей сети."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Адрес исходящей почты"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1352,7 +1395,7 @@ msgstr ""
 "Он должен быть выбран согласно адресу, который вы используете для входящей "
 "почты."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1360,19 +1403,27 @@ msgstr ""
 "Вы можете выбрать тип адреса, который исходящая почта будет показывать в "
 "полях \"From:\" и \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Маскированное имя домена:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Предупреждение:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Вы ввели пустой адрес почтового шлюза."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1381,15 +1432,21 @@ msgstr ""
 "пределы вашей локальной сети. Нажмите Далее для продолжения или Назад, чтобы "
 "ввести значение."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Маскарад не подходит!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Почтовый шлюз Интернета"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1399,7 +1456,7 @@ msgstr ""
 "например, если ваш провайдер \"провайдер.com\", почтовым сервером Интернета "
 "обычно выступает \"smtp.провайдер.com\""
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1407,29 +1464,29 @@ msgstr ""
 "Ваш сервер будет отправлять исходящую почту через почтовый шлюз, который "
 "позаботится о конечной доставке."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Имя почтового сервера"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Настраивается почта Интернета"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1437,29 +1494,34 @@ msgstr ""
 "Мастер собрал следующие параметры, необходимые для настройки вашего "
 "почтового сервиса Интернет:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Форма адреса"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Мастер успешно настроил почтовый сервис Интернета вашего сервера."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Настраивается сервер FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Сервер печати:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Настраивается сервер FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - доступ разрешен только этому серверу"
@@ -1641,7 +1703,8 @@ msgid "Access Control:"
 msgstr "Управление доступом:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Мастер успешно настроил ваш прокси сервер."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1659,12 +1722,6 @@ msgstr "Мастер Squid"
 msgid "PXE Wizard"
 msgstr "PXE Мастер"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Настроить PXE сервер"
@@ -2404,6 +2461,16 @@ msgstr "Каталог пользователя:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Мастер успешно настроил ваш Интранет/Интернет веб-сервер."
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Не ставьте ни одной галочки, если вы не хотите включать сервер FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Предупреждение\n"
+#~ "Вы используете dhcp, сервер может не работать с вашей конфигурацией."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/sk.po b/po/sk.po
index fd356783..220e4831 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-10 23:38+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@phuture.sk>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Sprievodca konfiguráciou"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -26,9 +26,9 @@ msgstr "Sprievodca konfiguráciou"
 msgid "Warning."
 msgstr "Upozornenie"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -36,12 +36,12 @@ msgid "Error."
 msgstr "Chyba."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -82,22 +82,22 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Tento sprievodca vám pomôže pridať nového klienta do vášho lokálneho DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identifikácia klienta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,22 +107,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Meno počítača:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP adresa počítača:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -130,7 +131,7 @@ msgstr ""
 "konfiguráciou."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -177,7 +178,7 @@ msgstr "IP klienta:"
 msgid "The wizard successfully added the client."
 msgstr "Sprievodca úspešne pridal klienta."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Sprievodca konfiguráciou DHCP"
 
@@ -194,51 +195,60 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Tento sprievodca vám pomôže nakonfigurovať DHCP službu pre váš server."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Rozsah adries používaných dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Vyberte si rozsah adries, ktoré budú pomocou DHCP služby prideľované "
 "pracovným staniciam; ak nemáte špeciálne požiadavky môžete bez obáv "
 "akceptovať navrhnuté hodnoty."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Najnižšia IP adresa:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Najvyššia IP adresa:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Rozsah IP adries nie je správny"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "špecifikovaný rozsah IP adries nie je z rozsahu serverovej siete"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP adresa servera nesmie byť v rozsahu"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurácia DHCP servera"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -246,11 +256,31 @@ msgstr ""
 "Sprievodca potrebuje vedieť nasledovné parametre pre nakonfigurovanie DHCP "
 "služby:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "zakázané"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "povolené"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Sprievodca úspešne nakonfiguroval DHCP službu na vašom serveri."
 
@@ -258,20 +288,20 @@ msgstr "Sprievodca úspešne nakonfiguroval DHCP službu na vašom serveri."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS server"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS server"
@@ -308,72 +338,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Zakázaní hostitelia:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Predpokladané doménové meno"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurácia DNS servera"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Externá brána"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -381,117 +412,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Toto nie je správna adresa... stlačte Ďalej pre pokračovanie"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Toto nie je správna adresa... stlačte Ďalej pre pokračovanie"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Toto nie je správna adresa... stlačte Ďalej pre pokračovanie"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Chyba."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS sprievodca (konfigurácia)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Predpokladané doménové meno"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP adresa servera:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Meno servera:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Sprievodca úspešne pridal klienta."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Sprievodca úspešne pridal klienta."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Sprievodca úspešne nakonfiguroval DNS služby na vašom serveri."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurácia DNS servera"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurácia DNS servera"
@@ -592,27 +623,23 @@ msgstr "inštalácia zlyhala"
 msgid "FTP wizard"
 msgstr "Sprievodca konfiguráciou FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Sprievodca konfiguráciou FTP servera"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Tento sprievodca vám pomôže nastaviť FTP server pre vašu sieť."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Nezaškrtávajte žiadne políčka ak nechcete aktivovať FTP server."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Vyberte si typ FTP služby, ktorú chcete aktivovať:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -620,76 +647,76 @@ msgstr ""
 "Váš server môže poskytovať FTP služby pre vašu internú sieť (intranet) a "
 "rovnako aj vrámci siete Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Povoliť FTP server pre Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Povoliť FTP server pre Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Povolený hostitelia:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Varovanie\\nMáte nastavené dhcp, server nemusí fungovať s touto "
-"konfiguráciou."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Prepáčte, pre vykonanie tohto musíte byť root..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Konfigurácia FTP servera"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -698,7 +725,7 @@ msgstr ""
 "Sprievodca zozbieral nasledovné parametre potrebné pre konfiguráciu vášho "
 "FTP servera"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -707,35 +734,35 @@ msgstr ""
 "Pre akceptovanie týchto hodnôt a nakonfigurovanie vášho servera, kliknite na "
 "tlačidlo Ďalej, alebo použite tlačítko Späť pre ich úpravu."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "zakázané"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "povolené"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet FTP server:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet FTP server:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Sprievodca úspešne nakonfiguroval váš Intranet/Internet FTP server"
 
@@ -783,7 +810,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1066,7 +1093,7 @@ msgstr ""
 "Sprievodca získal nasledovné parametre potrebné pre konfiguráciu vašej news "
 "služby:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1344,27 +1371,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP klienta:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Sprievodca konfiguráciou postfixu"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Meno mail servera:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Meno mail servera:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Sprievodca konfiguráciou internetovej pošty"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Tento sprievodca vám pomôže nakonfigurovať systém Internetovej elektronickej "
 "pošty pre vašu sieť."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Adresa odchodzej pošty"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1372,7 +1414,7 @@ msgstr ""
 "Toto by malo byť zvolené v súlade s adresou, ktorú používate pre príchodziu "
 "poštu."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1380,19 +1422,27 @@ msgstr ""
 "Môžete si nastaviť adresy, ktoré budú mať odchodzie emaily v hlavičkách "
 "\"From:\" a \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maškarádované doménové meno:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Upozornenie:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Vložili ste prázdnu adresu poštovej brány."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1401,15 +1451,21 @@ msgstr ""
 "lokálnej siete. Stlačte Ďalej pre pokračovanie, alebo sa vráťte späť a "
 "zadajte potrebné hodnoty."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maškaráda nie je moc dobrá!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internetová poštová brána"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1419,7 +1475,7 @@ msgstr ""
 "\"; napríklad ak váš provider je \"provider.sk\" internetový mail server "
 "bude zrejme \"smtp.provider.sk\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1427,29 +1483,29 @@ msgstr ""
 "Váš server pošle odchodziu poštu cez mail bránu, ktorá vykoná konečné "
 "doručenie."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Meno mail servera:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurácia emailu"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1457,31 +1513,36 @@ msgstr ""
 "Sprievodca zozbieral nasledovné parametre potrebné pre konfiguráciu "
 "poštového systému:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Formát adresy"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Sprievodca úspešne nakonfiguroval Internetový poštový systém na vašom "
 "serveri."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Konfigurácia FTP servera"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Tlačový server:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Konfigurácia FTP servera"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - prístup obmedzený iba pre tento server"
@@ -1663,7 +1724,8 @@ msgid "Access Control:"
 msgstr "Kontrola prístupu:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Sprievodca úspešne nakonfiguroval váš proxy server."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1681,12 +1743,6 @@ msgstr "Sprievodca nastavením squid"
 msgid "PXE Wizard"
 msgstr "Sprievodca konfiguráciou FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2414,6 +2470,17 @@ msgstr "Použivateľov priečinok:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Sprievodca úspešne nakonfiguroval váš Internet/Intranet Web server"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Nezaškrtávajte žiadne políčka ak nechcete aktivovať FTP server."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Varovanie\\nMáte nastavené dhcp, server nemusí fungovať s touto "
+#~ "konfiguráciou."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/sq.po b/po/sq.po
index 6a4931c1..52e4a664 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2002-03-29 19:23+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Asistenti Konfigurues"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -30,9 +30,9 @@ msgstr "Asistenti Konfigurues"
 msgid "Warning."
 msgstr "Kujdes"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -40,12 +40,12 @@ msgid "Error."
 msgstr "Gabim."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -88,15 +88,15 @@ msgstr ""
 "Ky asistent do t� ju ndihmoj n� shtimin e nj� klienti t� ri n� rrjetin tuaj "
 "lokal DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identifikimi i klientit:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Emri i makin�s:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Adresa IP e makin�s:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Kujdes"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -138,7 +139,7 @@ msgstr ""
 "funksionoj, me k�t� konfigurim."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -185,7 +186,7 @@ msgstr "Klient IP:"
 msgid "The wizard successfully added the client."
 msgstr "Asistenti e ka shtuar nj� klient me sukses."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Aistenti DHCP"
 
@@ -204,52 +205,61 @@ msgstr ""
 "serverit tuaj."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Trev� e adresave duke i p�rdorur nga dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Zgjedhni trev�n e adresave t� n�nvizuara n� stacionin punues nga serviset "
 "DHCP; vet�m n� rastet specifike, ju mund ti pranoni vlerat e propozuara."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Adres� m� e ult� IP:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Adres� m� e lart� IP:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Treva IP e specifikuar nuk �sht� e sakt�"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Treva IP e specifikuar nuk gjindet n� serverin e trev�s s� adresave t� "
 "rrjetit"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP e serverit nuk duhet t� gjindet n� trev�"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurimi i Serverit DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -257,11 +267,31 @@ msgstr ""
 "Asistenti p�rmbledh�s i parametrave vijues ka nevoj� p�r konfigurmin e "
 "sh�rbimeve DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "jo-aktiv"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "aktiv"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 "Asistenti i ka konfiguruar me sukses sh�rbimet e DHCP n� serverin tuaj."
@@ -270,20 +300,20 @@ msgstr ""
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Server NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Server NFS"
@@ -321,72 +351,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Ftues t� pa autorizuar:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Emri i Pron�s Llogarit�se"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurimi i Serverit DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Kalimtare e jashtme"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -394,117 +425,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, 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:172
+#: ../dns_wizard/Bind.pm:171
 #, 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:177
+#: ../dns_wizard/Bind.pm:176
 #, 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Gabim."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Asistenti DNS (konfigurimi)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Emri i Pron�s Llogarit�se"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Adresa IP e Serverit:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Emri i Serverit:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Asistenti e ka shtuar nj� klient me sukses."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Asistenti e ka shtuar nj� klient me sukses."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurimi i Serverit DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurimi i Serverit DNS"
@@ -605,30 +636,25 @@ msgstr "instalimi d�shtoi"
 msgid "FTP wizard"
 msgstr "Asistenti FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Asistent Konfugurues p�r FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Ky asistent do t� ju ndihmoj� n� konfigurmin e nj� Serveri FTP p�r rrjetin "
 "tuaj."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Mos sh�noni n� asnj� kuti n�se ju nuk d�shironi ta aktivizoni serverin FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Server FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Zgjedheni tipin e sh�rbimeve q� ju d�shironi ti aktivizoni:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -636,76 +662,76 @@ msgstr ""
 "Serveri juaj mund t� p�rdoret sikur Server FTP p�r rrjetin tuaj lokal "
 "(intranet) dhe njashtu edhe Server FTP p�r Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Aktivizim i Serverit FTP p�r Rrjet Lokal (Intranet)"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Aktivizim i Serverit FTP p�r Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Ftues t� autorizuar:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Kujdes\\nJu gjindeni n� dhcp, serveri i caktuar �sht� e mundur q� nuk do t� "
-"funksionoj, me k�t� konfigurim."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Kemi ndjes, ju duhet t� jeni administrator p�r t� b�r� k�t�..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Konfigurimi i Serverit FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -714,7 +740,7 @@ msgstr ""
 "Asistenti i ka p�rmbledhur paramatrat vijues q� i nevojiten n� konfigurmin e "
 "serverit tuaj FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -723,35 +749,35 @@ msgstr ""
 "P�r ti pranuar k�to vlera, dhe konfiguruar n� serverin tuaj, klikoni mbi "
 "kops�n Tjetri ose p�rdoreni kops�n Mbrapa p�r ti korigjuar ato."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "jo-aktiv"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "aktiv"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Server FTP p�r Rrjet Lokal (Intranet):"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Server FTP p�r Internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Aistenti e ka konfiguruar me sukses Serverin FTP Intranet/Internet"
 
@@ -799,7 +825,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1085,7 +1111,7 @@ msgstr ""
 "Asistenti i ka p�rmbledhur me sukses parametrat vijues q� nevojiten p�r ta "
 "konfiguruar Servisin e Lajmeve tuaja:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1367,27 +1393,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Klient IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Asistenti Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Emri i Serverit Mail:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Emri i Serverit Mail:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Asistent Konfigurimi n� Internet p�r Mail"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Ky asistent do t� ju ndihmoj� n� konfigurimin e sh�rbimeve t� Letrave "
 "Elektronike n� rrjetin tuaj."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Adresa p�r Daljen e Mail"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1395,7 +1436,7 @@ msgstr ""
 "Kjo mund�si duhet t� jet� e nj�jt� me adres�n q� ju e p�rdorni p�r ti "
 "pranuar letrat hyr�se."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1403,19 +1444,27 @@ msgstr ""
 "Ju mund ta zgjedhni form�n e adres�s t� mesazheve dal�se q� posedojn� zonat "
 "\"From:\" dhe \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Emri i pron�s llogarit�se:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Kujdes:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Ju e keni futur nj� adres� t� zbraz�t p�r kalimtarin."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1424,15 +1473,21 @@ msgstr ""
 "e nj� letre (mail) jasht� rrjetit tuaj lokal. Klikoni mbi Tjetri p�r t� "
 "vazhduar ose mbi Mbrapa p�r ta ndryshuar."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskimi i adres�s nuk �sht� korrekt!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1442,7 +1497,7 @@ msgstr ""
 "domaintype\"; p�r shembull, n�se furnizuesi i juaj �sht� \"provider.com\", "
 "serveri i letreva elektronike (mail) �sht� ky \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1450,29 +1505,29 @@ msgstr ""
 "Serveri juaj do ti d�rgoj t� gjitha lajmet dal�se n� drejtim t� nj� zone "
 "kaluese, e cila do t� kujdeset p�r d�rgimin e tyre final."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Emri i Serverit Mail:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurimi i Mesazheve (Mail) n� Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1480,31 +1535,36 @@ msgstr ""
 "Asistenti i ka p�rmbledhur parametrat vijues q� i nevojiten n� konfigurimin "
 "e Sh�rbimit tuaj Internet p�r Letrat Elektronike (Mail):"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Forma e Adres�s"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Asistenti i ka konfiguruar me sukses sh�rbimet e lajm�ruesit Internet p�r "
 "rrjetin tuaj."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Konfigurimi i Serverit FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server Stampimi:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Konfigurimi i Serverit FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - hyrjet e kufizuara vet�m n� k�t� server"
@@ -1688,7 +1748,8 @@ msgid "Access Control:"
 msgstr "Hyrjet Kontroluese:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Asistenti e ka konfiguruar me sukses serverin proxy."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1706,12 +1767,6 @@ msgstr "Asistenti Squid"
 msgid "PXE Wizard"
 msgstr "Asistenti FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2457,6 +2512,19 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "Asistenti e ka konfiguruar me sukses Serverin tuaj Web p�r Intranet/Internet"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Mos sh�noni n� asnj� kuti n�se ju nuk d�shironi ta aktivizoni serverin "
+#~ "FTP."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Kujdes\\nJu gjindeni n� dhcp, serveri i caktuar �sht� e mundur q� nuk do "
+#~ "t� funksionoj, me k�t� konfigurim."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/sr.po b/po/sr.po
index 87411b6d..12cdb908 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Чаробњак за подешавање"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "Чаробњак за подешавање"
 msgid "Warning."
 msgstr "Упозорење"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -40,12 +40,12 @@ msgid "Error."
 msgstr "Грешка у чаробњаку."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -86,22 +86,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Овај чаробњак ће Вам помоћи да додате новог клијента локалном DNS-у."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(не морате да унесете domain након тог имена)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Идентификација клијента:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +111,30 @@ msgstr ""
 "net. Сваки рачунар на мрежи мора да има јединствену IP адресу, у обичном "
 "формату (четири броја раздвојених тачкама)."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Име рачунара:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP адреса рачунара:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Упозорење\\nВи сте у dhcp, сервер може да не ради уз оваква подешавања."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -180,7 +181,7 @@ msgstr "Клијентски IP:"
 msgid "The wizard successfully added the client."
 msgstr "Чаробњак је успешно додао клијента."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP чаробњак"
 
@@ -196,49 +197,58 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Овај чаробњак ће Вам помоћи да подесите DHCP сервисе Вашег сервера."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Опсег адреса које dhcp користи"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr "Изаберите опсег адреса"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Најнижа IP адреса:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Највиша IP адреса"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Опсег IP адреса који сте задали није исправан"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Опсег IP адреса који сте задали није у распону за адресу мрежног сервера"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP адреса сервера не сме бити у распону"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Подешавање DHCP сервера"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -246,11 +256,31 @@ msgstr ""
 "Чаробњак сакупља следеће параметре који су потребни да би се подесио Ваш "
 "DHCP сервис:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "искључен"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "укључен"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Чаробњак је успешно подесио DHCP сервисе Вашег сервера."
 
@@ -258,20 +288,20 @@ msgstr "Чаробњак је успешно подесио DHCP сервисе
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS сервер"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS сервер"
@@ -308,72 +338,73 @@ msgstr ""
 "подешавања ће пружити локални DNS сервис за локална имена рачунара, са не-"
 "локалним захтевима који се шаљу ван DNS-а."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Одбиј домаћине:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Прпрачунато Име домена"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Подешавање DNS сервера"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Спољни gateway"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -381,117 +412,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Адреса није исправна... притисните даље да би сте наставили"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Адреса није исправна... притисните даље да би сте наставили"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Адреса није исправна... притисните даље да би сте наставили"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Грешка у чаробњаку."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS чаробњак (подешавање)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Прпрачунато Име домена"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP адреса сервера:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Име сервера:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Чаробњак је успешно додао клијента."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Чаробњак је успешно додао клијента."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Чаробњак је успешно подесио DNS сервисе за Ваш сервер."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Подешавање DNS сервера"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Подешавање DNS сервера"
@@ -589,29 +620,23 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP чаробњак"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Чаробњак за подешавање FTP сервера"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Овај чаробњак ће вам помоћи да подесите FTP сервер на Вашој мрежи."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Немојте да изаберете било које од поља ако не желите да активирате Ваш FTP "
-"сервер."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP сервер"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Изаберите врсту FTP сервиса коју желите да активирате:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -619,75 +644,76 @@ msgstr ""
 "Ваш сервер може да се понаша као FTP сервер за Вашу интерну мрежу "
 "(интранет), као и FTP сервер за интернет."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Укључи FTP сервер за интранет"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Укључи FTP сервер за интернет"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Дозволи домаћине:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Упозорење\\nВи сте у dhcp, сервер може да не ради уз оваква подешавања."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "На -алост, морате да будете администратор како би сте то учинили..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Подешавање FTP сервера"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -696,7 +722,7 @@ msgstr ""
 "Чаробњак је сакупи следеће параметре који су потребни да би се подесио FTP "
 "сервер"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -705,35 +731,35 @@ msgstr ""
 "Да би сте прихватили ове вредности, и подесили Ваш сервер, кликните на дугме "
 "Даље или искористите дугме Назад да би сте их исправили."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "искључен"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "укључен"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Интранет FTP сервер:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Интернет FTP сервер:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Чаробњак је успешно подесио Ваш интернет/интранет FTP сервер"
 
@@ -781,7 +807,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1066,7 +1092,7 @@ msgstr ""
 "Чаробњак је сакупио следеће параметре који су потребни да би сте подесили "
 "Ваш интернет news сервис:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1343,27 +1369,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Клијентски IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Постфиск чаробњак"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Име сервера поште:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Име сервера поште:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Чаробњак за подешавање интернет поште"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Овај чаробњак ће Вам помоћи да подесите интернет поштанске сервисе на Вашој "
 "мрежи."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Адреса излазне поште"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1371,7 +1412,7 @@ msgstr ""
 "Ово би требало да буде одабрано доследно са адресама које користите за "
 "пристиглу пошту."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1379,20 +1420,28 @@ msgstr ""
 "Можете да изаберете шта ће се појављивати у следећим пољима излазних порука: "
 "\"From\" и \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Прпрачунато Име домена"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Упозорење:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Унели сте празну адресу за mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1401,15 +1450,21 @@ msgstr ""
 "мреже. Притисните дугме даље да би сте наставили, или назад да би сте унели "
 "вредност."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Прерушавање је лоше!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Интернет Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1419,7 +1474,7 @@ msgstr ""
 "на пример, ако је ваш пружалац \"pruzalac.com\", адреса поштанског сервера "
 "је обично \"smtp.pruzalac.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1427,29 +1482,29 @@ msgstr ""
 "Ваш сервер ће слати излазну пошту кроз капију за пошту, која ће се бринути "
 "за коначну испоруку."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Име сервера поште:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Подешавање интернет поште"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1457,30 +1512,35 @@ msgstr ""
 "Овај чаробњак је сакупио следеће параметре потрбне за подешавање Вашег "
 "интернет поштанског сервиса:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Облик адресе"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Овај чаробњак је успешно подесио сервис интернет поште на Вашем серверу."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Подешавање FTP сервера"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Сервер за штампање:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Подешавање FTP сервера"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Локални домаћин - приступ је ограничен само на овај сервер"
@@ -1659,7 +1719,8 @@ msgid "Access Control:"
 msgstr "Контрола приступа:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Чаробњак је успешно подесио ваш прокси сервер."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1677,12 +1738,6 @@ msgstr "Squid чаробњак"
 msgid "PXE Wizard"
 msgstr "FTP чаробњак"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2414,6 +2469,18 @@ msgstr "КОриснички директоријум:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Чаробњак је успешно подесио ваш интранет/интернет Web сервер"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Немојте да изаберете било које од поља ако не желите да активирате Ваш "
+#~ "FTP сервер."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Упозорење\\nВи сте у dhcp, сервер може да не ради уз оваква подешавања."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 219f4b86..a3132112 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-02-28 22:08+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Čarobnjak za podešavanje"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "Čarobnjak za podešavanje"
 msgid "Warning."
 msgstr "Upozorenje"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -40,12 +40,12 @@ msgid "Error."
 msgstr "Greška u čarobnjaku."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -87,22 +87,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Ovaj čarobnjak će Vam pomoći da dodate novog klijenta lokalnom DNS-u."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Identifikacija klijenta:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +112,30 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Ime računara:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP adresa računara:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Upozorenje\\nVi ste u dhcp, server može da ne radi uz ovakva podešavanja."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -181,7 +182,7 @@ msgstr "Klijentski IP:"
 msgid "The wizard successfully added the client."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP čarobnjak"
 
@@ -198,49 +199,58 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Ovaj čarobnjak će Vam pomoći da podesite DHCP servise Vašeg servera."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Opseg adresa koje dhcp koristi"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr "Izaberite opseg adresa"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Najniža IP adresa:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Najviša IP adresa"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Opseg IP adresa koji ste zadali nije ispravan"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Opseg IP adresa koji ste zadali nije u rasponu za adresu mrežnog servera"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP adresa servera ne sme biti u rasponu"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Podešavanje DHCP servera"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -248,11 +258,31 @@ msgstr ""
 "Čarobnjak sakuplja sledeće parametre koji su potrebni da bi se podesio Vaš "
 "DHCP servis:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "isključen"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "uključen"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
 
@@ -260,20 +290,20 @@ msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS server"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS server"
@@ -310,72 +340,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Odbij domaćine:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Prpračunato Ime domena"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Podešavanje DNS servera"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Spoljni gateway"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -383,117 +414,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, 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:172
+#: ../dns_wizard/Bind.pm:171
 #, 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:177
+#: ../dns_wizard/Bind.pm:176
 #, 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Greška u čarobnjaku."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS čarobnjak (podešavanje)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Prpračunato Ime domena"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP adresa servera:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Ime servera:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Čarobnjak je uspešno dodao klijenta."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, 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:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Podešavanje DNS servera"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Podešavanje DNS servera"
@@ -591,29 +622,23 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP čarobnjak"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Čarobnjak za podešavanje FTP servera"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite FTP server na Vašoj mreži."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Nemojte da izaberete bilo koje od polja ako ne želite da aktivirate Vaš FTP "
-"server."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP server"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Izaberite vrstu FTP servisa koju želite da aktivirate:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -621,75 +646,76 @@ msgstr ""
 "Vaš server može da se ponaša kao FTP server za Vašu internu mrežu "
 "(intranet), kao i FTP server za internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Uključi FTP server za intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Uključi FTP server za internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Dozvoli domaćine:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Upozorenje\\nVi ste u dhcp, server može da ne radi uz ovakva podešavanja."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Na -alost, morate da budete administrator kako bi ste to učinili..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Podešavanje FTP servera"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -698,7 +724,7 @@ msgstr ""
 "Čarobnjak je sakupi sledeće parametre koji su potrebni da bi se podesio FTP "
 "server"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -707,35 +733,35 @@ msgstr ""
 "Da bi ste prihvatili ove vrednosti, i podesili Vaš server, kliknite na dugme "
 "Dalje ili iskoristite dugme Nazad da bi ste ih ispravili."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "isključen"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "uključen"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet FTP server:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet FTP server:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Čarobnjak je uspešno podesio Vaš internet/intranet FTP server"
 
@@ -783,7 +809,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1068,7 +1094,7 @@ msgstr ""
 "Čarobnjak je sakupio sledeće parametre koji su potrebni da bi ste podesili "
 "Vaš internet news servis:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1345,27 +1371,42 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Klijentski IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfisk čarobnjak"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Ime servera pošte:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Ime servera pošte:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Čarobnjak za podešavanje internet pošte"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Ovaj čarobnjak će Vam pomoći da podesite internet poštanske servise na Vašoj "
 "mreži."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Adresa izlazne pošte"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1373,7 +1414,7 @@ msgstr ""
 "Ovo bi trebalo da bude odabrano dosledno sa adresama koje koristite za "
 "pristiglu poštu."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1381,20 +1422,28 @@ msgstr ""
 "Možete da izaberete šta će se pojavljivati u sledećim poljima izlaznih "
 "poruka: \"From\" i \"Reply-to\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "Prpračunato Ime domena"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Upozorenje:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Uneli ste praznu adresu za mail gateway."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1403,15 +1452,21 @@ msgstr ""
 "mreže. Pritisnite dugme dalje da bi ste nastavili, ili nazad da bi ste uneli "
 "vrednost."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Prerušavanje je loše!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet Mail Gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1421,7 +1476,7 @@ msgstr ""
 "na primer, ako je vaš pružalac \"pruzalac.com\", adresa poštanskog servera "
 "je obično \"smtp.pruzalac.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1429,29 +1484,29 @@ msgstr ""
 "Vaš server će slati izlaznu poštu kroz kapiju za poštu, koja će se brinuti "
 "za konačnu isporuku."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Ime servera pošte:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Podešavanje internet pošte"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1459,30 +1514,35 @@ msgstr ""
 "Ovaj čarobnjak je sakupio sledeće parametre potrbne za podešavanje Vašeg "
 "internet poštanskog servisa:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Oblik adrese"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Ovaj čarobnjak je uspešno podesio servis internet pošte na Vašem serveru."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Podešavanje FTP servera"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Server za štampanje:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Podešavanje FTP servera"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Lokalni domaćin - pristup je ograničen samo na ovaj server"
@@ -1662,7 +1722,8 @@ msgid "Access Control:"
 msgstr "Kontrola pristupa:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Čarobnjak je uspešno podesio vaš proksi server."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1680,12 +1741,6 @@ msgstr "Squid čarobnjak"
 msgid "PXE Wizard"
 msgstr "FTP čarobnjak"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2420,6 +2475,18 @@ msgstr "KOrisnički direktorijum:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Čarobnjak je uspešno podesio vaš intranet/internet Web server"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Nemojte da izaberete bilo koje od polja ako ne želite da aktivirate Vaš "
+#~ "FTP server."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Upozorenje\\nVi ste u dhcp, server može da ne radi uz ovakva podešavanja."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/sv.po b/po/sv.po
index 9ebfbd22..4cb3ddbc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-23 21:20+0100\n"
 "Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "konfigurationsguide"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,9 +34,9 @@ msgstr "konfigurationsguide"
 msgid "Warning."
 msgstr "Varning."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -44,12 +44,12 @@ msgid "Error."
 msgstr "Fel."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -89,22 +89,22 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Den här guiden hjälper dig att lägga till en ny klient i din lokala DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Klientidentifiering:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,26 +114,27 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Datorns namn:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "Datorns IP-adress:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Varning"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -179,7 +180,7 @@ msgstr "Klient-IP:"
 msgid "The wizard successfully added the client."
 msgstr "Guiden lyckades med att lägga till klienten."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Guide för DHCP"
 
@@ -196,47 +197,56 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Den här guiden hjälper dig att konfigurera DHCP-tjänsterna på servern."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Adressomfång som används av DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Välj adressomfånget som ska tilldelas arbetsstationer av DHCP-tjänsten.Om du "
 "inte har speciella behov kan du acceptera de förvalda värdena."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Lägsta IP-adress:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Högsta IP-adress:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "IP-omfånget som specificerats är inte korrekt."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "IP-omfånget som specificerats är inte i serverns nätverksadressomfång."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "IP-adressen på servern kan inte vara i omfånget."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurerar DHCP-servern"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -244,11 +254,31 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera DHCP-"
 "tjänsten:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "inaktiverad"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "aktiverad"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Gränssnitt:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Guiden lyckades med att konfigurera DHCP-tjänsterna på servern."
 
@@ -256,19 +286,19 @@ msgstr "Guiden lyckades med att konfigurera DHCP-tjänsterna på servern."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "DNS-huvudserver"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "DNS-slavserver"
 
@@ -302,69 +332,70 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "Vad vill du göra:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "Ta bort värddator:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "Datornamn:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Konfigurerar DNS-servern"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "Extern DNS:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr "Lägg till sökdomän"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -372,113 +403,113 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Detta är inte en giltig adress, klicka på Nästa för att fortsätta"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Detta är inte en giltig adress, klicka på Nästa för att fortsätta"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Detta är inte en giltig adress, klicka på Nästa för att fortsätta"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "Fel:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Konfigurationsguide för DNS"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "Datornamn:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "Datorns IP-adress:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "Servervärddatornamn:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Guiden lyckades med att lägga till klienten."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Guiden lyckades med att lägga till klienten."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Guiden lyckades med att konfigurera DNS-tjänsterna på servern."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Konfigurerar DNS-servern"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Konfigurerar DNS-servern"
@@ -568,28 +599,24 @@ msgstr "Installation misslyckades"
 msgid "FTP wizard"
 msgstr "Guide för FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Konfigurationsguide för FTP-server"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Den här guiden hjälper dig att konfigurera en FTP-server för ditt nätverk."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Markera ingen ruta om du inte vill aktivera FTP-servern."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Välj vilken form av FTP-tjänst du vill aktivera:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -597,75 +624,76 @@ msgstr ""
 "Servern kan uppträda som en FTP-server mot ditt interna nätverk (Intranät) "
 "och som en FTP-server för Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Aktivera FTP-servern för Intranätet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Aktivera FTP-servern för Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Tillåt datorer:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Varning\n"
-"Du är i DHCP, servern kanske inte fungerar med din konfiguration."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Tyvärr, du måste vara root för att göra det här."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Konfigurerar FTP-servern"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -673,7 +701,7 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs\n"
 "för att konfigurera FTP-servern"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -682,35 +710,35 @@ msgstr ""
 "För att acceptera dessa värden och för att konfigurera servern, klicka på "
 "Nästa eller använd Tillbaka för att korrigera dem."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "inaktiverad"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "aktiverad"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "FTP-server för Intranät:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "FTP-server för Internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Guiden lyckades med att konfigurera FTP-servern för Intranät/Internet"
 
@@ -758,7 +786,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1041,7 +1069,7 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera "
 "diskussionsgruppstjänsten:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1314,34 +1342,49 @@ msgstr ""
 msgid "Nis Client"
 msgstr "NIS-klient"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Guide för Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "E-postserver"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "E-postserver"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Konfigurationsguide för Internet-e-post"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Den här guiden hjälper dig att konfigurera tjänsterna för Internet-e-post "
 "för ditt nätverk."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Utgående e-postadress"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 "Detta bör väljas konsekvent med adressen du använder för inkommande e-post."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 #, fuzzy
 msgid ""
 "You can select the kind of address that outgoing mail will show in the "
@@ -1350,19 +1393,27 @@ msgstr ""
 "Du kan välja vilken typ av adress som utgående post ska visa i fälten \"Från:"
 "\" och \"Svara till\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maskera domännamn:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Varning:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Du angav en tom adress för e-post-gateway."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1371,15 +1422,21 @@ msgstr ""
 "lokala nätverk. Klicka på Nästa för att fortsätta eller Tillbaka för att "
 "ange ett värde."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Maskering är inte bra."
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Gateway för Internet-e-post"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
@@ -1390,7 +1447,7 @@ msgstr ""
 "leverantör är \"leverantör.se\", är e-postservern för Internet vanligtvis "
 "\"smtp.leverantör.se\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1398,29 +1455,29 @@ msgstr ""
 "Din server skickar den utgående posten genom en e-post-gateway som tar hand "
 "om den slutgiltiga leveransen."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Namn på e-postserver:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurerar e-post för Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1428,31 +1485,36 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera e-"
 "posttjänsten för Internet"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Adressens form"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Guiden lyckades med att konfigurera tjänsterna för Internet-e-post på "
 "servern."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Konfigurerar FTP-servern"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Skrivarserver:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Konfigurerar FTP-servern"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr ""
@@ -1631,7 +1693,8 @@ msgid "Access Control:"
 msgstr "Åtkomstkontroll:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Guiden lyckades med att konfigurera proxyservern."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1647,12 +1710,6 @@ msgstr "Proxy för Squid"
 msgid "PXE Wizard"
 msgstr "PXE-guide"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2371,3 +2428,13 @@ msgstr "Användarkatalog:"
 #: ../web_wizard/Apache.pm:146
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Guiden lyckades med att konfigurera Intranät/Internet-webbservern"
+
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Markera ingen ruta om du inte vill aktivera FTP-servern."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Varning\n"
+#~ "Du är i DHCP, servern kanske inte fungerar med din konfiguration."
diff --git a/po/ta.po b/po/ta.po
index fe736691..c5bb8f52 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-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2002-09-06 00:50+0800\n"
 "Last-Translator: prabu<prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "வடிவமைப்பு மாயாவி"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "வடிவமைப்பு மாயாவி"
 msgid "Warning."
 msgstr "எச்சரிக்ைக"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -40,12 +40,12 @@ msgid "Error."
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -87,22 +87,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "இந்த மாயாவி புதிய வேண்டியை உங்கள் local DNS.க்கு சேர்க்க உதவும்"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(நீங்கள் கணினியின்/வேண்டியின் பெயரையடுத்து களத்தின் பெயரைத் தர வேண்டும்)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "வேண்டியின் அடையாளம்"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,29 +112,30 @@ msgstr ""
 "company.net. அதே வகையில் ஒவ்ெவாரு கணினியும் தனி  IP முகவரியுடன் அடையாளம்  "
 "காணப்படும்."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "கணினியின் பெயர்:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "இயக்கத்தின்  IP முகவரி"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "எச்சரிக்ைக"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "எச்சரிக்ைக,\\n நீங்கள் dhcp சேவையகத்தில் உள்ளீர்கள், சேவையகம் வேலை செய்வதை நிறுத்தி விடலாம்"
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -182,7 +183,7 @@ msgstr "வேண்டியின் IP:"
 msgid "The wizard successfully added the client."
 msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP மாயாவி"
 
@@ -198,60 +199,89 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "இந்த மாயாவி உங்கள் DHCP சேவைகளை வடிவமைக்க உதவும்"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "dhcp பயன்படுத்தப் போகும் முகவரிகளின் வீச்சு"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "DHCP சேவை மூலம் உங்கள் வேண்டிகளுக்கு கொடுக்க வேண்டிய முகவரிகளைத் தேர்வுச் செய்யவும். "
 "பொதுவாக இங்கே கொடுக்கப்பட்டுள்ள மதிப்புகளை நீங்கள் பயன்படுத்தலாம்"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "குறைந்தபட்ச IP முகவரி:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "அதிகபட்ச IP முகவரி:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "நீங்கள் கொடுத்துள்ள IP வீச்சில் தவறுள்ளது"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "நீங்கள் கொடுத்துள்ள IP வீச்சு ேசவையக வலைய வீச்சில் இல்ைல"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "ேசவையகத்தின் IP இந்ம வீச்சில் இருக்க ேவண்டும்"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "உங்கள் DHCP சேவைகளை வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "முடமாக்கப்பட்டுள்ளது"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "செயல்படுத்தப்பட்டுள்ளது"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "இந்த மாயாவி உங்கள் DHCP சேவைகளை வெற்றிகரமாக வடிவமைத்துவிட்டது"
 
@@ -259,20 +289,20 @@ msgstr "இந்த மாயாவி உங்கள் DHCP சேவைக�
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS சேவையகம்"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS சேவையகம்"
@@ -309,72 +339,73 @@ msgstr ""
 "வலையமைப்பகத்தில் உள்ள கணினிகளுக்கு  DNS சேவைகளை வழங்கும். வெளியில் உள்ள வலையமைப்புகளைப் "
 "பற்றிய DNS  வினாக்களுக்கு வெளியிலுள்ள DNS சேவையகத்துக்குச் செல்லும்"
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "கணினிகளை மறுக்கவும்"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "வெளிப்புற நுழைவாயில்"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -382,117 +413,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "இது தவறான முகவரி...தொடர்வதற்கு அடுத்தது என்ற பொத்தானை அழுத்து"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "இது தவறான முகவரி...தொடர்வதற்கு அடுத்தது என்ற பொத்தானை அழுத்து"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "இது தவறான முகவரி...தொடர்வதற்கு அடுத்தது என்ற பொத்தானை அழுத்து"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "மாயாவியில் பிழை நேர்ந்துள்ளது"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS மாயாவி (வடிவமைப்பு)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "கணினி முகவரி"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "கணினியின் பெயர்:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "மாயாவி உங்கள் வேண்டியை வெற்றிகரமாகச் சேர்த்துவிட்டது"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "மாயாவி உங்கள் DNS சேவைகளை வெற்றிகரமாக வடிவமைத்தது"
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
@@ -593,29 +624,23 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP மாயாவி"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP சேவையக வடிவமைப்பு மாயாவி"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "இந்த மாயாவி உங்கள் வலையமைப்பிற்கு FTP சேவையகத்ைத வடிவமைத்து தரும்"
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"உங்களுக்கு FTP சேவையை பயன்படுத்த விருப்பமில்ைலயென்றால் எந்த பெட்டியையும் தேர்வுச் "
-"செய்யாதீர்கள்"
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP சேவையகம்"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "நீங்கள் செயல்படுத்த விரும்பும் FTP சேவை வகையைத் தேர்வுச் செய்யவும்"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -623,82 +648,83 @@ msgstr ""
 "உங்கள் சேவையகம் FTP சேவையை உள்ளமை வலையமைப்புக்கு மட்டும் அல்லது இணையத்திற்கும் சேர்த்து "
 "வழங்கலாம்"
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "FTP சேவையை இணையத்திற்காகச் செயல்படுத்து"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "FTP சேவையை இணையத்திற்காகச் செயல்படுத்து "
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "கணினிகளை அனுமதி"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"எச்சரிக்ைக,\\n நீங்கள் dhcp சேவையகத்தில் உள்ளீர்கள், சேவையகம் வேலை செய்வதை நிறுத்தி விடலாம்"
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "மன்னிக்கவும், இதைச் செய்ய நீங்கள் நிர்வாகியாக இருக்க வேண்டும்"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "உங்கள் FTP சேவையை வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -708,35 +734,35 @@ msgstr ""
 "பொத்தானை தேர்வுச்ெசய், அல்லது மாற்றங்கள் செய்ய பின்னால் என்ற பொத்தானை தேர்வுச்ெசய்து பின்னால் "
 "செல்லவும்"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "முடமாக்கப்பட்டுள்ளது"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "செயல்படுத்தப்பட்டுள்ளது"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "அக இணைய FTP சேவையகம்"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "FTP இணையச் சேவையகம் :"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "மாயாவி உங்கள் FTP இணையச் சேவையகத்ைத வெற்றிகரமாக வடிவமைத்தது"
 
@@ -784,7 +810,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1067,7 +1093,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr "உங்கள் செய்தியஞ்சல் சேவையகத்ைத வடிவமைக்க மாயாவி கீழுள்ள விவரங்களைசேகரித்துள்ளது"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1347,32 +1373,47 @@ msgstr ""
 msgid "Nis Client"
 msgstr "வேண்டியின் IP:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "போஸ்ட்பிக்ஸ் மாயாவி"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "மின்னஞ்சல் சேவையகத்தின் பெயர்:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "மின்னஞ்சல் சேவையகத்தின் பெயர்:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "இணைய மின்னஞ்சல் வடிவமைப்பு மாயாவி"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "இந்த மாயாவி மின்னஞ்சல் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைக்க உதவும்"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "வெளிச்ெசல்லும் மின்னஞ்சல் முகவரி"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 "இதை நீங்கள் உங்களுக்கு வரவேண்டிய மின்னஞ்சல் முகவரிக்கு ஏற்றவாறு சரியாகத் தேர்வுச் செய்யவும்"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1380,20 +1421,28 @@ msgstr ""
 "நீங்கள் உங்களிடமிருந்து செல்லும் மின்னஞ்சல்களின் \"From:\" - அஞுப்புனர் மற்றும் \"Reply-to"
 "\" பதிலளிக்க-வேண்டிய முகவரி ஆகிய மதிப்புகளை மாற்ற முடியும்"
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 #, fuzzy
 msgid "Masquerade domain name:"
 msgstr "கண்டுபிடிக்கப்பட்ட இணையக்களப் பெயர்"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "எச்சரிக்ைக:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "நீங்கள் மின்னஞ்சல் நுழைவாயில் கணினியின் பெயரை இன்னும் எழுதவில்ைல"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1402,15 +1451,21 @@ msgstr ""
 "எங்கும் மின்னஞ்சல் அனுப்ப முடியாது. தொடர அடுத்தது என்ற பொத்தானை தேர்வுச்ெசய், அல்லது "
 "மாற்றங்கள் செய்ய பின்னால்என்ற பொத்தானை தேர்வுச்ெசய்து பின்னால் செல்லவும்"
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquerade சரியாக இல்ைல"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "மின்னஞ்சல் நுழைவாயில் கணினியின் பெயர்"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1419,7 +1474,7 @@ msgstr ""
 "மின்னஞ்சல் சேவையகத்தின் பெயர் என்பது இணையத்திலிருந்து உங்கள் வலையமைப்பிற்கு மின்னஞ்சல்களை "
 "அளிக்கும் கணினியின் பெயர், இது பொதுவாக உங்கள் சேவையளிப்பவர் இதனை உங்களுக்கு தருவார்"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1427,59 +1482,64 @@ msgstr ""
 "உங்கள் சேவையகம் மின்னஞ்சல்களை ஒரு நுழைவாயிலுக்கு அனுப்பினால், அந்த  நுழைவாயில் கணினி "
 "மின்னஞ்சல்களை சேர்ப்பதை பார்த்துக் கொள்ளும்"
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "மின்னஞ்சல் சேவையகத்தின் பெயர்:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "இணைய மின்னஞ்சல் வடிவமைக்கப்படுகிறது"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "உங்கள் மின்னஞ்சல் சேவையகத்ைத வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "முகவரியின் அமைப்பு"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "இந்த மாயாவி மின்னஞ்சல் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக "
 "வடிவமைத்துவிட்டது"
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "அச்சு சேவையகம்:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost- அணகலை இந்த கணினிக்கு மட்டும் கட்டுப்படுத்து"
@@ -1649,7 +1709,8 @@ msgid "Access Control:"
 msgstr "அணுகல் கட்டுப்பாடு:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr ""
 "இந்த மாயாவி பினாமிச் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக வடிவமைத்தது"
 
@@ -1668,12 +1729,6 @@ msgstr "சுகுயிட் மாயாவி"
 msgid "PXE Wizard"
 msgstr "FTP மாயாவி"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2394,6 +2449,19 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "இந்த மாயாவி வலையத்தளச் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக வடிவமைத்தது"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "உங்களுக்கு FTP சேவையை பயன்படுத்த விருப்பமில்ைலயென்றால் எந்த பெட்டியையும் தேர்வுச் "
+#~ "செய்யாதீர்கள்"
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "எச்சரிக்ைக,\\n நீங்கள் dhcp சேவையகத்தில் உள்ளீர்கள், சேவையகம் வேலை செய்வதை நிறுத்தி "
+#~ "விடலாம்"
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/tg.po b/po/tg.po
index e6614a1b..88cd91ad 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-11-23 02:35+0500\n"
 "Last-Translator: Dilshod A. Marupov <kct_tj@yahoo.co.uk>\n"
 "Language-Team: Tajik <kct_tj@yahoo.co.uk>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "устоди ба танзимдарорӣ"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,9 +31,9 @@ msgstr "устоди ба танзимдарорӣ"
 msgid "Warning."
 msgstr "Огоҳӣ."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "Хатогӣ."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -88,22 +88,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "Барои мизоҷи навро ба DNS дохилкардан ин устод ба шумо ёри мерасонад."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "Баъд аз ном domain-ро дохил накунед"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Шиносонидани Мизоҷ"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,28 +113,29 @@ msgstr ""
 "company.net. Ҳамаи мошинаҳо дар шабака бояд IP суроға (ягона) дощта бошанд, "
 "дар ситаксиси нуқтадори оддӣ"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Номи мошина"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP рақами мошина"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Огоҳ"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -180,7 +181,7 @@ msgstr "Мизоҷи IP"
 msgid "The wizard successfully added the client."
 msgstr "Устод боммувофикият мизоҷро дохил кард."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Устоди DHCP"
 
@@ -197,59 +198,88 @@ msgstr ""
 "шабака"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Адресҳои ки DHCP истифода бурдааст"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "қатори адресҳои корхонаи DHCP ёфтаастхадамот; ё Ки ба шумо зарури даркоранд, "
 "шумо бехатаран инро қабул кунедқиматиҳо"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "IP адреси пастарин"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "IP адреси баландтарин"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Хитдматрасони интерфейси dhcp бояд гӯш кунад ба "
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Маҳдудаи IP-и нишон дода шуда нодуруст аст."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Маҳдудаи IP-и нишондода шуда дар маҳдудаи суроғаи хидматрасон мавҷуд нест."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "IP-и хидматрасон набояд дар маҳдуда бошад."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Ба танзим даровардани DHCP сервер"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr ""
 "Барои параметраи DHCPро ба тазим даровардан устод бояд инро кунадХадамот"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "хомўш"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "дар гиронида"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Интерфейс:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Манъаи DHCP серверо устод бомуввафақият б танзим двроварда шуд "
 
@@ -257,20 +287,20 @@ msgstr "Манъаи DHCP серверо устод бомуввафақият �
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "хидматрасони NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "хидматрасони NFS"
@@ -307,72 +337,73 @@ msgstr ""
 "шабака. Ин танзим дарори ба танзим даровардани шабакаи DNS барои номи "
 "кампютератонбарои қабул кардани DNS-ни беруни"
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Инкори соҳибҳо:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Номи хидматрасони маҳаллии Ҳисобшуда"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Ба танзим даровардани шабакаи DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Дарвозаи беруна"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -380,117 +411,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Ин адреси нодуруст... барои давом додан навбвтиро зеркунед."
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Ин адреси нодуруст... барои давом додан навбвтиро зеркунед."
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Ин адреси нодуруст... барои давом додан навбвтиро зеркунед."
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Хатогӣ"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Dns (ба танзимдарорӣ)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Номи хидматрасони маҳаллии Ҳисобшуда"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP суроғаи хидматрасон"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Номи Хидматрасон:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Устод боммувофикият мизоҷро дохил кард."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Устод боммувофикият мизоҷро дохил кард."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Манъаи DNS серверо устод бомуввафақият ба танзим двроварда шуд."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Ба танзим даровардани шабакаи DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Ба танзим даровардани шабакаи DNS"
@@ -584,30 +615,25 @@ msgstr "коргузорӣ амалӣ нагардид"
 msgid "FTP wizard"
 msgstr "Устоди FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Ба танзим даровардани устоди хидматрасони FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Ин устод ба шумо ёри мерасонад ба танзим даровардани хидматрасони FTPро ба "
 "шабакаатоню"
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Барои хидматрасони FTPро кор нафамудан ягоне аз қутиҳоро озмоиш накунед"
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Хидматрасони FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Барои хадамоти FTPро фаъол кардан намудашро интихоб кунед."
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -615,76 +641,76 @@ msgstr ""
 "Шабакаи шумо метавонад хидматрасони FTPро бо шабакаи гузаргоҳи дохили "
 "(Intranet)ва бо хидматрасони FTP-ии итернет"
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Хидматрасони FTPро ба Интернет тавоно сохтан."
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Хидматрасони FTPро ба Интернет тавоно сохтан."
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Соҳибони иҷозатшуда:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Огоҳӣ\n"
-"Шумо дар dhcp мебошед, бо ин танзимдарорӣ эҳтимол хидматрасони шумо кор "
-"накунад."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "мебахшид, шумо бояд рут бошед барои инро кардан..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Ба танзим даровардани хидматрасони FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -692,7 +718,7 @@ msgstr ""
 "Устод параметрҳои зеринро ҷамъ намуд, ки\n"
 "барои ба танзимдарории Хидматрасони FTP зарур аст"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -701,35 +727,35 @@ msgstr ""
 "Навбатӣ ангушт занед, ё ин ки дагмаи Back-ро барои ислоҳ намудани онҳо "
 "истифода баред"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "хомўш"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "дар гиронида"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Хидматрасони FTP-ии Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Хидматрасони FTP-ии интернет"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Манъаи Intranet/Интернети FTP серверо устод бомуввафақият ба танзим "
@@ -779,7 +805,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1063,7 +1089,7 @@ msgstr ""
 "Устод параметрҳои зеринро ҷамъ намуд, ки барои\n"
 "ба танзим даровардани Хадамоти Ахбороти Интернет лозим аст:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1340,33 +1366,48 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Мизоҷи IP"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "устоди пасванд"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Хидматрасонро фиристодан"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Хидматрасонро фиристодан"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "ба танзим даровардани устоди хати интернет"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Устод ба шумо ёри медиҳад ба танзим дарории хати интернет Манъаи "
 "хидматрасоншабака"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "адресҳои постии беруни"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "ин бояд интихобшудаи адресро ҳар дафа иваз карда шавад"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1374,19 +1415,27 @@ msgstr ""
 "Шумо метавонед намуди суроғаро дар пости рафтаистода дар майдони \"From:\" "
 "and \"Reply-to\" интихоб кунед."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Номи пинҳонии азозил:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Диққат"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "шумо адреси холиро ба хат чор кардед."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1395,15 +1444,21 @@ msgstr ""
 "намешавадберун аз шабакаи маҳали. Давомро зер кунед барои давом додан, ё "
 "пушро барои қиматиҳоро дохил кардан."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Ивазкунӣ нағз нест!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "пости интернети Gateway"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1413,35 +1468,35 @@ msgstr ""
 "масалан, агар таҳиягари Шумо \"provider.com\" бошад, одатан хидматрасони "
 "пости internet \"smtp.provider.com\" аст."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "шабака хати беруниро мефурсонад бо хати gateway, "
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "номи хидматрасони хат"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Танзими Internet Пост"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1449,30 +1504,35 @@ msgstr ""
 "Устод параметрҳои зерине ки ба танзими Хадамоти Internet Пости шумо зарур "
 "аст ҷамъ кард;"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Шакли Суроға"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Манъаи пости Интернет серверо устод бомуввафақият ба танзим дароварда шуд"
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Ба танзим даровардани хидматрасони FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Хидматрасони Чопӣ:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Ба танзим даровардани хидматрасони FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Соҳиби маҳаллӣ - дохилшавӣ танҳо ба ин хидматрасон маҳдуд"
@@ -1654,7 +1714,8 @@ msgid "Access Control:"
 msgstr "Идораи дохилшавӣ"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Устод бомуваффақатона хидматрасони proxy Шуморо ба танзим даровард."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1672,12 +1733,6 @@ msgstr "Устоди Squid"
 msgid "PXE Wizard"
 msgstr "Устоди FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2415,6 +2470,18 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "Устод бомувафаққона Web Хидматрасони Intranet/Internet-и Шуморо танзим кард"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Барои хидматрасони FTPро кор нафамудан ягоне аз қутиҳоро озмоиш накунед"
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Огоҳӣ\n"
+#~ "Шумо дар dhcp мебошед, бо ин танзимдарорӣ эҳтимол хидматрасони шумо кор "
+#~ "накунад."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/tr.po b/po/tr.po
index 56c2bf40..67565116 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-26 05:45+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <mandrakei18n@yahoogroups.com>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr ""
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr ""
 msgid "Warning."
 msgstr "Uyarı."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr "Hata."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -82,21 +82,21 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Bu sihirbaz yerel DNS'nize yeni bir istemci eklemenizde size yardımcı olacak."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "İstemci tanımı:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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, "
@@ -106,26 +106,27 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Bilgisayarın adı:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -171,7 +172,7 @@ msgstr "İstemci IP'si:"
 msgid "The wizard successfully added the client."
 msgstr "Sihirbaz, istemciyi başarılı bir şekilde ekledi."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP Sihirbazı"
 
@@ -189,48 +190,57 @@ msgstr ""
 "olacaktır."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "dhcp tarafından kullanılan adres aralığı"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "DHCP servisi tarafından istemcilere verilen adres aralığını seçin. Eğer özel "
 "ihtiyaçlarınız yoksa, güvenli bir şekilde öntanımlı değerleri kabul "
 "edebilirsiniz."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "En Düşük IP Adresi:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "En Yüksek IP Adresi:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Belirtilen IP aralığı geçersiz."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Belirtilen IP aralığı sunucu ağ adresi içerisinde değil."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "Sunucunun IP'si aralıkta olmamalı."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP Sunucusu yapılandırılıyor"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -238,11 +248,31 @@ msgstr ""
 "DHCP servislerinizi yapılandırmak için gereken parametreleri sihirbaz şu "
 "şekilde belirledi:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "Pasif"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "Etkin"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 "Sihirbaz, sunucunuz için DHCP servislerini başarılı bir şekilde yapılandırdı."
@@ -251,19 +281,19 @@ msgstr ""
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr ""
 
@@ -298,68 +328,69 @@ msgstr ""
 "yönlendirme ile yerel bilgisayar isimleri için yerel bir DNS hizmeti "
 "sağlayacak."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "Bilgisayar Adı:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -367,105 +398,105 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "Hata:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "Bilgisayar adı:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "Bilgisayar IP adresi:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr ""
 
@@ -551,30 +582,25 @@ msgstr "Kurulum başarısız"
 msgid "FTP wizard"
 msgstr "FTP sihirbazı"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP Sunucusu Yapılandırma Sihirbazı"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Bu sihirbaz ağınız için bir FTP Sunucusu yapılandırmanızda size yardımcı "
 "olacaktır."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"FTP Sunucunuzu etkinleştirmek istemiyorsanız hiçbir kutuya işaret koymayın."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP Sunucusu"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Etkinleştirmek istediğiniz FTP servis çeşidini seçin:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -582,113 +608,116 @@ msgstr ""
 "Sunucunuz hem yerel ağınızda (intranetinizde) hem de Internet'te FTP "
 "Sunucusu olarak davranabilir."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Intranet için FTP Sunucusunu etkinleştir"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Internet için FTP Sunucusunu etkinleştir"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "İzin verilen Makineler:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Üzgünüm, bunu yapabilmek için root olmanız gerekli..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP Sunucusu yapılandırılıyor"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "Pasif"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "Etkin"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet FTP Sunucusu:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet FTP Sunucusu:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Sihirbaz, Intranet/Internet FTP Sunucunuzu başarılı bir şekilde yapılandırdı."
@@ -736,7 +765,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1001,7 +1030,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1269,33 +1298,48 @@ msgstr ""
 msgid "Nis Client"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix sihirbazı"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Posta sunucusu"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Posta sunucusu"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet Posta Yapılandırma Sihirbazı"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Bu sihirbaz ağınız için Internet Posta hizmetlerini yapılandırmanızda size "
 "yardımcı olacaktır."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Giden Posta Adresi"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Bu gelen postalarda kullandığınız adresle uyumlu olarak seçilmeli."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1303,19 +1347,27 @@ msgstr ""
 "Giden postaların \"Kimden:\" ve \"Yanıtla\" alanlarında görünecek olan "
 "adresleri seçebilirsiniz."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Maskelenen alan adı:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Uyarı:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Posta geçidi için boş bir adres yazdınız."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1324,15 +1376,21 @@ msgstr ""
 "gönderemeyeceksiniz. Devam etmek için İleri'ye, bir değer girmek için "
 "Geri'ye basın."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquerade'de sorun var!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet Posta Geçidi"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1342,7 +1400,7 @@ msgstr ""
 "sağlayıcınız \"saglayici.com\" ise internet posta sunucusu genellikle \"smtp."
 "saglayici.com\" 'dur."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1350,29 +1408,29 @@ msgstr ""
 "Sunucunuz gidenleri, son dağımtımla ilgilenecek olan bir posta geçidinden "
 "gönderecek."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Posta Sunucusu İsmi:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Internet Posta yapılandırılıyor"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1380,29 +1438,35 @@ msgstr ""
 "Internet Posta Servislerinizi yapılandırmak için gereken parametreleri "
 "sihirbaz şu şekilde belirledi:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Adres Yapısı"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Sihirbaz, sunucunuz için Internet Posta servisini başarılı bir şekilde "
 "yapılandırdı."
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr ""
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP Sunucusu yapılandırılıyor"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - erişim sadece bu sunucuyla kısıtlı"
@@ -1578,7 +1642,8 @@ msgid "Access Control:"
 msgstr "Erişim Denetimi:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Sihirbaz, vekil sunucunuzu başarılı bir şekilde yapılandırdı."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1593,12 +1658,6 @@ msgstr ""
 msgid "PXE Wizard"
 msgstr ""
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr ""
@@ -2287,6 +2346,11 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "Sihirbaz, Intranet/Internet Web Sunucunuzu başarılı bir şekilde yapılandırdı."
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "FTP Sunucunuzu etkinleştirmek istemiyorsanız hiçbir kutuya işaret "
+#~ "koymayın."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/uk.po b/po/uk.po
index 54f930bf..1f09f037 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-09 09:04+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "������������ ��ͦ�����"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -31,9 +31,9 @@ msgstr "������������ ��ͦ�����"
 msgid "Warning."
 msgstr "������������"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -41,12 +41,12 @@ msgid "Error."
 msgstr "�������."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -87,22 +87,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "��� ��ͦ���� �������� ������ ������ �̦���� �� ������ ���������� DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(��� �� ���Ҧ��� ��������� ������ Ц��� �����)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "�������Ʀ��æ� �̦����:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,23 @@ msgstr ""
 "��� �̦��� � ����֦ ���� ������Ʀ������� �� ��'��, ��������� clientname."
 "company.net. ����� ������ � ����֦ ������� ���� ���� (�Φ������) IP-������."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "����� ������:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "IP-������ ������:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "������������"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -134,7 +135,7 @@ msgstr ""
 "���Ʀ����æ��."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -181,7 +182,7 @@ msgstr "IP-������ �̦����:"
 msgid "The wizard successfully added the client."
 msgstr "��ͦ���� ��Ц��� ����� �̦����."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "��ͦ���� DHCP"
 
@@ -198,51 +199,60 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "��� ��ͦ���� �������� ����������� ���צ�� DHCP ������ �������."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "�������� �����, �˦ ����������դ dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "���֦�� �������� �����, ������� ������� ����æ�� ���צ��� DHCP; ���� � �� �� "
 "����� ���æ������ ������, �� ������ �������� �������� �����������Φ ��������."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "�������� IP-������:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "������� IP-������:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "�������� IP-����� ������� ��צ���."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "�������� �������� IP-����� �� ����������� � �������̦ ��������� ����� �������"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP ������� �� ������� ���� � �������̦"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "���������� ������ DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -250,11 +260,31 @@ msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ, ��� ���������� ��� DHCP "
 "���צ�:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "��������"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "�צ������"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "��ͦ���� ��Ц��� ���������� ���צ�� DHCP �� ������ �����Ҧ."
 
@@ -262,20 +292,20 @@ msgstr "��ͦ���� ��Ц��� ���������� ���צ�� DHCP �� ������ �����Ҧ."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "������ NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "������ NFS"
@@ -311,72 +341,73 @@ msgstr ""
 "���Ʀ����æ� ������� ��������� ���צ� DNS ��� ��������� ���� ����'���Ҧ�, � "
 "��������Φ ������ צĦ��� �� ���Φ������ DNS."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "���������� ������:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "���������� ����� ������"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "���������� DNS-������"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "����� ����"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -384,117 +415,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "�� ��צ��� ������... �����Φ�� \"��̦\", ��� ����������"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "�� ��צ��� ������... �����Φ�� \"��̦\", ��� ����������"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "�� ��צ��� ������... �����Φ�� \"��̦\", ��� ����������"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "�������."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "��ͦ���� ������������ DNS"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "���������� ����� ������"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "IP-������ �������:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "����� �������:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "��ͦ���� ��Ц��� ����� �̦����."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "��ͦ���� ��Ц��� ����� �̦����."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "��ͦ���� ��Ц��� ��������� ���צ�� DNS �� ������ �����Ҧ."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "���������� DNS-������"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "���������� DNS-������"
@@ -595,28 +626,23 @@ msgstr "������������ �������"
 msgid "FTP wizard"
 msgstr "��ͦ���� FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "��ͦ���� ������������ ������� FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "��� ��ͦ���� �������� ��� ����������� FTP-������ ��� ���ϧ ����֦."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"�� ��ͦ����� ������� ������, ���� �� �� ������ ����צ������ FTP-������."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "������ FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "����Ҧ�� ��� ���צ�� FTP, ���� �� ������ ����������:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -624,76 +650,76 @@ msgstr ""
 "��� ������ ���� Ħ��� �� FTP-������ ���ϧ ����Ҧ���ϧ (��������) ����֦, ��� "
 "�� FTP-������ ��� ���������."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "��������� FTP-������ ��� Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "��������� FTP-������ ��� ���������"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "��������� ������:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"������������\\n�� ����������� � dhcp, ������ ���� �� ��������� � ����� "
-"���Ʀ����æ��."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "�������, ��� ���Ҧ��� ���� ����� ��ͦΦ��������, ��� �� �������..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "������������ ������� FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -702,7 +728,7 @@ msgstr ""
 "��ͦ���� ڦ���� ������Φ ��Φ, �˦ ���Ҧ�Φ ��� ������������ ������ FTP- "
 "�������"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -711,35 +737,35 @@ msgstr ""
 "��� �������� æ �������� � ����������� ��� ������, �����Φ�� \"��̦\" ��� "
 "�����Φ�� \"�����\", ��� �ͦ���� ��."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "��������"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "�צ������"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "�������� FTP-������: "
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "�������� FTP-������:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "��ͦ���� ��Ц��� ���������� ��� ��������/�������� FTP-������"
 
@@ -787,7 +813,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1072,7 +1098,7 @@ msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ ��� ������������ ���צ�� "
 "��������-�����:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1350,26 +1376,41 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP-������ �̦����:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "��ͦ���� Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "����� ������� �����:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "����� ������� �����:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "��ͦ���� ������������ ��������-�����"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "��ͦ���� �������� ��� ����������� ���צ�� ��������-����� ��� ���ϧ ����֦."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "������ ��Ȧ��ϧ �����"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1377,7 +1418,7 @@ msgstr ""
 "�� ��� ���� ������� צ���צ��� �� ������, ��� �� ����������դ�� ��� �Ȧ��ϧ "
 "�����."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1385,19 +1426,27 @@ msgstr ""
 "�� ������ ������� ��� ������, ��� ������������ ��Ȧ��� ����� � ����� \"���:"
 "\" � \"�����צ���\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "��������� ����� ������"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "������������:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "�� ����� ������� ������ ��� ����� �����."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1406,15 +1455,21 @@ msgstr ""
 "���ϧ �������ϧ ����֦. �����Φ�� \"��̦\", ��� ����������, ��� \"�����\", "
 "��� ������ ��������."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "�ͦ��æ� ������!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "���� ��������-�����"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1424,7 +1479,7 @@ msgstr ""
 "\"; ���������, ���� ��� ��������� \"provider.com\", �� ������ ����� "
 "��������� � \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1432,29 +1487,29 @@ msgstr ""
 "��� ������ ���� צ������� ��Ȧ��� ����� ����� �������� ����, ���� ������ ��� "
 "��������� ��������."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "����� ������� �����:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "������������ ��������-�����"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1462,29 +1517,34 @@ msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ ��� ������������ ������ "
 "���צ�� ��������-�����:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "����� ������"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "��ͦ���� ��Ц��� ���������� ������ ��������-����� �� ������ �����Ҧ."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "������������ ������� FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "������ �����:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "������������ ������� FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - ������ ��������� Ԧ���� ��� ����� �������."
@@ -1664,7 +1724,8 @@ msgid "Access Control:"
 msgstr "�������� �������:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "��ͦ���� ��Ц��� ���������� ��� ����Ӧ-������."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1682,12 +1743,6 @@ msgstr "��ͦ���� Squit"
 msgid "PXE Wizard"
 msgstr "��ͦ���� FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2416,6 +2471,18 @@ msgstr "���� �����������:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "��ͦ���� ��Ц��� ���������� ��� ��������/�������� ���-������"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "�� ��ͦ����� ������� ������, ���� �� �� ������ ����צ������ FTP-������."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "������������\\n�� ����������� � dhcp, ������ ���� �� ��������� � ����� "
+#~ "���Ʀ����æ��."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/uz.po b/po/uz.po
index 743e6932..611bcce9 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz@Cyrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-11-16 11:30+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Moslash uchun yordamchi"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "Moslash uchun yordamchi"
 msgid "Warning."
 msgstr "Diqqat."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -44,12 +44,12 @@ msgstr "Xato."
 
 # M:
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -92,51 +92,52 @@ msgstr ""
 "Bu yordamchi yangi klientni lokal DNS serveringizga qo'shishda sizga yordam "
 "beradi."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "Izoh: Klientning nomi va IP raqami tarmoqda yagona bo'lishi shart."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Kompyuterning nomi:"
 
 # M:
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Kompyuterning IP raqami:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Siz DHCP'dan foydalanayapsiz, server bu moslamalar bilan ishlamashi mumkin."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -185,7 +186,7 @@ msgstr "Klientning IP raqami:"
 msgid "The wizard successfully added the client."
 msgstr "Yordamchi klientni muvaffaqiyatli qo'shdi."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP yordamchisi"
 
@@ -203,6 +204,10 @@ msgstr ""
 "beradi."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr ""
 
@@ -210,50 +215,74 @@ msgstr ""
 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."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Eng kichkina IP raqam:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Eng katta IP raqam:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Kiritilgan IP raqamning chegarasi noto'g'ri."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Kiritilgan IP raqamning sohasi noto'g'ri"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP serveri moslanmoqda"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr ""
 "DHCP xizmatini moslash uchun yordamchi quyidagi parametrlarni aniqladi:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Yordamchi serveringizning DHCP xizmatlarini muvaffaqiyatli mosladi."
 
@@ -261,20 +290,20 @@ msgstr "Yordamchi serveringizning DHCP xizmatlarini muvaffaqiyatli mosladi."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS serveri"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS serveri"
@@ -305,71 +334,72 @@ msgid ""
 "with non-local requests forwarded to an outside DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
 # M:
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Foydalanuvchi:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNS serverini moslayapman"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -377,115 +407,115 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Xato"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS yordamchisi (moslash)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Serverning IP raqami:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Serverning nomi:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
 # M:
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Yordamchi klientni muvaffaqiyatli qo'shdi."
 
 # M:
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Yordamchi klientni muvaffaqiyatli qo'shdi."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Yordamchi serveringizning DNS xizmatlarini muvaffaqiyatli mosladi."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "DNS serverini moslayapman"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "DNS serverini moslayapman"
@@ -583,28 +613,24 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP yordamchi"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP serverini moslash uchun yordamchi"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Bu yordamchi tarmog'ingiz uchun FTP serverini moslashda sizga yordam beradi."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP serveri"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -612,76 +638,76 @@ msgstr ""
 "Serveringiz ichki tarmoq (intranet) va Internet uchun FTP serveri sifatida "
 "xizmat qilishi mumkin."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Diqqat\n"
-"Siz DHCP'dan foydalanayapsiz, server bu moslamalar bilan ishlamashi mumkin."
 
 # M:
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Uzr, buni bajarish uchun siz root bo'lishingiz kerak"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP serverini moslayapman"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -689,7 +715,7 @@ msgstr ""
 "FTP serveringizni moslash uchun yordamchi\n"
 "quyidagi parametrlarni aniqladi"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -697,35 +723,35 @@ msgstr ""
 "Bu qiymatlarni qabul qilish va serveringizni moslash uchun \"Keyingisi\" "
 "tugmasini bosing, ularni o'zgartirish uchun \"Orqaga\" tugmasidan foydalaning"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Intranet uchun FTP server:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Internet uchun FTP server:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Yordamchi Intranet/Internet uchun FTP serveringizni muvaffaqiyatli mosladi."
@@ -774,7 +800,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1050,7 +1076,7 @@ msgstr ""
 "Internet yangiliklar xizmatini moslash uchun\n"
 "yordamchi quyidagi parametrlarni aniqladi"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1331,51 +1357,74 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Klientning IP raqami:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix yordamchisi"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Xat-xabar serverining nomi:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Xat-xabar serverining nomi:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet xat-xabar serverini moslash uchun yordamchi"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Bu yordamchi tarmog'ingiz uchun Internet xat-xabar xizmatini moslashda sizga "
 "yordam beradi."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Diqqat:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1384,50 +1433,56 @@ msgstr ""
 "jo'natolmaysiz. Davom etish uchun \"Keyingisi\"ni, qiymatni kiritish uchun "
 "\"Orqaga\"ni bosing "
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Xat-xabar serverining nomi:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Internet xat-xabar serveri moslanmoqda"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1435,31 +1490,36 @@ msgstr ""
 "Internet xat-xabar xizmatini moslash uchun yordamchi quyidagi parametrlarni "
 "aniqladi:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Yordamchi serveringizning Internet xat-xabar xizmatini muvaffaqiyatli "
 "mosladi."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTP serverini moslayapman"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Bosib chiqarish serveri:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP serverini moslayapman"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Lokal kompyuter - faqat shu kompyuter uchun ruxsat"
@@ -1622,7 +1682,8 @@ msgid "Access Control:"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Yordamchi Proksi serveringizni muvaffaqiyatli mosladi."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1640,12 +1701,6 @@ msgstr "Squid yordamchisi"
 msgid "PXE Wizard"
 msgstr "FTP yordamchi"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2333,6 +2388,14 @@ msgstr ""
 "Yordamchi Intranet/Internet uchun Veb serveringizni muvaffaqiyatli mosladi."
 
 #~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Diqqat\n"
+#~ "Siz DHCP'dan foydalanayapsiz, server bu moslamalar bilan ishlamashi "
+#~ "mumkin."
+
+#~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
 #~ msgstr ""
diff --git a/po/uz@Cyrl.po b/po/uz@Cyrl.po
index 040b0510..0032d83a 100644
--- a/po/uz@Cyrl.po
+++ b/po/uz@Cyrl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz@Cyrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-11-16 11:30+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Мослаш учун ёрдамчи"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -33,9 +33,9 @@ msgstr "Мослаш учун ёрдамчи"
 msgid "Warning."
 msgstr "Диққат."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -44,12 +44,12 @@ msgstr "Хато."
 
 # M:
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -91,51 +91,52 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Бу ёрдамчи янги клиентни локал DNS серверингизга қўшишда сизга ёрдам беради."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr ""
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Компютернинг номи:"
 
 # M:
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Компютернинг IP рақами:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Диққат"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -182,7 +183,7 @@ msgstr "Клиентнинг IP рақами:"
 msgid "The wizard successfully added the client."
 msgstr "Ёрдамчи клиентни муваффақиятли қўшди."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP ёрдамчиси"
 
@@ -199,6 +200,10 @@ msgstr ""
 "Бу ёрдамчи серверингиз учун DHCP хизматларини мослашда сизга ёрдам беради."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr ""
 
@@ -206,49 +211,73 @@ msgstr ""
 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."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Энг кичкина IP рақам:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Энг катта IP рақам:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Киритилган IP рақамнинг чегараси нотўғри."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Киритилган IP рақамнинг соҳаси нотўғри"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "DHCP сервери мосланмоқда"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "DHCP хизматини мослаш учун ёрдамчи қуйидаги параметрларни аниқлади:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Ёрдамчи серверингизнинг DHCP хизматларини муваффақиятли мослади."
 
@@ -256,20 +285,20 @@ msgstr "Ёрдамчи серверингизнинг DHCP хизматлари�
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "NFS сервери"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "NFS сервери"
@@ -300,71 +329,72 @@ msgid ""
 "with non-local requests forwarded to an outside DNS."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
 # M:
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Фойдаланувчи:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "DNS серверини мослаяпман"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -372,115 +402,115 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Хато"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS ёрдамчиси (мослаш)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Сервернинг IP рақами:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Сервернинг номи:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
 # M:
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Ёрдамчи клиентни муваффақиятли қўшди."
 
 # M:
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Ёрдамчи клиентни муваффақиятли қўшди."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Ёрдамчи серверингизнинг DNS хизматларини муваффақиятли мослади."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "DNS серверини мослаяпман"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "DNS серверини мослаяпман"
@@ -578,27 +608,23 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP ёрдамчи"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP серверини мослаш учун ёрдамчи"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Бу ёрдамчи тармоғингиз учун FTP серверини мослашда сизга ёрдам беради."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP сервери"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -606,76 +632,76 @@ msgstr ""
 "Серверингиз ички тармоқ (интранет) ва Интернет учун FTP сервери сифатида "
 "хизмат қилиши мумкин."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Диққат\n"
-"Сиз DHCP'дан фойдаланаяпсиз, сервер бу мосламалар билан ишламаши мумкин."
 
 # M:
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Узр, буни бажариш учун сиз root бўлишингиз керак"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "FTP серверини мослаяпман"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -683,7 +709,7 @@ msgstr ""
 "FTP серверингизни мослаш учун ёрдамчи\n"
 "қуйидаги параметрларни аниқлади"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -691,35 +717,35 @@ msgstr ""
 "Бу қийматларни қабул қилиш ва серверингизни мослаш учун \"Кейингиси\" "
 "тугмасини босинг, уларни ўзгартириш учун \"Орқага\" тугмасидан фойдаланинг"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Интранет учун FTP сервер:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Интернет учун FTP сервер:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Ёрдамчи Интранет/Интернет учун FTP серверингизни муваффақиятли мослади."
@@ -768,7 +794,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1044,7 +1070,7 @@ msgstr ""
 "Интернет янгиликлар хизматини мослаш учун\n"
 "ёрдамчи қуйидаги параметрларни аниқлади"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1322,51 +1348,74 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Клиентнинг IP рақами:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix ёрдамчиси"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Хат-хабар серверининг номи:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Хат-хабар серверининг номи:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Интернет хат-хабар серверини мослаш учун ёрдамчи"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Бу ёрдамчи тармоғингиз учун Интернет хат-хабар хизматини мослашда сизга "
 "ёрдам беради."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Диққат:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1375,50 +1424,56 @@ msgstr ""
 "жўнатолмайсиз. Давом этиш учун \"Кейингиси\"ни, қийматни киритиш учун "
 "\"Орқага\"ни босинг "
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Хат-хабар серверининг номи:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Интернет хат-хабар сервери мосланмоқда"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1426,30 +1481,35 @@ msgstr ""
 "Интернет хат-хабар хизматини мослаш учун ёрдамчи қуйидаги параметрларни "
 "аниқлади:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Ёрдамчи серверингизнинг Интернет хат-хабар хизматини муваффақиятли мослади."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "FTP серверини мослаяпман"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Босиб чиқариш сервери:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "FTP серверини мослаяпман"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Локал компютер - фақат шу компютер учун рухсат"
@@ -1611,7 +1671,8 @@ msgid "Access Control:"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Ёрдамчи Прокси серверингизни муваффақиятли мослади."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1629,12 +1690,6 @@ msgstr "Squid ёрдамчиси"
 msgid "PXE Wizard"
 msgstr "FTP ёрдамчи"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2319,6 +2374,13 @@ msgstr ""
 "Ёрдамчи Интранет/Интернет учун Веб серверингизни муваффақиятли мослади."
 
 #~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ 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 ""
diff --git a/po/vi.po b/po/vi.po
index 0bdccc0e..6a4d2556 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2-Vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-09-12 13:28+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "Đồ Thuật Cấu Hình"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,9 +34,9 @@ msgstr "Đồ Thuật Cấu Hình"
 msgid "Warning."
 msgstr "Cảnh báo"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -44,12 +44,12 @@ msgid "Error."
 msgstr "Lỗi."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -90,22 +90,22 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Đồ thuật này sẽ giúp bạn bổ sung máy khách mới trong DNS cục bộ của bạn."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Nhận biết máy khách:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "Lưu ý là số IP và tên máy khách nên là duy nhất trong mạng."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,23 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Tên máy tính :"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Số IP của máy tính :"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 #, fuzzy
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
@@ -138,7 +139,7 @@ msgstr ""
 "của bạn."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 #, fuzzy
@@ -185,7 +186,7 @@ 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."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Đồ Thuật DHCP"
 
@@ -202,51 +203,60 @@ msgstr ""
 "Đồ thuật này sẽ giúp bạn cấu hình các dịch vụ DHCP cho máy chủ của bạn."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Dãy các địa chỉ được dùng bởi DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Hãy chọn loạt các địa chỉ được cấp phát cho các máy trạm bằng dịch vụ DHCP. "
 "Trừ khi là bạn có một nhu cầu đặc biệt, còn không thì có thể chấp nhận các "
 "giá trị được đề xuất."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Địa Chỉ IP Thấp Nhất:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Địa chỉ IP cao nhất:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 #, fuzzy
 msgid "The IP range specified is not correct."
 msgstr "Chỉ định dãy IP không chính xác"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 #, fuzzy
 msgid "The IP range specified is not in server address range."
 msgstr "Dãy IP được định ra không nằm trong khoảng địa chỉ mạng của máy chủ"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 #, fuzzy
 msgid "The IP of the server must not be in range."
 msgstr "IP của máy chủ phải không được trong dãy"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Cấu hình máy chủ DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -254,11 +264,31 @@ msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây được cần để cấu hình dịch vụ DHCP "
 "của bạn:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "Tắt"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "bật"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Đồ thuật đã cấu hình thành công các dịch vụ DHCP cho máy chủ của bạn."
 
@@ -266,20 +296,20 @@ msgstr "Đồ thuật đã cấu hình thành công các dịch vụ DHCP cho m�
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Máy Chủ NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Máy Chủ NFS"
@@ -316,72 +346,73 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Từ chối máy chủ:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Tên Miền Điện Toán"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Cấu hình Máy Chủ DNS"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 #, fuzzy
 msgid "External DNS:"
 msgstr "Gateway Bên Ngoài"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -389,117 +420,117 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Địa chỉ này không hợp lệ... nhấn Tiếp Theo (next) để tiếp tục"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Địa chỉ này không hợp lệ... nhấn Tiếp Theo (next) để tiếp tục"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Địa chỉ này không hợp lệ... nhấn Tiếp Theo (next) để tiếp tục"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Lỗi."
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Đồ Thuật DNS (cấu hình)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 #, fuzzy
 msgid "Computer name:"
 msgstr "Tên Miền Điện Toán"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Địa chỉ IP của Máy Chủ:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Tên Máy Chủ:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Đồ thuật bổ sung thành công máy khách."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Đồ thuật bổ sung thành công máy khách."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Đồ thuật đã hoàn thành cấu hình các dịch vụ DNS cho máy chủ của bạn."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Cấu hình Máy Chủ DNS"
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Cấu hình Máy Chủ DNS"
@@ -600,27 +631,23 @@ msgstr "Cài đặt không được"
 msgid "FTP wizard"
 msgstr "Đồ thuật FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Đồ Thuật Cấu Hình Máy Chủ FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Đồ thuật này giúp cấu hình Máy Chủ FTP cho mạng của bạn."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Không kiểm bất kỳ hộp nào nếu bạn không muốn kích hoạt Máy Chủ FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Máy Chủ FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Chạon loại dịch vụ FTP bạn muốn kích hoạt:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -628,76 +655,76 @@ msgstr ""
 "Máy chủ của bạn có thể hoạt động như một Máy Chủ FTP hướng vào mạng cục bộ "
 "của bạn và như một máy chủ FTP cho Internet."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Bật chạy máy chủ FTP cho Intranet"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Bật chạy Máy Chủ FTP cho Internet"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Cho phép host:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-#, fuzzy
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Cảnh báo\\nBạn đang trong DHCP, máy chủ có thể không hoạt động với cấu hình "
-"của bạn."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Xin lỗi, bạn phải là root để thực hiện..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Cấu hình Máy Chủ FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters\n"
@@ -705,7 +732,7 @@ msgid ""
 msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây cần để cấu hình Máy Chủ FTP của bạn"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 #, fuzzy
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
@@ -714,35 +741,35 @@ msgstr ""
 "Để chấp nhận những giá trị này và cấu hình máy chủ của bạn, hãy nhấn nút "
 "Tiếp Theo (Next) hoặc dùng nút Trở Lại (Back) để hiệu chỉnh chúng."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "Tắt"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "bật"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Máy Chủ FTP Intranet:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Máy Chủ FTP Internet:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "Đồ thuật đã hoàn thành cấu hình Máy Chủ FTP cho Intranet/Internet"
 
@@ -790,7 +817,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1074,7 +1101,7 @@ msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây cần để cấu hình Dịch Vụ Tin "
 "Internet của bạn:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1351,31 +1378,46 @@ msgstr ""
 msgid "Nis Client"
 msgstr "IP máy khách:"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Đồ Thuật Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Tên Máy Chủ Thư:"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Tên Máy Chủ Thư:"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Đồ Thuật Cấu Hình Thư Internet"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "Đồ thuật này giúp cấu hình các dịch vụ Internet Mail cho mạng của bạn."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Địa Chỉ Thư Đi"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Việc này nên chọn thích hợp với địa chỉ mà bạn dùng cho thư đến."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1383,19 +1425,27 @@ msgstr ""
 "Bạn có thể chọn loại địa chỉ mà thư đi sẽ hiển thị trong trường \"Từ:\" và "
 "\"Trả lời cho\" ."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Masquerade domain name:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Cảnh báo:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Bạn đã nhập một địa chỉ trống cho gateway thư."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1404,15 +1454,21 @@ msgstr ""
 "thư ra ngoài mạng. Nhấn Tiếp Theo (next) để tiếp tục hoặc Trở Lại (back) để "
 "nhập một giá trị."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Masquerade không tốt!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Gateway của Thư Internet"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1422,7 +1478,7 @@ msgstr ""
 "\"; ví dụ: nếu nhà cung cấp là \"provider.com\", thì máy chủ thư internet sẽ "
 "luôn luôn là \"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1430,29 +1486,29 @@ msgstr ""
 "Máy chủ của bạn sẽ gửi thư đi qua một gateway thư mà nó sẽ lo việc phân phối "
 "cuối cùng."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Tên Máy Chủ Thư:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Cấu hình Thư Internet"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1460,29 +1516,34 @@ msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây cần để cấu hình Dịch Vụ Thư "
 "Internet của bạn:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Mẫu Địa Chỉ"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "Đồ thuật hoàn thành cấu hình dịch vụ Thư Internet cho máy chủ của bạn."
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Cấu hình Máy Chủ FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Máy chủ in:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Cấu hình Máy Chủ FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - hạn chế truy cập chỉ với máy chủ này"
@@ -1662,7 +1723,8 @@ msgid "Access Control:"
 msgstr "Điều Khiển Truy Cập:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Đồ thuật đã hoàn thành cấu hình máy chủ Proxy của bạn."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1680,12 +1742,6 @@ msgstr "Đồ thuật Squid"
 msgid "PXE Wizard"
 msgstr "Đồ thuật FTP"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 #, fuzzy
 msgid "Set PXE server"
@@ -2410,6 +2466,17 @@ msgstr "Thư mục người dùng:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "Đồ thuật đã hoàn thành cấu hình Máy Chủ Web Intranet/Internet của bạn"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "Không kiểm bất kỳ hộp nào nếu bạn không muốn kích hoạt Máy Chủ FTP."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Cảnh báo\\nBạn đang trong DHCP, máy chủ có thể không hoạt động với cấu "
+#~ "hình của bạn."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/wa.po b/po/wa.po
index 0f4d5218..418fc554 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,19 +12,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
-"PO-Revision-Date: 2004-01-21 12:22+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
+"PO-Revision-Date: 2004-01-30 16:04+0100\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
 
 #: ../Wiztemplate.pm:31
 msgid "configuration wizard"
 msgstr "Macrea d' apontiaedje"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -32,9 +33,9 @@ msgstr "Macrea d' apontiaedje"
 msgid "Warning."
 msgstr "Adviertixhmint."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -42,12 +43,12 @@ msgid "Error."
 msgstr "Aroke."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -89,22 +90,22 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Ci macrea chal vos aidrè a radjouter on novea cliyint dins vosse DNS locå."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Idintifiaedje do cliyint:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +115,28 @@ 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:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "No del éndjole:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "Adresse IP di l' éndjole:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Adviertixhmint"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Vos eployîz l' dhcp, li sierveu pout n' nén ovrer avou vost apontiaedje."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -181,7 +183,7 @@ msgstr "IP do cliyint:"
 msgid "The wizard successfully added the client."
 msgstr "Li macrea a radjouté comifåt l' cliyint."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Macrea DHCP"
 
@@ -200,6 +202,12 @@ msgstr ""
 "Ci macrea chal vos aidrè a-z apontyî les siervices DHCP pol sierveu da vosse."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+"Si vos vloz mete PXE en alaedje po vosse sierveu DHCP clitchîz l' boesse "
+"s' i vs plait."
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Fortchete d' adresses IP eployeyes pol dhcp"
 
@@ -207,42 +215,46 @@ msgstr "Fortchete d' adresses IP eployeyes pol dhcp"
 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."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Tchoezixhoz li fortchete d' adresses ki l' siervice DHCP pout-st eployî po "
 "dner leus adresses åzès posses éndjolreces; a moens ki vos årîz dandjî d' èn "
 "apontiaedje sipeciå, vos ploz accepter les prémetowès valixhances ki vs sont "
-"propozêyes."
+"propozêyes. (eg: 192.168.100.20 192.168.100.40)"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Adresse IP li pus basse:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Adresse IP li pus hôte:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr "Mete PXE en alaedje:"
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Eterface ki l' sierveu dhcp schoûtrè"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Li fortchete d' adresses IP dnêye n' est nén coreke."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "Li fortchete d' adresses IP dnêye n' est nén el fortchete do sierveu."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "L' adresse IP do sierveu n' doet nén esse dins l' fortchete."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Apontiaedje do sierveu DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -250,11 +262,31 @@ msgstr ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "vosse siervice DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "dismetou"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "en alaedje"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Eterface:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 "Li macrea a-st apontyî comifåt les siervices DHCP sol sierveu da vosse."
@@ -263,19 +295,22 @@ msgstr ""
 msgid "You need to readjust your hostname."
 msgstr "Vos dvoz coridjî vosse no d' lodjoe."
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. 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:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "Sierveu DNS mwaisse"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "Sierveu DNS esclåve"
 
@@ -310,27 +345,28 @@ 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:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "Cwè voloz vs fé:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 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:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "Oister on lodjoe foû d' l' apontiaedje do moumint od DNS."
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "Oister lodjoe:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "No del copiutrece:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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 "
@@ -340,12 +376,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:144 ../dns_wizard/Bind.pm:209
-#, fuzzy
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr "Adresse IP do sierveu DNS mwaisse:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -353,25 +388,25 @@ 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr "Adresse IP do redjibleu"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "Difoûtrin DNS:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr "Radjouter on dominne di cweraedje"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -379,7 +414,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:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -387,111 +422,111 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr "Prémetou no d' dominne a cweri:"
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 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:172
+#: ../dns_wizard/Bind.pm:171
 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:177
+#: ../dns_wizard/Bind.pm:176
 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:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "Aroke:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "avou cist apontiaedje ci:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "No del copiutrece:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "Adresse IP del copiutrece:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "No do sierveu:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr "Dominne:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr "Li macrea a radjouté comifåt l' lodjoe a vosse DNS."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Li macrea a oisté comifåt l' lodjoe di vosse DNS."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 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:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu DNS mwaisse..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu DNS esclåve..."
 
@@ -576,30 +611,24 @@ msgstr "L' astalaedje a fwait berwete"
 msgid "FTP wizard"
 msgstr "Macrea FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Macrea d' apontiaedje do sierveu FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Ci macrea chal vos aidrè a-z apontyî li sierveu FTP pol rantoele da vosse."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Èn clitchîz so nole boesse si vos n' voloz nén mete en alaedje vosse sierveu "
-"FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Sierveu FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Tchoezixhoz li sôre di siervice FTP ki vos vloz mete en alaedje:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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."
@@ -607,75 +636,75 @@ msgstr ""
 "Vosse sierveu FTP pout-st ovrer sol rantoele locåle (intranet) eyet sol "
 "daegntoele (internet)."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Mete en alaedje li sierveu FTP sol daegntoele"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Mete en alaedje li sierveu FTP sol daegntoele"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
-msgstr "Emile do manaedjeu"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
+msgstr "Emile do manaedjeu:"
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
-msgstr "Permete l' elodjaedje di root"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
+msgstr "Permete l' elodjaedje di root:"
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
+msgstr "Chroot dins l' ridant måjhon di l' uzeu:"
+
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Adviertixhmint\n"
-"Vos eployîz l' dhcp, li sierveu pout n' nén ovrer avou vost apontiaedje."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Dji rgrete, mins vos dvoz esse root po çoula..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Apontiaedje do sierveu FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -683,7 +712,7 @@ msgstr ""
 "Li macrea a ramexhné les parametes shuvants,\n"
 "k' end a mezåjhe po-z apontyî vosse sierveu FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -691,35 +720,35 @@ msgstr ""
 "Po-z accepter ces valixhances la, ey apontyî vosse sierveu, clitchîz so "
 "«Shuvant» oudonbén sol boton «En erî» po lzès coridjî."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "dismetou"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "en alaedje"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Sierveu FTP sol rantoele locåle:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Sierveu FTP sol daegntoele:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr "Emile do manaedjeu"
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr "Permete l' elodjaedje di root"
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Li macrea a-st apontyî comifåt vosse sierveu FTP pol rantoele locåle eyet "
@@ -768,7 +797,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1029,7 +1058,7 @@ msgstr ""
 "Li macrea a ramexhné les parametes shuvants,\n"
 "k' end a mezåjhe po-z apontyî vosse siervice di copinreyes usenet:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1296,27 +1325,40 @@ msgstr "Apontiaedje di vosse sistinme come cliyint NIS..."
 msgid "Nis Client"
 msgstr "Cliyint NIS"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Macrea postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+"Aroke, dji n' a savou trover vosse no d' lodjoe dins /etc/hosts. Dji cwite."
+
+#: ../postfix_wizard/Postfix.pm:59
+msgid "External Mail server"
+msgstr "Difoûtrin sierveu d' emilaedje"
+
+#: ../postfix_wizard/Postfix.pm:60
+msgid "Internal Mail server"
+msgstr "Divintrin sierveu d' emilaedje"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Macrea d' apontiaedje di l' emilaedje"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Ci macrea chal vos aidrè a-z apontyî les sierves d' emilaedje pol rantoele "
-"da vosse."
+"da vosse, oudonbén apontyî on sierveu d' emilaedje sol daegntoele."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Adresse emile e rexhowe:"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1324,7 +1366,7 @@ msgstr ""
 "Çoula dvreut esse tchoezi d' acoird a l' adresse eployeye po les messaedjes "
 "en intrêye."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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."
@@ -1332,40 +1374,54 @@ msgstr ""
 "Vos ploz tchoezi li sôre d' adresse ki les emiles e rexhowe åront dins leus "
 "tchamps «From» eyet «Reply-To»."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Adviertixhmint:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Vos avoz dné ene vude adresse pol pasrele d' emilaedje."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Pasrele d' emilaedje sol daegntoele"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1373,29 +1429,29 @@ msgstr ""
 "Vosse sierveu evoyrè les messaedjes å dtriviè d' ene pasrele d' emilaedje, "
 "ki s' ocuprè di ls evoyî disk' al destinåcion finåle."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "No do sierveu d' emilaedje"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Apontiaedje di l' emilaedje"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1403,28 +1459,33 @@ msgstr ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "vosse siervice d' emilaedje."
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Cogne del adresse"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Li macrea a-st apontyî comifåt li siervice d' emilaedje pol sierveu da vosse."
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "Apontiaedje do sierveu d' emilaedje postfix."
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Sierveu Postfix"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+msgid "Configuring your Postfix server....."
+msgstr "Apontiaedje do sierveu d' emilaedje postfix da vosse..."
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Lodjoe locå (localhost) - accès a pårti di ç' sierveu chal seulmint"
@@ -1602,7 +1663,7 @@ msgid "Access Control:"
 msgstr "Contrôle d' accès:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Li macrea a-st apontyî comifåt vosse sierveu procsi."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1617,27 +1678,21 @@ msgstr "Procsi Squid"
 msgid "PXE Wizard"
 msgstr "Macrea PXE"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Defini sierveu PXE"
 
 #: ../pxe_wizard/Pxe.pm:80
 msgid "Add boot image in PXE"
-msgstr ""
+msgstr "Radjouter ene imådje d' enondaedje e PXE"
 
 #: ../pxe_wizard/Pxe.pm:81
 msgid "Remove boot image in PXE"
-msgstr ""
+msgstr "Oister ene imådje d' enondaedje e PXE"
 
 #: ../pxe_wizard/Pxe.pm:82
 msgid "Modify boot image in PXE"
-msgstr ""
+msgstr "Candjî ene imådje d' enondaedje e PXE"
 
 #: ../pxe_wizard/Pxe.pm:105
 msgid "PXE wizard"
@@ -1668,15 +1723,17 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:127
 msgid "Add a boot image"
-msgstr ""
+msgstr "Radjouter ene imådje d' enondaedje"
 
 #: ../pxe_wizard/Pxe.pm:127
 msgid "PXE name: name in PXE menu (one word/number, no space please)"
-msgstr ""
+msgstr "No do PXE: li no el menu PXE (on mot/limero, pont d' blancs)"
 
 #: ../pxe_wizard/Pxe.pm:127
 msgid "Path to image: full path to image (need network boot image)"
 msgstr ""
+"Tchimin po l' imådje: tchimin en etir disk' a l' imådje (imådje "
+"d' enondaedje rantoele)"
 
 #: ../pxe_wizard/Pxe.pm:137
 msgid "Choose PXE boot image you want to remove from PXE server."
@@ -1684,23 +1741,23 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:137
 msgid "Remove a boot image"
-msgstr ""
+msgstr "Oister ene imådje d' enondaedje"
 
 #: ../pxe_wizard/Pxe.pm:139
 msgid "Boot image to remove:"
-msgstr ""
+msgstr "Imådje d' enondaedje a oister:"
 
 #: ../pxe_wizard/Pxe.pm:144
 msgid "Add option to boot image:"
-msgstr ""
+msgstr "Radjouter ene tchuze a l' imådje d' enondaedje:"
 
 #: ../pxe_wizard/Pxe.pm:144
 msgid "Please choose PXE boot image to modify"
-msgstr ""
+msgstr "Tchoezixhoz l' imådje d' enondaedje PXE a candjî"
 
 #: ../pxe_wizard/Pxe.pm:147
 msgid "Boot image to configure:"
-msgstr ""
+msgstr "Imådje d' enondaedje a-z apontyî:"
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Install directory: full path to MDK install server directory"
@@ -1708,7 +1765,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Installation method: choose nfs/http to install via nfs/http."
-msgstr ""
+msgstr "Metôde d' astalaedje: tchoezixhoz nfs/http po-z astaler viè nfs/http."
 
 #: ../pxe_wizard/Pxe.pm:153
 msgid "Options to add to PXE boot disk"
@@ -1722,7 +1779,7 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:155 ../pxe_wizard/Pxe.pm:211
 msgid "Boot image to modify:"
-msgstr ""
+msgstr "Imådje d' enondaedje a candjî:"
 
 #: ../pxe_wizard/Pxe.pm:156 ../pxe_wizard/Pxe.pm:212
 msgid "Server IP:"
@@ -2313,62 +2370,3 @@ msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "Li macrea a-st apontyî comifåt vosse sierveu waibe pol rantoele locåle eyet "
 "pol daegntoele"
-
-#~ msgid ""
-#~ "A client of your local network is a machine connected to the network "
-#~ "having its own name and IP number."
-#~ msgstr ""
-#~ "On cliyint di vosse rantoele locåle est ene éndjole raloyeye al rantoele "
-#~ "k' a si prôpe no ey adresse IP."
-
-#~ msgid ""
-#~ "Note that the given IP number 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."
-
-#~ msgid "IP number of the machine:"
-#~ msgstr "Adresse IP del éndjole:"
-
-#~ msgid "Error add host."
-#~ msgstr "Åk n' a nén stî tot radjoutant l' lodjoe."
-
-#~ msgid "Error remove host."
-#~ msgstr "Åk n' a nén stî tot oistant l' lodjoe."
-
-#~ msgid "Setup a ldap server."
-#~ msgstr "Aponyî on sierveu LDAP."
-
-#~ msgid "example:"
-#~ msgstr "egzimpe:"
-
-#~ msgid "will be in ldap config:"
-#~ msgstr "serè po l' apontiaedje di LDAP:"
-
-#~ msgid "Error Ip of DNS master."
-#~ msgstr "Aroke avou l' adresse IP do DNS mwaisse."
-
-#~ msgid "Ip of master DNS server:"
-#~ msgstr "Adresse IP do sierveu DNS mwaisse:"
-
-#~ msgid "Dhcp server"
-#~ msgstr "Sierveu DHCP"
-
-#~ msgid "Dns server"
-#~ msgstr "Sierveu DNS"
-
-#~ msgid "Ftp server"
-#~ msgstr "Sierveu NFS"
-
-#~ msgid "Pxe server"
-#~ msgstr "Sierveu PXE"
-
-#~ msgid "Configuring your system as a Nis+Autofs(nfs) server ..."
-#~ msgstr "Apontiaedje di vosse sistinme come sierveu NIS+autofs(nfs)..."
-
-#~ msgid "Nis+autofs Server"
-#~ msgstr "Sierveu NIS+autofs"
-
-#~ msgid "PXE Wizard (devel)"
-#~ msgstr "Macrea PXE (diswalpaedje)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c148346b..329937ab 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-21 11:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "配置向导"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -34,9 +34,9 @@ msgstr "配置向导"
 msgid "Warning."
 msgstr "警告。"
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -44,12 +44,12 @@ msgid "Error."
 msgstr "出错。"
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -86,22 +86,22 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "此向导将帮助您把一个新的客户机添加到您的本地 DNS。"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(在名字后面不必输入域名)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "客户机身份:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, 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:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,27 +110,28 @@ msgstr ""
 "您的网络客户机将通过名字来鉴别，例如 clientname.company.net。网络中每台机器必"
 "须有一个(唯一的)IP 地址，使用常规的点分隔语法。"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "机器名:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "机器的 IP 地址:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "警告"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 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:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -174,7 +175,7 @@ msgstr "客户机 IP:"
 msgid "The wizard successfully added the client."
 msgstr "向导成功地添加了客户。"
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP 向导"
 
@@ -189,57 +190,86 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "此向导将帮助您在本服务器上配置 DHCP 服务。"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "DHCP 使用的地址范围"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "选择 DHCP 服务将要分配给各个工作站的地址范围；除非您有特殊要求，接受建议的值"
 "是安全的。"
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "最低的 IP 地址:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "最高的 IP 地址:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "DHCP 服务器必须监听的网卡"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "指定的 IP 范围不对。"
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "指定的 IP 范围并不位于服务器地址的范围内。"
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "服务器的 IP 必须不位于范围内。"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "配置 DHCP 服务器"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "为了配置 DHCP 服务，向导收集了下列需要的参数:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "已禁用"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "已启用"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "网卡："
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "向导成功地为您的服务器配置了 DHCP 服务。"
 
@@ -247,7 +277,7 @@ msgstr "向导成功地为您的服务器配置了 DHCP 服务。"
 msgid "You need to readjust your hostname."
 msgstr "您需要重新调整您的主机名。"
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
@@ -256,12 +286,12 @@ msgstr ""
 "您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
 "localdomain 或不设置。请使用 DrakConnect 进行调整。"
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "主 DNS 服务器"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "从 DNS 服务器"
 
@@ -294,70 +324,71 @@ msgstr ""
 "此向导将帮助您配置您服务器上的 DNS 服务。所做的配置将提供 DNS 服务以解析本地"
 "的计算机名字，非本地的请求将被转发给外部的 DNS。"
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr "您想要执行何种操作:"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr "请在下面的列表中选择您想要删除的主机。"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr "在现有的 DNS 配置中删除主机。"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr "删除主机:"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "新闻组服务器名:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "主 DNS 服务器的 IP:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -365,115 +396,115 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "这个地址无效...按“下一步”继续"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "出错"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "DNS(配置)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "新闻组服务器名:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "服务器标题:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "NIS 域名:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "向导成功地添加了客户。"
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "向导成功地添加了客户。"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "向导已成功地为您的服务器配置了 DNS 服务。"
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "正在将您的系统配置为主 DNS 服务器..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "将您的系统配置为 NIS+Autofs(nfs) 服务器..."
@@ -563,107 +594,104 @@ msgstr "安装失败"
 msgid "FTP wizard"
 msgstr "FTP 向导"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP 服务器配置向导"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "此向导将帮助您在网络中配置 FTP 服务器。"
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "如果不想激活 FTP 服务，请清除前面的方框。"
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP 服务器"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "选择您要激活的 FTP 服务类型:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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 服务，也可以向互联网提供 FTP 服务。"
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "激活对互联网的 FTP 服务"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "为互联网激活 FTP 服务器"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "允许的主机:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"警告\n"
-"您在使用 DHCP，服务器可能无法按照您的配置工作。"
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "对不起，您必须是 root 才能执行此操作..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "配置 FTP 服务器"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "为了配置 FTP 服务器，向导收集了下列需要的参数"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -671,35 +699,35 @@ msgstr ""
 "要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改它"
 "们"
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "已禁用"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "已启用"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "局域网 FTP 服务器:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "互联网 FTP 服务器:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "向导成功地配置了您的 Intranet/Internet FTP 服务器"
 
@@ -747,7 +775,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1021,7 +1049,7 @@ msgid ""
 "needed to configure your Internet News Service:"
 msgstr "为了配置 Internet 新闻组服务，向导收集了下列需要的参数:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1292,49 +1320,72 @@ msgstr "正在将您的系统配置为 NIS 客户..."
 msgid "Nis Client"
 msgstr "NIS 客户"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix 向导"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "邮件服务器"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "邮件服务器"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet 邮件配置向导"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "此向导将帮助您在您的网络上配置 Internet 电子邮件服务。"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "发出邮件地址"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "这应该和您用来接收邮件的地址一致。"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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 "您可以选择发出邮件在“From:”和“Reply-to”字段显示的地址类型。"
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "伪装域名:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "警告:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "您输入的邮件网关地址是空的。"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1342,15 +1393,21 @@ msgstr ""
 "您的选择可以被接受，不过那样您将不能发送邮件到您的局域网以外。点击“下一步”继"
 "续，或“后退”并输入一个值。"
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "伪装有问题！"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Internet 邮件网关"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1359,61 +1416,67 @@ msgstr ""
 "互联网主机名必须采用下列格式“host.domain.domaintype”；例如，您的服务商"
 "是“provider.com”，邮件服务器通常就是“smtp.provider.com”。"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "您的服务器将使用一个邮件网关发出邮件，它会负责最终的投递。"
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "邮件服务器名:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr "myorigin:"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "配置 Internet 邮件"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "为了配置 Internet 邮件服务，向导收集了下列需要的参数:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "地址形式"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr "myorigin"
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr "向导成功地为您的服务器配置了 Internet 邮件服务。"
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "配置您的 Postfix 服务器。"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Postfix 服务器"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "配置您的 Postfix 服务器。"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "本机 - 只允许这个服务器访问"
@@ -1577,7 +1640,8 @@ msgid "Access Control:"
 msgstr "访问控制:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "向导成功地配置了您的代理服务器。"
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1593,15 +1657,6 @@ msgstr "Squid 代理服务器"
 msgid "PXE Wizard"
 msgstr "PXE 向导"
 
-#: ../pxe_wizard/Pxe.pm:72
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-"您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
-"localdomain 或不设置。请使用 DrakConnect 进行调整。"
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "设置 PXE 服务器"
@@ -2296,6 +2351,25 @@ msgstr "用户目录:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "向导成功地配置了您的 Intranet/Internet Web 服务器"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "如果不想激活 FTP 服务，请清除前面的方框。"
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "警告\n"
+#~ "您在使用 DHCP，服务器可能无法按照您的配置工作。"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For a DNS server you need a correct "
+#~ "domainname, not egal to localdomain or none. Launch drakconnect to adjust "
+#~ "it."
+#~ msgstr ""
+#~ "您需要重新调整您的主机名。对于 DNS 服务器，您需要正确的域名，而不能是"
+#~ "localdomain 或不设置。请使用 DrakConnect 进行调整。"
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 21f18a03..467997d0 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-01-25 15:27+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2004-01-26 11:56+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "�]�w���F"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -29,9 +29,9 @@ msgstr "�]�w���F"
 msgid "Warning."
 msgstr "ĵ�i."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -39,12 +39,12 @@ msgid "Error."
 msgstr "���~."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -81,21 +81,21 @@ msgstr ""
 msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr "�����F�|���U�z�h�W�[�@�ӷs�Ȥ�ݦb�z�����a�� DNS ��."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(�z���ݭn�b�W�r����J����)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "�Ȥ�ݻ{��:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
 msgstr "�`�N�b�����W�ҵ��w�� IP ��}�M�Ȥ�ݦW�ٳ����ӬO�W�@��."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 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,26 +104,27 @@ msgstr ""
 "�b�����W, �z���Ȥ�ݷ|�ΦW�٨��ѧO, �pclientname.company.net.�����W�C�@������"
 "���������@�ӥH�`�Τp�I�O���ƦC�覡��(�W�@) IP ��}."
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "�����W��:"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 msgid "IP address of the machine:"
 msgstr "������ IP ��}:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "ĵ�i"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr "�z���b dncp ��, ���A���i�ण��P�z���]�w�B�@."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -165,7 +166,7 @@ msgstr "�Ȥ�� IP :"
 msgid "The wizard successfully added the client."
 msgstr "���F�w���\�[�J�@�ӫȤ��."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "DHCP ���F"
 
@@ -180,57 +181,86 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "�o���F�N�|���U�z���z�����A���]�w DHCP �A��."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "dhcp �ҥΪ���}�d��"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "��ܥ� DHCP ���u�@���Ҥ��t����}���d��; ���D�z���S�O���ݭn, �_�h�z�i�H�w���a"
 "�����ҫ�ij���ƭ�."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "�̧C�� IP ��}:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "�̰��� IP ��}:"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "�ҫ��w�� IP �d��ä����T."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr "�ҫ��w�� IP �d��ä����T."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "���b�]�w DHCP ���A��"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
 msgstr "���F������H�U�ݭn�]�w�z�� DHCP �A�Ȫ��Ѽ�:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "�w����"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../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
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "�w�ҥ�"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr ""
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "�o���F���\���z�����A���]�w DHCP �A��."
 
@@ -238,19 +268,19 @@ msgstr "�o���F���\���z�����A���]�w DHCP �A��."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 msgid "Master DNS server"
 msgstr "�D�n DNS ���A��"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 msgid "Slave DNS server"
 msgstr "���n DNS ���A��"
 
@@ -266,7 +296,8 @@ msgstr ""
 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�����@�Ӿ��� IP ��}��@�Ӻ��ں����D���W�٪��A��."
+msgstr ""
+" DNS  (Domain Name Server)�O�����@�Ӿ��� IP ��}��@�Ӻ��ں����D���W�٪��A��."
 
 #: ../dns_wizard/Bind.pm:104
 msgid "DNS Master configuration wizard"
@@ -281,68 +312,69 @@ msgstr ""
 "�o���F�|���U�z�]�w�z�����A���� DNS �A��. �o�]�w�|���Ѥ@�ӥ��a�� DNS�A�ȵ�����"
 "�a�ݹq���W��, �öǰe�D���a�ݩʭn�D��~���� DNS."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove host:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 msgid "Computer Name:"
 msgstr "�q���W��:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 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:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 msgid "IP Address of the master DNS server:"
 msgstr "�D�n DNS ���A���� IP ��}:"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 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:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So 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:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr "�~�� DNS:"
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 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 "
@@ -350,103 +382,105 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+#: ../dns_wizard/Bind.pm:166
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr "��z����H�̦Ө�, �o���O�@�Ӧ��Ī� IP ��}... �Ы��U�@�B�~��"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "�o���O�@�Ӧ��Ī��D�n DNS IP ��}... �Ы��U�@�B�~��"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 msgid "This is not a valid IP address... press next to continue"
 msgstr "�o���O�@�Ӧ��Ī� IP ��}... �Ы��U�@�B�~��"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid "Error:"
 msgstr "���~:"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 msgid "with this configuration:"
 msgstr "��o�ӲպA�]�w:"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr "�q���W��:"
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 msgid "Computer IP address:"
 msgstr "�q�� IP ��}:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
-msgid "The DNS server is about to be configured with the following configuration"
+#: ../dns_wizard/Bind.pm:231
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 msgid "Server Hostname:"
 msgstr "���A���D���W��:"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 msgid "Domainname:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 msgid "The wizard successfully add host in your DNS."
 msgstr "���F���\�a�[�J�D����z�� DNS."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 msgid "The wizard successfully remove host in your DNS."
 msgstr "���F���\�a�����D����z�� DNS."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr "���F���\�a�]�w�z�����A���� DNS �A��."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 msgid "Configuring your system as Master DNS server ..."
 msgstr "���b�]�w�z���t�����D�n DNS ���A�� ..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "���b�]�w�z���t�������n DNS ���A�� ..."
 
@@ -531,141 +565,137 @@ msgstr ""
 msgid "FTP wizard"
 msgstr "FTP ���F"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP ���A���]�w���F"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "�o���F�|���U�z�]�w�z�������� FTP ���A��."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "���n��ܥ���ﶵ�p�G�z���Q�E���z�� FTP ���A��."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "FTP ���A��"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "��ܱz�Q�E���� FTP �A������:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../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 "�z�����A���ন���z�����������M���ں����� FTP ���A��."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "�ҥ� FTP ���A���󤺳�����"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "�ҥ� FTP ���A������ں���"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Allow FXP:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"ĵ�i\n"
-"�z���b dhcp ��, ���A���i�ण����ϥαz���]�w."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "�藍�_, �z�����H root �����~�i�H�o�˰�..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "���b�]�w FTP ���A��"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
 msgstr "���F������H�U�ݭn�]�w�z�� FTP ���A�����Ѽ�"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
 msgstr "���U�@�B�����o�ǼƭȩM�]�w�z�����A��, �ΨϥΤW�@�B�@�X��."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "�w����"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "�w�ҥ�"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "�������� FTP ���A��:"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "���ں��� FTP ���A��:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "���F���\�]�w�z����������/���ں��� FTP ���A��"
 
@@ -712,7 +742,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -974,7 +1004,7 @@ msgstr ""
 "���F������H�U�ݭn�]�w�z��\n"
 "���ں����s�D�A�Ȫ��Ѽ�:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -991,7 +1021,8 @@ msgid "Polling Interval:"
 msgstr "���߶��Z:"
 
 #: ../news_wizard/Inn.pm:96
-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 "���F���\�]�w�z�����A�������ں����s�D�A��."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1214,7 +1245,8 @@ msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr "���F���\�a�]�w�z�����������@�� NIS �Ȥ��."
 
 #: ../nisautofs_wizard/Nisautofs.pm:148
-msgid "The wizard successfully configured your machine to be a NIS with autofs map."
+msgid ""
+"The wizard successfully configured your machine to be a NIS with autofs map."
 msgstr "���F���\�a�]�w�z�����������@�Ӧ� autofs �a�Ϫ� NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:302
@@ -1233,49 +1265,72 @@ msgstr ""
 msgid "Nis Client"
 msgstr "Nis �Ȥ��"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Postfix ���F"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "�q�l���A��"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "�q�l���A��"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "���ں����q�l�]�w���F"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr "�o���F�|���U�z�]�w�z�����������ں����q�l�A��."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "�~�X�q�l�a�}"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "�z���ӿ�ܤ@�өM�i�ӹq�l�a�}�@�P��."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../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 "�z�i�H��ܥ~�X�q�l����ܦb \"From:\" �� \"Reply-to\" ��쪺�a�}����."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "���˪�����W��:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "ĵ�i:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "�z��J�@�Ӫťժ��q�l�h�D��}."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 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."
@@ -1283,15 +1338,21 @@ msgstr ""
 "�z����ܥi�H�Q����, ���o�N���|��\�z�ǰe�l���z�����a�ݺ����~.���U�@�B�~��, "
 "�ΤW�@�����s��J�ƭ�."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "���ˬO���n��!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "���ں����q�l�h�D"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 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 "
@@ -1300,60 +1361,67 @@ msgstr ""
 "���ں����D���W�٥����H\"host.domain.domaintype\"���榡�R�W; �Ҧp, �p�G�z����"
 "���̬O\"provider.com\", �����ں����q�l���A���`�O\"smtp.provider.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr "�z�����A���|�g�ѹq�l�h�D�Ӷǰe�~�X�q�l, �q�l�h�D�|�B�z�̲ת��뻼�u�@."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "�q�l���A���W��:"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "���b�]�w���ں����q�l�l��"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "���F������H�U�ݭn�]�w�z�����ں����q�l�A�Ȫ��Ѽ�:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "�a�}����"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
-msgid "The wizard successfully configured your Internet Mail service of your server."
+#: ../postfix_wizard/Postfix.pm:149
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
 msgstr "���F���\�]�w�z�����A�������ں����q�l�A��."
 
-#: ../postfix_wizard/Postfix.pm:151
-msgid "Configuring your Postfix server."
-msgstr "���b�]�w�z�� Postfix ���A��."
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 msgid "Postfix Server"
 msgstr "Postfix ���A��"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "���b�]�w�z�� Postfix ���A��."
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "���a�ݥD�� - �u���o���A������s������"
@@ -1402,7 +1470,8 @@ msgid "Proxy port:"
 msgstr "�N�z�q�T��:"
 
 #: ../proxy_wizard/Squid.pm:81
-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 "�p�G�z�Q�O���o�ӼƭȽЫ��U�@�B, �ΤW�@�B���z�����."
 
 #: ../proxy_wizard/Squid.pm:81
@@ -1418,7 +1487,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "�z������ܤ@�Ӥj��1024�Τ֩�65535���q�T��"
 
 #: ../proxy_wizard/Squid.pm:92
-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 "�ϽL�w�R�O�@�ӥi�Χ@�w�R��ϽL�W���ϽL�Ŷ��`�B."
 
 #: ../proxy_wizard/Squid.pm:92
@@ -1463,15 +1533,16 @@ msgstr ""
 msgid ""
 "Use numeric format like \"192.168.1.0/255.255.255.0\" or a text format like "
 "\".domain.net\""
-msgstr "�ϥμƦr�Φ��p \"192.168.1.0/255.255.255.0\" �Τ�r�Φ��p \".domain.net\""
+msgstr ""
+"�ϥμƦr�Φ��p \"192.168.1.0/255.255.255.0\" �Τ�r�Φ��p \".domain.net\""
 
 #: ../proxy_wizard/Squid.pm:127
 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 ""
-"�H�@�ӿﶵ�Ө�, Squid �i�H�Q�]�w��N�z���A�����p. �z�i�H�ǥѫ��w���� "
-"�D���W�٩M�q�T��H�W�[�@�ӷs���W�h�N�z���A��."
+"�H�@�ӿﶵ�Ө�, Squid �i�H�Q�]�w��N�z���A�����p. �z�i�H�ǥѫ��w���� �D���W��"
+"�M�q�T��H�W�[�@�ӷs���W�h�N�z���A��."
 
 #: ../proxy_wizard/Squid.pm:127 ../proxy_wizard/Squid.pm:140
 msgid "Cache hierarchy"
@@ -1502,7 +1573,8 @@ msgid "Configuring the Proxy"
 msgstr "�]�w�N�z���A����"
 
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
-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 "���F������H�U�ݭn�]�w�z���N�z���A�����Ѽ�:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
@@ -1514,7 +1586,8 @@ msgid "Access Control:"
 msgstr "�s���v����:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "���F���\�]�w�z���N�z���A��."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1529,12 +1602,6 @@ msgstr "Squid �N�z���A��"
 msgid "PXE Wizard"
 msgstr "PXE ���F"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "�]�w PXE ���A��"
@@ -1573,9 +1640,7 @@ msgstr ""
 msgid ""
 "This wizard will provide a pxe service, and ability to add/remove/modify "
 "boot images."
-msgstr ""
-"�o�Ӻ��F�N�|���Ѥ@�� pxe �A��, �P �s�W/����/�ק�}���v���� "
-"����O."
+msgstr "�o�Ӻ��F�N�|���Ѥ@�� pxe �A��, �P �s�W/����/�ק�}���v���� ����O."
 
 #: ../pxe_wizard/Pxe.pm:127
 msgid "Add a boot image"
@@ -1652,7 +1717,8 @@ msgid "ACPI option: Advanced Configuration and Power Interface"
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:163
-msgid "Network client interface: through which interface client should be installed."
+msgid ""
+"Network client interface: through which interface client should be installed."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:163
@@ -1707,7 +1773,8 @@ msgid "Please provide a correct name in PXE entry (one word)."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:190
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:194
@@ -1800,7 +1867,8 @@ msgstr ""
 "�u�@��."
 
 #: ../samba_wizard/Samba.pm:71
-msgid "This wizard will help you configuring the Samba services of your server."
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr "�o���F�|���U�z�]�w�z�����A���� Samba �A��."
 
 #: ../samba_wizard/Samba.pm:76
@@ -2203,6 +2271,16 @@ msgstr "�ϥΪ̥ؿ�:"
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "�o���F���\�]�w�z����������/���ں����������A��"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr "���n��ܥ���ﶵ�p�G�z���Q�E���z�� FTP ���A��."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "ĵ�i\n"
+#~ "�z���b dhcp ��, ���A���i�ण����ϥαz���]�w."
+
 #~ msgid ""
 #~ "A client of your local network is a machine connected to the network "
 #~ "having its own name and IP number."
@@ -2849,4 +2927,3 @@ msgstr "�o���F���\�]�w�z����������/���ں����������A��"
 
 #~ msgid "Enable the Web Server for the Intranet and for the Internet"
 #~ msgstr "�Ұʤ��p���M���p�����������A��"
-