rescued a some ~50 strings strings and updated pot file.

capitalized "Internet"

53 files changed, 9508 insertions, 8735 deletions

diff --git a/po/ar.po b/po/ar.po
index bdfbe4c3..2687812f 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-02 13:00+0100\n"
 "Last-Translator: Youcef Rabah Rahal <rahal@arabeyes.org>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -47,7 +47,7 @@ msgstr "خطأ."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -194,7 +194,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "هذا المعالج سيساعدك على تهيئة خدمات DHCP لخادمك."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -212,16 +215,16 @@ msgstr ""
 "حاجات خاصة, يمكنك قبول القيم المعطاة بأمان"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "عنوان IP الأقل:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "عنوان IP الأعلى:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP البوابة:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -248,7 +251,7 @@ msgid "The IP of the server must not be in range."
 msgstr "عنوان IP للخادم لا يجب أن يكون في الحدود"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "جاري تهيئة خادم DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -282,7 +285,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "قام المعالج بتهيئة خدمات DHCP بنجاح."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -558,11 +562,11 @@ msgstr "خادم DHCP"
 msgid "DNS server"
 msgstr "خادم DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "خادم الأخبار"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "خادم NFS"
 
@@ -570,7 +574,7 @@ msgstr "خادم NFS"
 msgid "Mail server"
 msgstr "خادم البريد"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "خادم FTP"
 
@@ -630,40 +634,36 @@ msgid "FTP wizard"
 msgstr "معالج FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "معالج تهيئة خادم FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "هذا المعالج سيساعدك على تهيئة خادم FTP لشبكتك."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "خادم FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "اختر نوع خدمة FTP التي تريد تفعيلها:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "يمكن لخادمك أن يكون خادم FTP لشبكتك الداخلية (الإنترانت) و كخادم FTP "
 "للإنترنت."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "مكّن خادمات FTP للإنترانت"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "مكّن خادم FTP للإنترنت"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -675,7 +675,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -691,11 +691,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -719,8 +719,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -728,14 +728,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "عفواً, يجب أن تكون المستخدم الجذر كي تقوم بهذا..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "جاري تهيئة خادم FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "قام المعالج بتجميع المعاملات التالية و الضرورية لتهيئة خادم FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -748,11 +748,11 @@ msgstr ""
 "اختياراتك."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "خادم FTP للإنترانت:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "خادم FTP للإنترنت:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -776,7 +776,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "قام المعالج بتهيئة خادم  FTP للإنترنت/الإنترانت بنجاح"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -824,11 +824,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1047,7 +1047,7 @@ msgstr "أهلا بك في معالج الأخبار"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "اسم مستضيفات الإنترنت يجب أن تكون على شكل \"host.domain.domaintype\"; مثلا "
@@ -1055,10 +1055,6 @@ msgstr ""
 "عادة ما يكون \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "خادم الأخبار"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1067,33 +1063,33 @@ msgstr ""
 "اعطاء هذا الإسم من موفر خدمة الإنترنت."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "اسم خادم الأخبار:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "اعتماداً على الإتصال بالإنترنت لديك, فإن فترة التصويت المناسبة قد تتغير ما "
 "بين 6 و 24 ساعة."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "فترة التصويت"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "فترة التصويت (ساعة):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1111,30 +1107,29 @@ msgstr "جاري تهيئة الأخبار"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "قام المعالج بتجميع المعاملات الآتية و الضرورية لتهيئة خدمة أخبار الإنترنت:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "لقبول هذه القيم, و لتهيئة الخادم, اضغط زر التالي أو استخدم زر الرجوع لتصحيح "
 "اختياراتك."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "خادم الأخبار"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "فترة التصويت:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "قام المعالج بتهيئة خدمات الأخبار لخادمك بنجاح."
@@ -1144,7 +1139,6 @@ msgid "NFS Wizard"
 msgstr "معالح NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "الكل - لا قيود على الدخول"
 
@@ -1157,25 +1151,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "معالج تهيئة خادم NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "هذا المعالج سيساعدك على تهيئة خادم NFS لشبكتك."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "خادم NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "الدليل:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "التحكم بالدخول"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "اختر المستوى الذي يناسب احتياجاتك. اذا لم تكن تعلم ما تريد, فإن مستوى الشبكة "
@@ -1223,7 +1214,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "قام المعالج بتهيئة خادم NFS بنجاح."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1232,27 +1223,23 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "خادم الأخبار"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "عميل NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "خادم الأخبار"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1268,18 +1255,19 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "خادم NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1297,11 +1285,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "خادم NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1322,22 +1305,6 @@ msgstr "قام المعالج بتهيئة خادم Samba بنجاح."
 msgid "NIS directory:"
 msgstr "دليل Nis:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "ملفّ الشّبكة:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1350,7 +1317,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1385,12 +1352,12 @@ msgstr "جاري تهيئة خادم DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "خادم الأخبار"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "جاري تهيئة خادم DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1476,7 +1443,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "أسماء مستضيفات الإنترنت يجب أن تكون على شكل \"host.domain.domaintype\"; مثلاً "
@@ -1527,15 +1494,6 @@ msgid ""
 msgstr ""
 "قام المعالج بتجميع المعلومات التالية و الضرورية لتهيئة خدمة بريد الإنترنت:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"لقبول هذه القيم, و لتهيئة الخادم, اضغط زر التالي أو استخدم زر الرجوع لتصحيح "
-"اختياراتك."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1669,6 +1627,19 @@ msgid "Disk space (MB):"
 msgstr "مساحة القرص (ميغابايت):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "التحكم بالدخول"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"اختر المستوى الذي يناسب احتياجاتك. اذا لم تكن تعلم ما تريد, فإن مستوى الشبكة "
+"المحلية عادة ما يكون هو الأنسب. احذر أن مستوى الكل قد لا يكون آمناً."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr "يمكن تهيئة البروكسي بدرجات مختلفة للتحكم بالدخول اليه."
@@ -1734,6 +1705,15 @@ msgid ""
 msgstr ""
 "قام المعالج بتجميع المعاملات التالية و التي يُحتاج اليها لتهيئة البروكسي:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"لقبول هذه القيم, و لتهيئة الخادم, اضغط زر التالي أو استخدم زر الرجوع لتصحيح "
+"اختياراتك."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "المنفذ:"
@@ -2098,15 +2078,16 @@ msgstr "معالج Samba"
 msgid "%s does not exist."
 msgstr "%s غير موجود."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "الكل - لا قيود على الدخول"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "قواعدي - اسألني عن المستضيفات المسموحة و الممنوعة"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "معالج تهيئة Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2115,6 +2096,10 @@ msgstr ""
 "أنظمة غير لينكس."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "معالج تهيئة Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "هذا المعالج سيساعدك على تهيئة خدمات Samba لجهازك الخادم."
@@ -2136,7 +2121,7 @@ msgid "The Workgroup is wrong"
 msgstr "مجموعة العمل خطأ"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "شعار الخادم"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2150,13 +2135,9 @@ msgid "Banner:"
 msgstr "الشعار:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "شعار الخادم غير صحيح"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "التحكم بالدخول"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "مستوى الدخول:"
@@ -2164,7 +2145,7 @@ msgstr "مستوى الدخول:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* المثال 1: اسمح لكل عناوين IP في 150.203.*.* الا واحداً\\nhosts allow = "
@@ -2210,7 +2191,7 @@ msgid "Deny hosts:"
 msgstr "امنع المستضيفات:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "مكّن خدمات Samba"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2227,7 +2208,7 @@ msgid "Enable file sharing area"
 msgstr "مكّن مساحة مشاركة الملفات"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "مكّن مشاركة الطباعة عبر الخادم"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2266,7 +2247,7 @@ msgstr ""
 "\\') مثل :\\nroot, fred, @users, @wheel لكل نوع من الصلاحيات."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "اقرأ القائمة:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2274,7 +2255,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "اكتب القائمة:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2295,15 +2276,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "قام المعالج بتهيئة المعاملات التالية و الضرورية لتهيئة Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "شعار الخادم:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "مشاركة الملفات:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "خادم الطباعة:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2362,15 +2343,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "اختر خادم أساسي و ثانوي من القائمة"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "خادمات الوقت"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "خادم الوقت الأساسي:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "خادم الوقت الثانوي"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2444,15 +2425,15 @@ msgid "Web wizard"
 msgstr "معالج الويب"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "هذا المعالج سيساعدك في تهيئة خادم الويب لشبكتك."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "معالج تهيئة خادم الويب"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "لا تقم بالتأشير على أي صندوق اذا لم تكن تريد تفعيل خادم الويب."
 
 #: ../web_wizard/Apache.pm:77
@@ -2460,23 +2441,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "اختر نوع خدمة الويب الذي تريد تفعيله:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "خادم الويب"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "خادمك يمكن أن بعمل كخادم ويب لشبكتك الداخلية (الإنترانت) أو كخادم ويب "
 "للإنترنت."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "مكّن خادم الويب للإنترانت"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "مكّن خادم الويب للإنترنت"
 
 #: ../web_wizard/Apache.pm:90
@@ -2519,18 +2500,18 @@ msgstr "user http sub-directory : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Type the path of the directory you want being the document root."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Document root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "جاري تهيئة خادم الويب"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "قام المعالج بجمع المعاملات التالية و التي يحتاج اليها خادم الويب لتهيئته"
 
@@ -2542,16 +2523,12 @@ msgstr "خادم الويب للإنترانت:"
 msgid "Internet web server:"
 msgstr "خادم ويب الإنترنت:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Document root:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "دليل المستخدم:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "قام المعالج بتهيئة خادم الويب للإنترنت/الإنترانت بنجاح"
 
 #: ../web_wizard/Apache.pm:236
@@ -2564,6 +2541,39 @@ msgstr "خادم الويب للإنترانت:"
 msgid "Configuring your system as Apache server ..."
 msgstr "جاري تهيئة خادم DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "قام المعالج بتهيئة خدمات DHCP بنجاح."
+
+#~ msgid "FTP Server"
+#~ msgstr "خادم FTP"
+
+#~ msgid "News Server"
+#~ msgstr "خادم الأخبار"
+
+#~ msgid "NFS Server"
+#~ msgstr "خادم NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "خادم الأخبار"
+
+#~ msgid "NIS Server:"
+#~ msgstr "خادم NIS:"
+
+#~ msgid "Network File:"
+#~ msgstr "ملفّ الشّبكة:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "لقبول هذه القيم, و لتهيئة الخادم, اضغط زر التالي أو استخدم زر الرجوع "
+#~ "لتصحيح اختياراتك."
+
+#~ msgid "Document Root:"
+#~ msgstr "Document Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "جاري تهيئة البريد"
 
diff --git a/po/az.po b/po/az.po
index 9db73c08..9f5b956c 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-20 18:30+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -41,7 +41,7 @@ msgstr "Xəta"
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -197,7 +197,10 @@ msgstr ""
 "Bu sehirbaz vericinizin DHCP xidmətlərini quraşdırmaqda sizə yardım edəcək."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -216,16 +219,16 @@ msgstr ""
 "e'tibarla seçə bilərsiniz."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Ən Kiçik IP Ünvanı:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Ən Böyük IP Ünvanı:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Ən Kiçik IP Ünvanı:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -252,7 +255,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP Vericisi Quraşdırılır"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -287,7 +290,8 @@ msgid "Interface:"
 msgstr "Ara üz:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Sehirbaz vericinizin DHCP xidmətlərini müvəffəqiyyətlə quraşdırdı."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -557,11 +561,11 @@ msgstr "DHCP vericisi"
 msgid "DNS server"
 msgstr "DNS vericisi"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Xəbərlər vericisi"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS vericisi"
 
@@ -569,7 +573,7 @@ msgstr "NFS vericisi"
 msgid "Mail server"
 msgstr "Poçt vericisi"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP vericisi"
 
@@ -628,41 +632,37 @@ msgid "FTP wizard"
 msgstr "FTP sehirbazı"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP Verici Quraşdırma Sehirbazı"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "FTP Vericisi"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "İntranet üçün FTP Vericisini fəallaşdır"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "İnternet üçün FTP Vericisini Fəallaşdır"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -674,7 +674,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -690,11 +690,11 @@ msgid "Admin email:"
 msgstr "Admin epoçtu:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "root girişinə icazə ver:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "İstifadəçi üstündə Chroot Home icra et:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -721,8 +721,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -730,14 +730,14 @@ 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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP Vericisi Quraşdırılır"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Sehirbaz FTP Vericinizin quraşdırılması üçün ehtiyac olan aşağıdakı "
 "parametrləri topladı"
@@ -752,11 +752,11 @@ msgstr ""
 "etmək üçün isə Geri düyməsinə basın."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "İntranet FTP Vericisi:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "İnternet FTP Vericisi:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -780,7 +780,7 @@ msgid "Allow FXP"
 msgstr "FXP-yə icazə ver"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Sehirbaz İntranet/İnternet FTP Vericinizi müvəffəqiyyətlə quraşdırdı"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -830,11 +830,11 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Hədəf cərgə onsuz da istifadədədir, xahiş edirik başqasını seçin."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Qurulum vericiniz o parametrlərlə quraşdırıla bilər"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1066,7 +1066,7 @@ msgstr "Xəbər Sehirbazına Xoş Gəldiniz"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "İnternet qovşaq dları \"qovşaq.domen.domennövü\" formasında olmalıdır. Misal "
@@ -1074,10 +1074,6 @@ msgstr ""
 "\"news.provider.com\" olacaq."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Xəbərlər Vericisi"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1086,24 +1082,24 @@ msgstr ""
 "adıdır və çox vaxt provayderiniz tərəfindən verilir."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Xəbərlər Vericisi Adı:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "İnternet bağlantınızın növünə görə sorğulama dövrü 6 ilə 24 saat arasında "
 "dəyişə bilər."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Sorğulama Dövrü:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1112,7 +1108,7 @@ msgstr ""
 "vaxtı göstərir."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Sorğulama Dövrü (Saat):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1130,31 +1126,30 @@ msgstr "İnternet Xəbərləri Quraşdırılır"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "İnternet Xəbərlər xidmətinizi quraşdırmaq üçün sehirbaz aşağıdakı "
 "parametrləri topladı:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Xəbər Vericisi:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Sorğulama Aralığı:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1165,7 +1160,6 @@ msgid "NFS Wizard"
 msgstr "NFS Sehirbazı"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Hamısı - İcazə məhdudlaşdırılması olmayacaq"
 
@@ -1178,26 +1172,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS Verici Quraşdırma Sehirbazı"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Bu sehirbaz şəbəkəniz üçün NFS Vericisini quraşdırmaqda sizə yardım edəcək."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS Vericisi"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Qovluq:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "İcazə İdarəsi"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "İcazə idarəsi"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Ehtiyaclarınıza cavab verən səviyyəni seçin. Əgər bilmirsinizsə, Yerli "
@@ -1246,7 +1237,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Sehirbaz NFS Vericinizi müvəffəqiyyətlə quraşdırdı"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1255,28 +1246,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Nis vericisi + Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "ANis Alıcısı"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Nis vericisi + Autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1294,20 +1281,21 @@ msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Sadəcə olaraq nisdomain və nisdomain bildirməlisiniz"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
-msgstr "NFS Vericisi"
+msgid "NIS server:"
+msgstr "NFS vericisi"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
 #, fuzzy
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Nis Domeni:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1325,12 +1313,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS vericisi"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1352,23 +1334,6 @@ msgstr "Sehirbaz Samba vericinizi müvəffəqiyyətlə quraşdırdı."
 msgid "NIS directory:"
 msgstr "İstifadəçi cərgəsi: "
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Şəbəkə Faylı:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-#, fuzzy
-msgid "NFS exports:"
-msgstr "Nfs ixracları:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Avtomatik əsas:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Avtomatik ev:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1381,7 +1346,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1415,12 +1380,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Sisteminiz Nis Alıcısı olaraq quraşdırılır ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1508,7 +1473,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "İnternet qovşaq dları \"qovşaq.domen.domennövü\" formasında olmalıdır. Misal "
@@ -1561,15 +1526,6 @@ msgstr ""
 "Bu sehirbaz İnternet Poçt xidmətinizi quraşdırmaq üçün aşağıdakı "
 "parametrləri topladı:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1706,6 +1662,20 @@ msgid "Disk space (MB):"
 msgstr "Disk sahəsi (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "İcazə İdarəsi"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Ehtiyaclarınıza cavab verən səviyyəni seçin. Əgər bilmirsinizsə, Yerli "
+"Şəbəkə səviyyəsi çox vaxt ən uyğunu olur. Diqqət edin ki, Hamısı səviyyəsi "
+"e'tibarlı olmaya bilər."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1773,6 +1743,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "Sehirbaz vəkilinizi quraşdırmaq üçün aşağıdakı parametrləri topladı:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Qapı:"
@@ -2144,16 +2123,17 @@ msgstr "Samba sehirbazı"
 msgid "%s does not exist."
 msgstr "%s mövcud deyil."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Hamısı - İcazə məhdudlaşdırılması olmayacaq"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 "Mənim qaydalarım - İcazə verilən və rədd edilən qovşaqları məndən soruş"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba Quraşdırma Sehirbazı"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2162,6 +2142,10 @@ msgstr ""
 "vericisi olaraq istifadə edilməsinə imkan yaradır."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba Quraşdırma Sehirbazı"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2184,7 +2168,7 @@ msgid "The Workgroup is wrong"
 msgstr "İş qrupu səhvdir"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Verici Banneri."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2199,13 +2183,9 @@ msgid "Banner:"
 msgstr "Banner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Verici Banneri hökmsüzdür"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "İcazə idarəsi"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "İcazə səviyyəsi:"
@@ -2213,7 +2193,7 @@ msgstr "İcazə səviyyəsi:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Nümunə 1: 150.203.*.* dakı bütün IP'lərə biri xaricində icazə ver\\nhosts "
@@ -2260,7 +2240,7 @@ msgid "Deny hosts:"
 msgstr "Rədd edilən qovşaqlar:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Samba Xidmətlərini Fəallaşdır"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2278,7 +2258,7 @@ msgid "Enable file sharing area"
 msgstr "Fayl bölüşmə sahəsini fəallaşdır"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Verici Çapçı Bölüşməsini Fəallaşdır"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2319,7 +2299,7 @@ msgstr ""
 "@users, @wheel."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "oxuma siyahısı:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2327,7 +2307,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "yazma siyahısı:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2348,15 +2328,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Sehirbaz Samba'nı quraşdırmaq üçün aşağıdakı parametrləri topladı."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Verici Banneri:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Fayl Bölüşməsi:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Çap Vericisi:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2418,15 +2398,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Siyahıdan birinci və ikinci vericini seçin."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Zaman Vericiləri"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Birinci Zaman Vericisi:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "İkinci Zaman Vericisi:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2499,16 +2479,16 @@ msgid "Web wizard"
 msgstr "Veb sehirbazı"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Bu sehirbaz şəbəkəniz üçün Veb Vericisini quraşdırmaqda sizə yardım edəcək."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Veb Vericisi Quraşdırma Sehirbazı"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Veb Vericinizi fəallaşdırmaq istəmirsəniz heç bir qutunu işarələməyin."
 
 #: ../web_wizard/Apache.pm:77
@@ -2516,23 +2496,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Fəallaşdırmaq istədiyiniz Veb xidməti növünü seçin:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Veb Vericisi"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Vericiniz, həm yerli şəbəkəniz (intranet) həm də internet üçün veb vericisi "
 "olaraq vəzifə görə bilər."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "İntranet üçün Veb Vericisini Fəallaşdır"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "İnternet üçün Veb Vericisini Fəallaşdır"
 
 #: ../web_wizard/Apache.pm:90
@@ -2578,18 +2558,18 @@ msgstr "istifadəçi http alt-cərgəsi : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Sənəd kök cərgəsi olmasını istədiyiniz cərgənin cığırını daxil edin."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Sənədlərin Kök Cərgəsi:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Sənədlərin kök cərgəsi:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Veb Vericisi Quraşdırılır"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Sehirbaz Veb Vericinizi quraşdırmaq üçün aşağıdakı parametrləri topladı"
 
@@ -2601,16 +2581,12 @@ msgstr "İntranet veb vericisi:"
 msgid "Internet web server:"
 msgstr "İnternet veb vericisi:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Sənədlərin kök cərgəsi:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "İstifadəçi cərgəsi: "
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Sehirbaz İntranet/İnternet Veb Vericinizi müvəffəqiyyətlə quraşdırdı"
 
 #: ../web_wizard/Apache.pm:236
@@ -2622,6 +2598,50 @@ msgstr "Apache vericisi"
 msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz Nis+Autofs(nfs) vericisi olaraq quraşdırılır ..."
 
+#~ 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ı."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP Vericisi"
+
+#~ msgid "News Server"
+#~ msgstr "Xəbərlər Vericisi"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS Vericisi"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Nis vericisi + Autofs"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS Vericisi"
+
+#~ msgid "Network File:"
+#~ msgstr "Şəbəkə Faylı:"
+
+#, fuzzy
+#~ msgid "NFS exports:"
+#~ msgstr "Nfs ixracları:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Avtomatik əsas:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Avtomatik ev:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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."
+
+#~ msgid "Document Root:"
+#~ msgstr "Sənədlərin Kök Cərgəsi:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "İnternet Poçtu Quraşdırılır"
 
diff --git a/po/bg.po b/po/bg.po
index cb546e8f..e7d3ae26 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -41,7 +41,7 @@ msgstr ""
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -193,7 +193,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Този помощник ще ви помогне да настроите DHCP услугите на сървъра ви."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -212,16 +215,16 @@ msgstr ""
 "настройките както са си."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Най-малък IP адрес:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Най-голям IP адрес:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Най-малък IP адрес:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -248,7 +251,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP-то на сървъра не трябва да бъде в обхвата"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Настройване на DHCP сървъра"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -284,7 +287,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Помощникът успешно настрои DHCP услугите на сървъра ви."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -564,12 +568,12 @@ msgstr "NFS сървър"
 msgid "DNS server"
 msgstr "NFS сървър"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "Новинарски сървър"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 #, fuzzy
 msgid "NFS server"
 msgstr "NFS сървър"
@@ -579,8 +583,7 @@ msgstr "NFS сървър"
 msgid "Mail server"
 msgstr "FTP сървър"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP сървър"
 
@@ -645,40 +648,36 @@ msgid "FTP wizard"
 msgstr "FTP помощник"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Помощник за настройка на FTP сървър"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Този помощник ще ви помогне да настроите FTP сървър-а за мрежата ви."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP сървър"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Избор на FTP услугата за активиране:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Сървърът ви може да действа като такъв за вътрешната мрежа (интранет) и "
 "такъв за Интернет."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Отваря FTP сървъра за връзка с локалната мрежа"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Отваря FTP сървъра за връзка с Интернет"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -690,7 +689,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -706,11 +705,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -735,8 +734,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -744,14 +743,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Съжалявам, трябва да бъдете root, за да направите това..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Настройване на FTP сървър"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Помощникът събра следните параметри,необходими за настройка на FTP сървъра "
 "ви : "
@@ -766,11 +765,11 @@ msgstr ""
 "или \"Назад\" за да ги поправите"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Интранет FTP сървър:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Интернет FTP сървър:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -794,7 +793,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Помощникът успешно настрои вашият Интранет/Интернет ftp сървър"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -842,11 +841,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1065,7 +1064,7 @@ msgstr "Добре дошли в помощника за новини "
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Интернет имената трябва да бъдат във вида : \"host.domain.domaintype\" , "
@@ -1073,10 +1072,6 @@ msgstr ""
 "provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Новинарски сървър"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1085,24 +1080,24 @@ msgstr ""
 "мрежата ви; обикновено това име се дава от доставчика"
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Име на новинарския сървър:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "В зависимост от вида на интернет връзката ви,периода на запитване трябва да "
 "бъде между 6 и 24 часа"
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Период на запитване"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1111,7 +1106,7 @@ msgstr ""
 "запитвания"
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Период на запитване (в часове):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1129,31 +1124,30 @@ msgstr "Настройка на интернет новини"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Помощникът събра следните параметри,необходими за настройката на вашия "
 "сървър за интернет новини:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Натиснете \"Нататък\",за да приемете тези настройки и да настроите сървъра,"
 "или \"Назад\" за да ги поправите"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Новинарски сървър:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Интервал на запитване:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1164,7 +1158,6 @@ msgid "NFS Wizard"
 msgstr "NFS помощник"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Всички - няма ограничение на достъпа"
 
@@ -1177,25 +1170,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Помощник за настройка на NFS сървър"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Този помощник ще ви помогне настроите NFS сървъра на мрежата ви."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS сървър"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Директория:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Контрол на достъпа"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr ""
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Изберете нивото,което отговаря на нуждите ви.Ако не знаете кое е то,тогава "
@@ -1244,7 +1234,7 @@ msgid "Netmask :"
 msgstr "Маска :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Помощникът успешно настрои вашият NFS сървър."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1253,28 +1243,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Новинарски сървър"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "IP адрес на клиента:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Новинарски сървър"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1290,19 +1276,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS сървър"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1320,12 +1307,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS сървър"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr ""
@@ -1345,22 +1326,6 @@ msgstr "Помощникът успешно настрои защитната с
 msgid "NIS directory:"
 msgstr "Потребителска директория:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
@@ -1372,7 +1337,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1406,12 +1371,12 @@ msgstr "Настройване на DNS сървъра"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Новинарски сървър"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Настройване на DNS сървъра"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1495,7 +1460,7 @@ msgstr ""
 #, fuzzy
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Интернет имената трябва да бъдат във вида : \"host.domain.domaintype\" , "
@@ -1546,15 +1511,6 @@ msgstr ""
 "Помощникът откри следните настройки,необходими за настройката на DNS "
 "услугата ви :"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Натиснете \"Нататък\",за да приемете тези настройки и да настроите сървъра,"
-"или \"Назад\" за да ги поправите"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1683,6 +1639,20 @@ msgid "Disk space (MB):"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Контрол на достъпа"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Изберете нивото,което отговаря на нуждите ви.Ако не знаете кое е то,тогава "
+"ниво \"Локална мрежа\" обикновено е най-подходящо. Внимание, нивото \"Всички"
+"\" може да не бъде сигурно."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 
@@ -1737,6 +1707,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Натиснете \"Нататък\",за да приемете тези настройки и да настроите сървъра,"
+"или \"Назад\" за да ги поправите"
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Порт:"
@@ -2103,12 +2082,13 @@ msgstr "MySQL помощник"
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr ""
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Всички - няма ограничение на достъпа"
 
-#: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
+#: ../samba_wizard/Samba.pm:66
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
@@ -2118,6 +2098,10 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2140,7 +2124,7 @@ msgid "The Workgroup is wrong"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
@@ -2154,11 +2138,7 @@ msgid "Banner:"
 msgstr "Банер:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
-msgstr ""
-
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
+msgid "The server banner is incorrect"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:114
@@ -2167,7 +2147,7 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2204,7 +2184,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
@@ -2219,7 +2199,7 @@ msgid "Enable file sharing area"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:142
@@ -2253,7 +2233,7 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2261,7 +2241,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:182
@@ -2283,16 +2263,16 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Помощникът научи следните параметри:"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:219
 #, fuzzy
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "FTP сървър"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2349,15 +2329,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Вторичен времеви сървър:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2425,15 +2405,15 @@ msgid "Web wizard"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Този помощник ще ви помогне да настроите Web сървъра си."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
@@ -2441,21 +2421,21 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:90
@@ -2489,18 +2469,18 @@ msgstr ""
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:137
@@ -2511,16 +2491,12 @@ msgstr ""
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr ""
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Потребителска директория:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:236
@@ -2533,6 +2509,34 @@ msgstr "Новинарски сървър"
 msgid "Configuring your system as Apache server ..."
 msgstr "Настройване на DNS сървъра"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Помощникът успешно настрои DHCP услугите на сървъра ви."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP сървър"
+
+#~ msgid "News Server"
+#~ msgstr "Новинарски сървър"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS сървър"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Новинарски сървър"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS сървър"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Натиснете \"Нататък\",за да приемете тези настройки и да настроите "
+#~ "сървъра,или \"Назад\" за да ги поправите"
+
 #, fuzzy
 #~ msgid ""
 #~ "This wizard will provide a pxe service, and ability to add/remove/modify "
diff --git a/po/bs.po b/po/bs.po
index 20839d74..774b009b 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -44,7 +44,7 @@ msgstr "Greška."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -201,7 +201,10 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -220,16 +223,16 @@ msgstr ""
 "predložene vrijednosti."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Najmanja IP adresa:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Najveća IP adresa:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -256,7 +259,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP servera se ne smije nalaziti u opsegu"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Podešavanje DHCP servera"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -292,7 +295,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Čarobnjak je uspješno podesio DHCP servis na ovom serveru."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -577,12 +581,12 @@ msgstr "NFS server"
 msgid "DNS server"
 msgstr "NFS server"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "News server"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 #, fuzzy
 msgid "NFS server"
 msgstr "NFS server"
@@ -592,8 +596,7 @@ msgstr "NFS server"
 msgid "Mail server"
 msgstr "Ime mail servera:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP server"
 
@@ -659,40 +662,36 @@ msgid "FTP wizard"
 msgstr "FTP čarobnjak"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Čarobnjak za podešavanje FTP servera"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "FTP server"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Uključi FTP server za Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Uključi FTP server za Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -704,7 +703,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -720,11 +719,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -751,8 +750,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -760,14 +759,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Žalim, morate biti root da uradite ovo..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Podešavanje FTP servera"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje FTP "
 "servera"
@@ -782,11 +781,11 @@ msgstr ""
 "koristite dugme Nazad da ih ispravite."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -810,7 +809,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet FTP server"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -858,11 +857,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1086,7 +1085,7 @@ msgstr "Dobro došli u News čarobnjak"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internet imena računara moraju biti oblika \"računar.domen.tipdomene\"; na "
@@ -1094,10 +1093,6 @@ msgstr ""
 "obično \"news.provajder.ba\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "News server"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1106,24 +1101,24 @@ msgstr ""
 "obično dobivate od vašeg provajdera."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Ime news servera:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Ovisno o tipu internet veze koju imate, odgovarajući polling period može "
 "varirati između 6 i 24 sata."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Polling period"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1132,7 +1127,7 @@ msgstr ""
 "kontakta."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Polling period (sati):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1150,31 +1145,30 @@ msgstr "Podešavanje Internet news-a"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Internet news servisa:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Da prihvatite ove vrijednosti i podesite server, kliknite na dugme Dalje ili "
 "koristite dugme Nazad da ih ispravite."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "News server:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Polling interval:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Čarobnjak je uspješno podesio Internet news servis na ovom serveru."
@@ -1184,7 +1178,6 @@ msgid "NFS Wizard"
 msgstr "NFS čarobnjak"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Sve - Bez ograničenja pristupa"
 
@@ -1197,25 +1190,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Čarobnjak za podešavanje NFS servera"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite NFS server za vašu mrežu."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS server"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Direktorij:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Kontrola pristupa"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Izaberite nivo koji odgovara vašim potrebama. Ako ne znate, nivo Lokalna "
@@ -1263,7 +1253,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Čarobnjak je uspješno podesio NFS server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1272,28 +1262,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "News server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "IP klijenta:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "News server"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1309,19 +1295,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1339,12 +1326,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS server"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1366,23 +1347,6 @@ msgstr "Čarobnjak je uspješno podesio Samba server."
 msgid "NIS directory:"
 msgstr "Korisnički direktorij:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Mrežni uređaj"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1395,7 +1359,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1430,12 +1394,12 @@ msgstr "Podešavanje DNS servera"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "News server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Podešavanje DNS servera"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1523,7 +1487,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internet imena računara moraju biti oblika \"računar.domen.tipdomene\"; na "
@@ -1576,15 +1540,6 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Internet mail servisa:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Da prihvatite ove vrijednosti i podesite server, kliknite na dugme Dalje ili "
-"koristite dugme Nazad da ih ispravite."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1723,6 +1678,19 @@ msgid "Disk space (MB):"
 msgstr "Disk prostor (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Kontrola pristupa"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Izaberite nivo koji odgovara vašim potrebama. Ako ne znate, nivo Lokalna "
+"mreža je obično najpogodniji. Pazite da nivo Sve možda nije dovoljno siguran."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Proxy može biti podešen da koristi različite nivoe kontrole pristupa."
@@ -1791,6 +1759,15 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "proxy-ja:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Da prihvatite ove vrijednosti i podesite server, kliknite na dugme Dalje ili "
+"koristite dugme Nazad da ih ispravite."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2156,15 +2133,16 @@ msgstr "Samba čarobnjak"
 msgid "%s does not exist."
 msgstr "%s ne postoji."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Sve - Bez ograničenja pristupa"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moja pravila - Pitaj me za dozvoljene i zabranjene računare"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Čarobnjak za podešavanje Sambe"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2173,6 +2151,10 @@ msgstr ""
 "stanice na kojima se koriste ne-Linux sistemi."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Čarobnjak za podešavanje Sambe"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite Samba servis na ovom serveru."
@@ -2194,7 +2176,7 @@ msgid "The Workgroup is wrong"
 msgstr "Radna grupa je pogrešna"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Server Banner."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2210,13 +2192,9 @@ msgid "Banner:"
 msgstr "Banner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Server Banner je neispravan"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Kontrola pristupa"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Nivo pristupa :"
@@ -2224,7 +2202,7 @@ msgstr "Nivo pristupa :"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Primjer 1: dozvoli sve IPove u 150.203.*.*; osim jednog\\nhosts allow = "
@@ -2272,7 +2250,7 @@ msgid "Deny hosts:"
 msgstr "Odbij računare:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Uključeni Samba servisi"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2290,7 +2268,7 @@ msgid "Enable file sharing area"
 msgstr "Uključi oblast za dijeljenje"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Uključi dijeljenje štampača"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2329,7 +2307,7 @@ msgstr ""
 "\\'@\\') ovako: \\nroot, korisnik, @users, @wheel za svaku vrstu dozvole."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "read list:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2337,7 +2315,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "write list:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2360,15 +2338,15 @@ msgstr ""
 "Sambe."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Server banner:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Dijeljenje datoteka:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Print server:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2427,15 +2405,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Izaberite primarni i sekundarni server sa liste."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Time serveri"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primarni time server:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekundarni Time server:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2512,15 +2490,15 @@ msgid "Web wizard"
 msgstr "Web čarobnjak"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Ovaj čarobnjak će vam pomoći da podesite Web server za vašu mrežu."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Čarobnjak za podešavanje Web servera"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Nemojte izabrati nijednu opciju ako ne želite pokrenuti Web server."
 
 #: ../web_wizard/Apache.pm:77
@@ -2528,23 +2506,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Izaberite vrstu Web servisa koji želite aktivirati:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web server"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Vaš server može raditi kao Web server prema vašoj internoj mreži (intranet) "
 "ili kao Web server za Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Uključi Web server za Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Uključi Web server za Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2589,18 +2567,18 @@ msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Unesite put do direktorija kojeg želite da budete korijen za dokumente."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Korijen dokumenata:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Podešavanje Web servera"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje Web "
 "servera"
@@ -2613,16 +2591,12 @@ msgstr "Intranet web server:"
 msgid "Internet web server:"
 msgstr "Internet web server:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Korijen dokumenata:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Korisnički direktorij:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet Web server."
 
 #: ../web_wizard/Apache.pm:236
@@ -2635,6 +2609,41 @@ msgstr "Intranet web server:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje DNS servera"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Čarobnjak je uspješno podesio DHCP servis na ovom serveru."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP server"
+
+#~ msgid "News Server"
+#~ msgstr "News server"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS server"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "News server"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS server"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Mrežni uređaj"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Da prihvatite ove vrijednosti i podesite server, kliknite na dugme Dalje "
+#~ "ili koristite dugme Nazad da ih ispravite."
+
+#~ msgid "Document Root:"
+#~ msgstr "Korijen dokumenata:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Podešavanje Internet Mail-a"
 
diff --git a/po/ca.po b/po/ca.po
index 7ca3d49a..3925b6f0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-26 12:24+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-25 20:50+0100\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -42,7 +42,7 @@ msgstr "Error."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -194,9 +194,11 @@ msgstr ""
 "Aquest auxiliar us ajudarà a configurar els serveis DHCP del vostre servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Si vols habilitar el PXE per el teu servidor si us plau marqueu la caixa."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -214,15 +216,15 @@ msgstr ""
 "192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Adreça IP més baixa:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Adreça IP més alta:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Adreça IP de la passarel·la:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -246,7 +248,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "S'està configurant el servidor DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -282,7 +284,8 @@ msgid "Interface:"
 msgstr "Interfície:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "L'auxiliar ha configurat els serveis DHCP del servidor amb èxit."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -558,11 +561,11 @@ msgstr "Servidor DHCP"
 msgid "DNS server"
 msgstr "Servidor DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Servidor de notícies"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Servidor NFS"
 
@@ -570,7 +573,7 @@ msgstr "Servidor NFS"
 msgid "Mail server"
 msgstr "Servidor de correu"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Servidor FTP"
 
@@ -628,40 +631,36 @@ msgid "FTP wizard"
 msgstr "Auxiliar de l'FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Auxiliar de configuració del servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Aquest auxiliar us ajudarà a configurar un servidor FTP per la vostra xarxa."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Habilita el servidor FTP per a la intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Habilita el servidor FTP per a internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 "Correu de l'administrador: adreça de correu de l'administrador de l'FTP."
 
@@ -676,7 +675,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "Permet FXP: permet la transferència de fitxers via un altre FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -692,11 +691,11 @@ msgid "Admin email:"
 msgstr "Correu de l'administrador:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Permet la entrada de root:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -721,8 +720,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 "No s'ha pogut trobar bash a la llista d'intèrprets de comandes! Si us plau "
 "corregiu-ho."
@@ -732,13 +731,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Heu de ser el superusuari per fer això..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "S'està configurant el servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "L'auxiliar ha recollit els següents paràmetes necessaris per configurar el "
 "vostre servidor FTP"
@@ -752,11 +751,11 @@ msgstr ""
 "Següent, o premeu el botó Anterior per corregir-los"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Servidor FTP per a la intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Servidor FTP per a internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -780,7 +779,7 @@ msgid "Allow FXP"
 msgstr "Permet FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "L'auxiliar ha configurat el servidor FTP per a Intranet/Internet amb èxit"
 
@@ -835,11 +834,11 @@ msgstr ""
 "d'instal·lació Mandrake complet"
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "El directori destí ja està en us, si us plau escolliu-ne un altre."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 "El vostre servidor d'instal·lació és configurarà amb aquests paràmetres"
 
@@ -1047,7 +1046,7 @@ msgstr "Benvingut a l'auxiliar per a les notícies"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Els noms de màquina d'Internet han de tenir la forma \"màquina.domini."
@@ -1055,10 +1054,6 @@ msgstr ""
 "servidor de notícies generalment serà \"news.proveïdor.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Servidor de notícies"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1068,24 +1063,24 @@ msgstr ""
 "vostre proveïdor."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nom del servidor de notícies:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Segons el tipus de connexió a internet que tingueu, un temps de sondeig "
 "adequat pot trobar-se entre 6 i 24 hores."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Període de sondeig"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1094,7 +1089,7 @@ msgstr ""
 "temps entre dos sondejos consecutius."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Període de sondeig (en hores):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1111,31 +1106,29 @@ msgstr "S'estan configurant les notícies d'Internet"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 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 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"Per acceptar aquests valors i configurar el servidor feu clic al botó "
+"Per acceptar aquests valors i configurar el vostre servidor feu clic al botó "
 "Següent, o premeu el botó Anterior per corregir-los."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Servidor de notícies:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Interval de sondeig:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1147,7 +1140,6 @@ msgid "NFS Wizard"
 msgstr "Auxiliar de l'NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Tot: sense restriccions d'accés"
 
@@ -1160,27 +1152,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Auxiliar de configuració del servidor NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Aquest auxiliar us ajudarà a configurar el servidor NFS per a la vostra "
 "xarxa."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Servidor NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Directori:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Control d'accés"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Trieu el nivell que s'adapti als vostres requeriments. Si no ho sabeu, el "
@@ -1229,7 +1218,7 @@ msgid "Netmask :"
 msgstr "Màscara de xarxa:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "L'auxiliar ha configurat el servidor NFS amb èxit"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1240,25 +1229,22 @@ msgstr ""
 "Heu de reajustar el vostre nom domini NIS. Un servidor NIS necessita un nom "
 "de domini correcte diferent de localdomain o cap."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1274,18 +1260,19 @@ msgstr "Configura el teu ordinador per a ser un client NIS"
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Servidor NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Domini NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1305,11 +1292,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr "Servidor NIS: el nom del vostre ordinador."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Servidor NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Inici NIS:"
@@ -1327,22 +1309,6 @@ msgstr ""
 msgid "NIS directory:"
 msgstr "Directori NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nom de domini NIS: nom del domini NIS."
@@ -1354,7 +1320,7 @@ msgstr "Servidor NIS: nom de màquina del servidor NIS."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1385,11 +1351,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "S'està configurant el vostre sistema com a client NIS..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1477,7 +1443,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Els noms de màquina d'Internet han de tenir la forma \"màquina.domini."
@@ -1526,14 +1492,6 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetres següents necessaris per configurar el "
 "servei de correu extern:"
 
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Per acceptar aquests valors i configurar el vostre servidor feu clic al botó "
-"Següent, o premeu el botó Anterior per corregir-los."
-
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
 msgstr "Format de l'adreça"
@@ -1668,6 +1626,20 @@ msgid "Disk space (MB):"
 msgstr "Espai de disc (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Control d'accés"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Trieu el nivell que s'adapti als vostres requeriments. Si no ho sabeu, el "
+"nivell de xarxa local és generalment el més adequat. Teniu en compte que el "
+"nivell Tot pot no ser segur."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "El servidor intermediari pot configurar-se per usar diferents nivells de "
@@ -1737,6 +1709,15 @@ msgstr ""
 "L'auxiliar ha recollit els paràmetres següents necessaris per configurar el "
 "servidor intermediari:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Per acceptar aquests valors i configurar el servidor feu clic al botó "
+"Següent, o premeu el botó Anterior per corregir-los."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2101,15 +2082,16 @@ msgstr "Auxiliar del Samba"
 msgid "%s does not exist."
 msgstr "%s no existeix."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Tot: sense restriccions d'accés"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Les meves regles - Pregunta'm els ordinadors permesos i denegats"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Auxiliar de configuració de Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2118,6 +2100,10 @@ msgstr ""
 "d'impressió per a estacions de treball que no funcionen sobre sistemes Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Auxiliar de configuració de Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2140,7 +2126,7 @@ msgid "The Workgroup is wrong"
 msgstr "El grup de treball és erroni"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Descriptor del servidor."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2156,20 +2142,16 @@ msgid "Banner:"
 msgstr "Descriptor:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "El descriptor del servidor no és correcte"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Control d'accés"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Nivell d'accés:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Exemple 1: permet totes les IP a 150.203.*.*; excepte un\n"
@@ -2216,7 +2198,7 @@ msgid "Deny hosts:"
 msgstr "Ordinadors denegats:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Serveis Samba habilitats"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2234,7 +2216,7 @@ msgid "Enable file sharing area"
 msgstr "Habilita la zona de compartició de fitxers"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Habilita el servidor d'impressió compartida"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2273,7 +2255,7 @@ msgstr ""
 "root, fred, @users, @wheel per cada tipus de permís."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "llista de lectura:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2281,7 +2263,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "llista d'escriptura:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2302,15 +2284,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "L'auxiliar ha recollit els següents paràmetres per configurar Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Descriptor del servidor:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Compartició de fitxers:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Servidor d'impressió:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2371,15 +2353,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Seleccioneu un servidor primari i un de secundari de la llista."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Servidors horaris"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Servidor horari primari:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Servidor horari secundari:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2453,17 +2435,17 @@ msgid "Web wizard"
 msgstr "Auxiliar de Web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Aquest auxiliar us ajudarà a configurar el servidor Web per a la vostra "
 "xarxa."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Auxiliar de configuració del servidor Web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "No marqueu cap opció si no voleu activar el servidor Web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2471,23 +2453,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Selecciona el tipus de servei Web que voleu activar:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Servidor Web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "El servidor pot fer de servidor Web per a la xarxa interna (intranet) i per "
 "a Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Habilita el servidor Web per a la Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Habilita el servidor Web per a internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2530,18 +2512,18 @@ msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Escriviu la ruta del directori que voleu que sigui l'arrel dels documents."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Arrel de documents:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Arrel dels documents:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "S'està configurant el servidor Web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "L'auxiliar ha recollit els paràmetres següents necessaris per configurar el "
 "servidor Web"
@@ -2554,16 +2536,12 @@ msgstr "Servidor Web per intranet:"
 msgid "Internet web server:"
 msgstr "Servidor Web per internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Arrel dels documents:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Directori d'usuari:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "L'auxiliar ha configurat el servidor Web per a Intranet/Internet amb èxit"
 
@@ -2575,6 +2553,35 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "S'està configurant el vostre sistema con servidor Apache ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Si vols habilitar el PXE per el teu servidor si us plau marqueu la caixa."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "L'auxiliar ha configurat els serveis DHCP del servidor amb èxit."
+
+#~ msgid "FTP Server"
+#~ msgstr "Servidor FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Servidor de notícies"
+
+#~ msgid "NFS Server"
+#~ msgstr "Servidor NFS"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Servidor NIS:"
+
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Per acceptar aquests valors i configurar el vostre servidor feu clic al "
+#~ "botó Següent, o premeu el botó Anterior per corregir-los."
+
+#~ msgid "Document Root:"
+#~ msgstr "Arrel de documents:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "S'està configurant el correu d'Internet"
 
diff --git a/po/cs.po b/po/cs.po
index bade11f2..877f85bd 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-24 23:20+0100\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Chyba."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -204,9 +204,11 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Pokud chcete povolit PXE pro váš DHCP server, zaškrtněte prosím políčko."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -223,15 +225,15 @@ msgstr ""
 "nabízené hodnoty (tedy 192.168.100.20 192.168.100.40)."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Nejnižší IP adresa:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Nejvyšší IP adresa:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP adresa brány:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -255,7 +257,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP adresa serveru musí být mimo rozsah."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Nastavuji server DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -291,7 +293,8 @@ msgid "Interface:"
 msgstr "Rozhraní:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Průvodce úspěšně nastavil služby DHCP na vašem serveru."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -578,11 +581,11 @@ msgstr "DHCP server"
 msgid "DNS server"
 msgstr "DNS server"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Server diskusních skupin"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS server"
 
@@ -590,7 +593,7 @@ msgstr "NFS server"
 msgid "Mail server"
 msgstr "Poštovní server"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP server"
 
@@ -648,39 +651,35 @@ msgid "FTP wizard"
 msgstr "Průvodce pro FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Průvodce nastavením FTP serveru"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Tento průvodce vám pomůže nastavit FTP server pro vaši síť."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP server"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Povolit FTP server pro Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Povolit FTP server pro Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Email správce: emailová adresa administrátora FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -694,7 +693,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "Povolit FXP: povolit přenos souboru skrz jiný FTP server."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Chroot na domov uživatele: uživatelé uvidí pouze svůj domovský adresář."
 
@@ -712,11 +711,11 @@ msgid "Admin email:"
 msgstr "Email správce:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Povolit přihlášení roota:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot na domov uživatele:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -741,8 +740,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 "Nelze nalézt bash na seznamu shellů! Zdá se, že došlo k ručním úpravám! "
 "Opravte to prosím."
@@ -752,13 +751,13 @@ 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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Nastavuji FTP server"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení vašeho FTP "
 "serveru"
@@ -772,11 +771,11 @@ msgstr ""
 "Další nebo použijte tlačítko Zpět a opravte je"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "FTP server pro Intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "FTP server pro Internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -800,7 +799,7 @@ msgid "Allow FXP"
 msgstr "Povolit FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Tento průvodce úspěšně nastavil váš FTP server pro Internet/Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -852,11 +851,11 @@ msgstr ""
 "Chyba, zdrojový adresář musí být adresář obsahující plnou instalaci Mandrake."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Cílový adresář se již používá, vyberte prosím jiný."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Váš instalační server bude nastaven s následujícími parametry"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1076,7 +1075,7 @@ msgstr "Vítejte v Průvodci pro nastavení diskusních skupin"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Názvy počítačů pro Internet musí být ve tvaru \"pocitac.domena.typdomeny\"; "
@@ -1084,10 +1083,6 @@ msgstr ""
 "obvykle název jeho serveru diskusních skupin \"news.poskytovatel.cz\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Server diskusních skupin"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1097,24 +1092,24 @@ msgstr ""
 "váš poskytovatel připojení na Internet."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Server diskusních skupin:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "V závislosti na typu připojení na síť Internet, kterým disponujete, se může "
 "interval aktualizace pohybovat mezi 6 až 24 hodinami."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Interval aktualizace"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1123,7 +1118,7 @@ msgstr ""
 "mezi dvěma po sobě jdoucími dotazy."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Interval aktualizace (hodiny):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1140,31 +1135,30 @@ msgstr "Nastavuji diskusní skupiny"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Průvodce shromáždil následující parametry potřebné\n"
 "pro nastavení služby pro diskusní skupiny z Internetu:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
+"Další nebo použijte tlačítko Zpět a opravte je"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Server diskusních skupin:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Interval aktualizace:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Průvodce úspěšně nastavil službu diskusních skupin na vašem serveru."
@@ -1174,7 +1168,6 @@ msgid "NFS Wizard"
 msgstr "Průvodce pro NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Všichni - bez omezení přístupu"
 
@@ -1187,25 +1180,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Průvodce nastavením serveru NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Tento průvodce vám pomůže nastavit server NFS pro vaši síť."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS server"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Adresář:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Kontrola přístupu"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Vyberte úroveň, která vyhovuje vašim potřebám. Pokud si nejste jisti, je pro "
@@ -1254,7 +1244,7 @@ msgid "Netmask :"
 msgstr "Síťová maska:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Průvodce úspěšně nastavil váš server NFS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1265,25 +1255,22 @@ msgstr ""
 "Musíte znovu upravit váš název domény NIS. Pro NIS server potřebujete "
 "správný název domény NIS, neprázdný a jiný než localdomain."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
-msgstr "NIS Server s mapu autofs"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
+msgstr "NIS server s mapou autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "NIS server s mapou autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Nastavení NIS serveru s mapou autofs, soubory auto.home a auto.master."
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Klienti mohou po přihlášení do klientské NIS sítě automaticky připojit své "
@@ -1301,18 +1288,19 @@ msgstr "Nastavit počítač jako NIS klienta"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Musíte pouze zadat NIS doménu a NIS server."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS server:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS doména:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 "NIS server je užitečný pro vytváření uživatelů a databáze počítačů. Průvodce "
@@ -1335,11 +1323,6 @@ msgstr "NIS doména: použitá NIS doména (obvykle stejná jako doména DNS)."
 msgid "NIS server: name of your computer."
 msgstr "NIS server: název vašeho počítače."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS server:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Domov NIS:"
@@ -1357,22 +1340,6 @@ msgstr "Průvodce nastaví váš NIS server s mapou autofs"
 msgid "NIS directory:"
 msgstr "Adresář NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Síťový soubor:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "Exporty NFS:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto domov:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "Název domény NIS: název vaší domény pro NIS."
@@ -1384,7 +1351,7 @@ msgstr "NIS server: název počítače NIS serveru."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 "Démon YPBIND hledá pro NIS domény servery a udržuje informace potřebné ke "
 "spojení pomocí NIS."
@@ -1416,11 +1383,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Nastavuji váš systém jako NIS server s mapou Autofs..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS s mapou autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Nastavuji váš systém jako klienta NIS..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1512,7 +1479,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Názvy počítačů pro Internet musí být ve tvaru \"pocitac.domena.typdomeny\"; "
@@ -1568,15 +1535,6 @@ 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:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1714,6 +1672,20 @@ msgid "Disk space (MB):"
 msgstr "Prostor na disku (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Kontrola přístupu"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Vyberte úroveň, která vyhovuje vašim potřebám. Pokud si nejste jisti, je pro "
+"vás obvykle nejvhodnější úroveň Lokální síť. Vezměte prosím na vědomí, že "
+"úroveň Všichni nemusí být bezpečná."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Proxy server lze nastavit tak, že bude používat různé úrovně přístupu"
 
@@ -1781,6 +1753,15 @@ msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení vašeho "
 "proxy serveru:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2185,15 +2166,16 @@ msgstr "Průvodce pro server Samba"
 msgid "%s does not exist."
 msgstr "%s neexistuje."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Všichni - bez omezení přístupu"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moje pravidla - Ptát se na povolené a zakázané počítače"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Průvodce nastavením serveru Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2203,6 +2185,10 @@ msgstr ""
 "Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Průvodce nastavením serveru Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2226,7 +2212,7 @@ msgid "The Workgroup is wrong"
 msgstr "Název pracovní skupiny je špatně"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Titulek serveru."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2242,20 +2228,16 @@ msgid "Banner:"
 msgstr "Titulek:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Titulek serveru je špatně"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Kontrola přístupu"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Úroveň přístupu:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Příklad 1: povolení všech IP adres na 150.203.*.*; kromě jedné\n"
@@ -2304,7 +2286,7 @@ msgid "Deny hosts:"
 msgstr "Zakázat počítače:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Povolit služby serveru Samba"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2322,7 +2304,7 @@ msgid "Enable file sharing area"
 msgstr "Povolit prostor pro sdílení souborů"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Povolit sdílení tiskárny na serveru"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2361,7 +2343,7 @@ msgstr ""
 "root, fred, @users, @wheel pro každý druh oprávnění."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "seznam čtoucích:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2369,7 +2351,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "seznam zapisujících:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2391,15 +2373,15 @@ msgstr ""
 "Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Titulek serveru:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Sdílení souborů:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Tiskový server:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2461,15 +2443,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Vyberte ze seznamu primární a sekundární server."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Časové servery"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primární časový server:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekundární časový server:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2541,15 +2523,15 @@ msgid "Web wizard"
 msgstr "Průvodce pro WWW"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Tento průvodce vám pomůže nastavit webový server pro vaši síť."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Průvodce nastavením webového serveru"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Pokud nechcete aktivovat žádný webový server, nezaškrtávejte žádné políčko."
 
@@ -2558,23 +2540,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Vyberte požadovaný druh webové služby, kterou chcete aktivovat:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Webový server"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Váš server může plnit funkci webového serveru pro vaši interní síť "
 "(Intranet) a webového serveru pro Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Povolit webový server pro Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Povolit webový server pro Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2616,18 +2598,18 @@ msgstr "Uživatelský podadresář HTTP: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Zadejte název adresáře, který chcete mít jako kořenový pro dokumenty."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Kořen dokumentů:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Nastavuji webový server"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Průvodce shromáždil následující parametry potřebné pro nastavení vašeho "
 "webového serveru"
@@ -2640,16 +2622,12 @@ msgstr "Webový server pro Intranet:"
 msgid "Internet web server:"
 msgstr "Webový server pro Internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Kořen dokumentů:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Uživatelský adresář:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Průvodce úspěšně nastavil váš webový server pro Internet/Intranet"
 
 #: ../web_wizard/Apache.pm:236
@@ -2660,6 +2638,51 @@ msgstr "Server Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavuji váš systém jako server Apache..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Pokud chcete povolit PXE pro váš DHCP server, zaškrtněte prosím políčko."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Průvodce úspěšně nastavil služby DHCP na vašem serveru."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP server"
+
+#~ msgid "News Server"
+#~ msgstr "Server diskusních skupin"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS server"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "NIS Server s mapu autofs"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS server:"
+
+#~ msgid "Network File:"
+#~ msgstr "Síťový soubor:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "Exporty NFS:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto domov:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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"
+
+#~ msgid "Document Root:"
+#~ msgstr "Kořen dokumentů:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Nastavuji elektronickou poštu pro síť Internet"
 
diff --git a/po/cy.po b/po/cy.po
index 1e348b31..4fed7362 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
-"PO-Revision-Date: 2004-02-14 20:58-0000\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
+"PO-Revision-Date: 2004-02-26 14:40-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "Gwall."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -68,7 +68,6 @@ msgid "Press next to begin, or Cancel to leave this wizard."
 msgstr "Gwasgwch nesaf i gychwyn, neu Diddymu i adael y dewin."
 
 #: ../client_wizard/Bind_client.pm:55
-#, fuzzy
 msgid ""
 "The server will use the information you enter here to make the name of the "
 "client available to other machines into your network."
@@ -190,8 +189,11 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau DHCP eich gweinydd."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "Os ydych am alluogi PXE ar eich gweinydd dhcp ticiwch y blwch."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -208,15 +210,15 @@ msgstr ""
 "sy'n cael eu cynnig. (hy: 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Cyfeiriad IP Isaf:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Cyfeiriad IP Uchaf"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Cyfeiriad porth IP"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -240,7 +242,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Rhaid i IP y gweinydd beidio â bod o fewn amrediad."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Ffurfweddu'r Gweinydd DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -276,7 +278,8 @@ msgid "Interface:"
 msgstr "Rhyngwyneb:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gweinydd."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -352,18 +355,16 @@ msgid "What do you want to do:"
 msgstr "Beth hoffech ei wneud:"
 
 #: ../dns_wizard/Bind.pm:126
-#, fuzzy
 msgid "(You don't need to add the domain after the name)"
-msgstr "(does dim angen teipio'r parth ar ôl yr enw)"
+msgstr "(Does dim angen teipio'r parth ar ôl yr enw)"
 
 #: ../dns_wizard/Bind.pm:135
 msgid "Choose the host you want to remove in the following list."
 msgstr "Dewis y gwesteiwr i'w dynnu o'r rhestr ganlynol."
 
 #: ../dns_wizard/Bind.pm:135
-#, fuzzy
 msgid "Remove a host in existing DNS configuration."
-msgstr "Tynnu gwesteiwr o'r ffurfweddiad dns presennol."
+msgstr "Tynwch westeiwr o'r ffurfweddiad DNS presennol."
 
 #: ../dns_wizard/Bind.pm:135
 msgid "Remove host:"
@@ -488,9 +489,8 @@ msgstr ""
 "tynnu gwestai."
 
 #: ../dns_wizard/Bind.pm:208
-#, fuzzy
 msgid "Wizard will Now build your DNS slave configuration"
-msgstr "Iawn. Adeiladu eich ffurfweddiad DNS"
+msgstr "Bydd y Dewin yn adeiladu eich ffurfweddiad gwas DNS"
 
 #: ../dns_wizard/Bind.pm:208 ../ldap_wizard/ldap.pm:145
 msgid "with this configuration:"
@@ -539,9 +539,8 @@ msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Mae'r dewin wedi ffurfweddu'r gwasanaethau DNS ar gyfer eich gweinydd."
 
 #: ../dns_wizard/Bind.pm:269
-#, fuzzy
 msgid "Please Relaunch drakwizard, and try to change some parameters."
-msgstr "Ailgychwyn drakwizard, a cheisio newid rhai paramedrau."
+msgstr "Ailgychwynwch drakwizard, a cheisio newid rhai paramedrau."
 
 #: ../dns_wizard/Bind.pm:691
 msgid "Configuring your system as Master DNS server ..."
@@ -563,11 +562,11 @@ msgstr "Gweinydd DHCP"
 msgid "DNS server"
 msgstr "Gweinydd DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Gweinydd newyddion"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Gweinydd NFS"
 
@@ -575,7 +574,7 @@ msgstr "Gweinydd NFS"
 msgid "Mail server"
 msgstr "Gweinydd e-bost"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
@@ -633,18 +632,14 @@ msgid "FTP wizard"
 msgstr "Dewin FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Dewin Ffurfweddu Gweinydd FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-#, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
-"Dewin i'ch cynorthwyo i ffurfweddu'r Gweinydd FTP ar gyfer eich rhwydwaith."
-
-#: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Gweinydd FTP"
+"Bydd y Dewin hwn yn eich cynorthwyo i ffurfweddu'r Gweinydd FTP ar gyfer "
+"eich rhwydwaith."
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
@@ -652,23 +647,22 @@ msgstr "Dewiswch y math o wasanaeth FTP rydych am ei gychwyn:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Mae modd i'ch gweinydd weithredu fel Gweinydd FTP ar gyfer eich rhwydwaith "
 "mewnol (mewnrwyd) neu fel Gweinydd FTP ar gyfer y Rhyngrwyd."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Galluogi'r Gweinydd FTP ar gyfer y Fewnrwyd"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Galluogi'r Gweinydd FTP ar gyfer y Rhyngrwyd"
 
 #: ../ftp_wizard/Proftpd.pm:88
-#, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "E-bost Gweinyddwr: cyfeiriad e-bost gweinyddwr FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -678,13 +672,11 @@ msgstr ""
 "FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
-#, fuzzy
 msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "Caniatáu FXP: caniatáu trosglwyddo ffeil drwy FTP arall."
 
 #: ../ftp_wizard/Proftpd.pm:88
-#, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Defnyddiwr Chroot home: bydd y defnyddiwr yn gweld eu cyfeiriadur cartref, "
 "yn unig."
@@ -704,11 +696,11 @@ msgid "Admin email:"
 msgstr "E-bost gweinyddwr:r"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Caniatáu Mewngofnodi gwraidd"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Defnyddiwr Chroot Home:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -720,10 +712,9 @@ msgid "Allow FXP:"
 msgstr "Caniatáu FXP"
 
 #: ../ftp_wizard/Proftpd.pm:106
-#, fuzzy
 msgid "You are in DHCP, server may not work with your configuration."
 msgstr ""
-"Rydych yn dhcp, efallai na fydd y gweinydd yn gweithio gyda'ch ffurfweddiad."
+"Rydych yn DHCP, efallai na fydd y gweinydd yn gweithio gyda'ch ffurfweddiad."
 
 #: ../ftp_wizard/Proftpd.pm:111
 msgid ""
@@ -734,31 +725,29 @@ msgstr ""
 "allanol."
 
 #: ../ftp_wizard/Proftpd.pm:115
-#, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
-msgstr "Methu canfod bash yn y rhestr cregyn. Cywirwch."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
+msgstr ""
+"Methu canfod bash yn y rhestr cregyn. Rhaid ei newid gyda llaw! Cywirwch."
 
 #: ../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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Ffurfweddu'r Gweinydd FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
-#, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol\n"
-"sydd eu hangen ar gyfer ffurfweddu eich Gweinydd FTP"
+"Mae'r dewin wedi casglu'r paramedrau canlynol ar gyfer ffurfweddu eich "
+"Gweinydd FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
-#, fuzzy
 msgid ""
 "To accept those values, and configure your server, click the next button or "
 "use the back button to correct them"
@@ -767,11 +756,11 @@ msgstr ""
 "Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Gweinydd FTP Mewnrwyd"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Gwasanaeth FTP y Rhyngrwyd:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -795,15 +784,14 @@ msgid "Allow FXP"
 msgstr "Caniatáu FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gweinydd FTP Mewnrwyd/Rhyngrwyd"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
 #: ../pxe_wizard/Pxe.pm:332
-#, fuzzy
 msgid "Please relaunch drakwizard, and try to change some parameters."
-msgstr "Ailgychwyn drakwizard, a cheisio newid rhai paramedrau."
+msgstr "Ailgychwynwch drakwizard, a cheisio newid rhai paramedrau."
 
 #: ../installsrv_wizard/Installsrv.pm:51
 msgid "Configure a MDK install server (via NFS and http)"
@@ -834,16 +822,14 @@ msgstr ""
 "gosodiad Mandrake."
 
 #: ../installsrv_wizard/Installsrv.pm:71
-#, fuzzy
 msgid "The destination directory could not be '/var/install/'"
-msgstr "Cyfeiriadur cyrchfan yn methu bod yn '/var/install/'"
+msgstr "Mae'r cyfeiriadur cyrchfan yn methu bod yn '/var/install/'"
 
 #: ../installsrv_wizard/Installsrv.pm:71
 msgid "ie use: /var/install/mdk-release"
 msgstr "hy, defnyddio: /var/install/mdk-release"
 
 #: ../installsrv_wizard/Installsrv.pm:75
-#, fuzzy
 msgid ""
 "Error, the source directory must be a directory with full Mandrake "
 "installation directory."
@@ -852,12 +838,12 @@ msgstr ""
 "chyfeiriadur gosodiad Mandrake llawn."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-#, fuzzy
-msgid "The Destination directory already in use, please choose another one."
-msgstr "Cyfeiriadur cyrchfan eisoes yn cael ei ddefnyddio, dewiswch un arall."
+msgid "The destination directory already in use, please choose another one."
+msgstr ""
+"Mae'r cyfeiriadur cyrchfan eisoes yn cael ei ddefnyddio, dewiswch un arall."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Bydd eich gweinydd gosod yn cael ei ffurfweddu gyda'r paramedrau hyn."
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -874,6 +860,9 @@ msgid ""
 "a DHCP server with PXE suport, and a PXE server. So it will be very easy to "
 "install Mandrake through network."
 msgstr ""
+"Llongyfarchiadau, mae gweinydd Gosod Mandrake yn awr yn barod. Mae modd "
+"ffurfweddu gweinydd DHCP gyda chynhaliaeth PXE a gweinydd PXE. Felly, bydd "
+"yn hawdd iawn gosod Mandrake drwy rwydwaith."
 
 #: ../installsrv_wizard/Installsrv.pm:143
 msgid "Copying data to destination directory, can take a while...."
@@ -908,7 +897,6 @@ msgid "Add data in LDAP"
 msgstr "Ychwanegu data yn LDAP"
 
 #: ../ldap_wizard/ldap.pm:84
-#, fuzzy
 msgid "uid, gid, home directory, "
 msgstr "Cyfeiriadur cartref uid, guid."
 
@@ -1074,7 +1062,7 @@ msgstr "Croeso i'r Dewin Newyddion"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Rhaid i enw'r gwesteiwyr rhyngrwyd fod ar ffurf  \"gwestai.parth.mathparth"
@@ -1082,10 +1070,6 @@ msgstr ""
 "newyddion rhyngrwyd yw \"newyddion.darparwr.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Gweinydd Newyddion"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1095,24 +1079,24 @@ msgstr ""
 "darparwr."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Enw Gweinydd Newyddion:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Gan ddibynnu ar y math o gysylltiad rhyngrwyd sydd gennych, mae cyfnod galw "
 "priodol yn gallu newid rhwng 6 a 24 awr."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Cyfnod Gofyn"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1121,7 +1105,7 @@ msgstr ""
 "dau ofyniad dilynol."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Cyfnod Gofyn (Oriau):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1138,31 +1122,30 @@ msgstr "Ffurfweddu'r Gweinydd Newyddion:"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 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 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"I dderbyn y gwerth hwn ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
+"I dderbyn y gwerthoedd hyn, ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
 "Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Gweinydd Newyddion"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Cyfnod Gofyn:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1173,7 +1156,6 @@ msgid "NFS Wizard"
 msgstr "Dewin NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Pob - Dim cyfyngiad mynediad"
 
@@ -1186,27 +1168,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Dewin Ffurfweddu Gweinydd NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu eich Gweinydd NFS ar gyfer eich "
 "rhwydwaith."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Gweinydd NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Cyfeiriadur:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Rheoli Mynediad"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Rheoli mynediad"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Dewiswch lefel s'yn addas i'ch anghenion. Os nad ydych yn siwr, lefel y "
@@ -1256,31 +1235,26 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gweinydd NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
-#, fuzzy
 msgid ""
 "You need to readjust your NIS domainname. For a NIS server you need a "
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
-"Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
-"gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect i'w "
-"newid."
+"Mae angen i chi newid eich enw parth NIS. Mae angen enw parth cywir ar gyfer "
+"gweinydd NIS, nid cydradd i barth lleol na dim."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "Gweinydd NIS gyda autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Cleient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Gweinydd NIS gyda autofs map"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Gosod gweinydd Nis gyda autofs map, auto.home a ffeiliau auto.master."
@@ -1288,7 +1262,7 @@ msgstr "Gosod gweinydd Nis gyda autofs map, auto.home a ffeiliau auto.master."
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Mae'r cleient myn gallu gosod eu cyfeiriadur cartref wrth fewngofnodi i "
@@ -1303,27 +1277,26 @@ msgid "Configure computer to be a NIS client"
 msgstr "Ffurfweddu eich cyfrifiadur i fod yn gleient N\t..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:90
-#, fuzzy
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Rhaid gosod nisdomain a nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Gweinydd NIS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Parth NIS::"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be export through NFS server."
@@ -1332,19 +1305,15 @@ msgstr ""
 "yn allforio drwy weinydd NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
 msgid "NIS domain: NIS domain to use (generally same as your DNS domainaname)."
-msgstr "Parth NIS: parth NIC ar gyfer eich gweinydd NIS:  /."
+msgstr ""
+"Parth NIS: parth NIS i'w ddefnyddio (yn gyffredinol yrun un â'ch enwparth "
+"DNS)."
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid "NIS server: name of your computer."
 msgstr "Gweinydd NIS: enw'r cyfrifiadur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Gweinydd NIS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "NIS Cartref:"
@@ -1355,59 +1324,38 @@ msgid "NIS domainname:"
 msgstr "Enw parth NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:108
-#, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
-msgstr "Bydd yn gosod eich gweinydd NIS gyda  autofs map"
+msgstr "Bydd y dewin yn gosod eich gweinydd NIS gyda  autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:113
 msgid "NIS directory:"
 msgstr "Cyfeiriadur NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Ffeil Rhwydwaith"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "Allforion NFS"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Awto Feistr"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Awto cartref"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
-#, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Enw parth NIS: enw parth NIS "
 
 #: ../nisautofs_wizard/Nisautofs.pm:123
-#, fuzzy
 msgid "NIS server: hostname of the NIS server."
 msgstr "Gweinydd NIS: enw parth gweinydd NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
-#, fuzzy
 msgid "Error should be a directory."
 msgstr "Gwall i fod yn gyfeiriadur"
 
 #: ../nisautofs_wizard/Nisautofs.pm:136
-#, fuzzy
 msgid "Error nisdomainame should not be 'none' or 'localdomain'"
-msgstr "Gwall dylai nisdomainame fod yn gywir (nid dim na pharth lleol)"
+msgstr "Gwall dylai nisdomainame fod yn 'dim' neu 'parthlleol'."
 
 #: ../nisautofs_wizard/Nisautofs.pm:136
 msgid "Please adjust it."
-msgstr ""
+msgstr "Newidiwch hwn."
 
 #: ../nisautofs_wizard/Nisautofs.pm:142
 msgid "The wizard successfully configured your machine to be a NIS client."
@@ -1427,11 +1375,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Ffurfweddu eich system fel gweinydd NIS gyda +Autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS gydag autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Ffurfweddu eich system fel Cleient NIS..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1489,7 +1437,7 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:89
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
-msgstr ""
+msgstr "Dylai'r ffuiad fod yn enw parth dilys megis \"fymharth.com\"!"
 
 #: ../postfix_wizard/Postfix.pm:94
 msgid "Masquerade domain name:"
@@ -1522,7 +1470,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Rhaid i enw'r gwesteiwyr rhyngrwyd fod ar ffurf  \"gwesteiwr.parth.mathparth"
@@ -1578,15 +1526,6 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gwasanaeth E-bost Rhyngrwyd:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"I dderbyn y gwerthoedd hyn, ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
-"Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1721,6 +1660,20 @@ msgid "Disk space (MB):"
 msgstr "Lle ar Ddisg (MB)"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Rheoli Mynediad"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Dewiswch lefel s'yn addas i'ch anghenion. Os nad ydych yn siwr, lefel y "
+"Rhwydwaith Lleol sydd fel arfer yn fwyaf addas. Nid yw'r Pob lefel yn gwbl "
+"ddiogel."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Mae modd ffurfweddu'r dirprwy i ddefnyddio lefelau rheoli mynediad gwahanol"
@@ -1787,6 +1740,15 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich dirprwy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"I dderbyn y gwerth hwn ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
+"Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Porth:"
@@ -1812,14 +1774,12 @@ msgid "PXE Wizard"
 msgstr "Dewin PXE"
 
 #: ../pxe_wizard/Pxe.pm:78
-#, fuzzy
 msgid ""
 "You need to readjust your domainname, not equal to localdomain or none. "
 "Please launch drakconnect to adjust it."
 msgstr ""
-"Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
-"gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect i'w "
-"newid."
+"Mae angen i chi newid eich enw parth, nid cydradd i parthlleol na dim. "
+"Cychwynnwch drakconnect i'w newid."
 
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:193
 msgid "Set PXE server"
@@ -1876,20 +1836,19 @@ msgid ""
 "PXE description is used to explain the rule of the boot image, ie: Mandrake "
 "9.2 image, Mandrake cooker image.."
 msgstr ""
+"Mae disgrifiad PXE yn cael ei ddefnyddio i esbonio rheol y delwedd cychwyn, "
+"hy delwedd Mandrake 9.2, delwedd cooker Mandrake..."
 
 #: ../pxe_wizard/Pxe.pm:135
-#, fuzzy
 msgid ""
 "PXE name: the name displayed in PXE menu (please provide a word or a  "
 "number, with no space)"
-msgstr "Enw PXE: enw yn newislen PXE (un gair/rhif, dim bylchau)"
+msgstr ""
+"Enw PXE: enw yn newislen PXE (rhowch un gair neu rif,  gyda dim bylchau)"
 
 #: ../pxe_wizard/Pxe.pm:135
-#, fuzzy
 msgid "Path to image: provide the full path to the network boot image"
-msgstr ""
-"Llwybr i'r ddelwedd: llwybr llawn i'r ddelwedd (angen delwedd cychwyn "
-"rhwydwaith)"
+msgstr "Llwybr i'r ddelwedd: llwybr llawn i'r ddelwedd cychwyn rhwydwaith"
 
 #: ../pxe_wizard/Pxe.pm:135
 msgid ""
@@ -1899,9 +1858,8 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:145
-#, fuzzy
 msgid "Add all.rdz boot image"
-msgstr "Ychwanegu delwedd cychwyn"
+msgstr "Ychwanegu delwedd cychwyn all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:145
 msgid ""
@@ -1909,20 +1867,20 @@ msgid ""
 "boot network computer through a kernel (vmlinuz), and provide one file with "
 "all drivers needed (in our case all.rdz)."
 msgstr ""
+"Am rhesymau technegol, mewn achos o ddelweddau cychwyn niferus, mae'n "
+"symlach cychwyn cyfrifiadur rhwydwaith drwy gnewyllyn (vmlinuz), a darparu "
+"un ffeil gyda'r holl yrrwyr angerheidiol (yn yr achos hwn all.rdz)."
 
 #: ../pxe_wizard/Pxe.pm:145
-#, fuzzy
 msgid ""
 "PXE name: the name displayed in PXE menu (please provide a word or a number, "
 "with no space)"
-msgstr "Enw PXE: enw yn newislen PXE (un gair/rhif, dim bylchau)"
+msgstr ""
+"Enw PXE: enw yn newislen PXE (rhowch un gair neu un rhif, gyda dim bylchau)"
 
 #: ../pxe_wizard/Pxe.pm:145
-#, fuzzy
 msgid "Path to all.rdz: provide the full path to all.rdz image"
-msgstr ""
-"Llwybr i'r ddelwedd: llwybr llawn i'r ddelwedd (angen delwedd cychwyn "
-"rhwydwaith)"
+msgstr "Llwybr i'r all.rdz: darparu llwybr llawn i'r ddelwedd all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:145
 msgid ""
@@ -1930,11 +1888,14 @@ msgid ""
 "to name this image, so each boot image is related to a name in PXE menu. So "
 "user can choose wich image he wants to boot through PXE."
 msgstr ""
+"I gychwyn drwy rhwydwaith, mae'r cyfrifiadur angen delwedd cychwyn. At "
+"hynny, mae angen enw ar gyfer y ddelwedd, fel bo cysylltiad rhwng y "
+"dddelwedd cychwyn ac enw yn newislen PXE. Felly mae'r defnyddiwr yn gallu "
+"dewis pa ddelwedd i'w chychwyn drwy PXE."
 
 #: ../pxe_wizard/Pxe.pm:156
-#, fuzzy
 msgid "Please choose the PXE boot image you want to remove from PXE server."
-msgstr "Dewis y ddelwedd cychwyn PXE rydych am ei dynnu o'r gweinydd PXE."
+msgstr "Dewiswch y ddelwedd cychwyn PXE rydych am ei dynnu o'r gweinydd PXE."
 
 #: ../pxe_wizard/Pxe.pm:156
 msgid "Remove a boot image"
@@ -1943,49 +1904,48 @@ msgstr "Tynnu delwedd cychwyn"
 #: ../pxe_wizard/Pxe.pm:156
 msgid "The PXE boot image, and the related entry in PXE menu will be deleted."
 msgstr ""
+"Bydd y ddelwedd cychwyn PXE, a'r cofnod sy'n perthyn yn newislen PXE yn cael "
+"eu dileu."
 
 #: ../pxe_wizard/Pxe.pm:158
 msgid "Boot image to remove:"
 msgstr "Delwedd cychwyn i'w dynnu"
 
 #: ../pxe_wizard/Pxe.pm:163
-#, fuzzy
 msgid "Add options to boot image"
-msgstr "Ychwanegu dewis i ddelwedd cychwyn:"
+msgstr "Ychwanegu dewis i'r ddelwedd cychwyn"
 
 #: ../pxe_wizard/Pxe.pm:163
 msgid ""
 "In some case, you want to add some option to PXE boot image. This wizard "
 "provides an easy way to custom boot image with common parameters."
 msgstr ""
+"Mewn rhai achosion, byddwch angen ychwanegu dewisiadau i'r ddelwedd cychwyn "
+"PXE. Mae'r dewin yn darparu ffordd hawdd i addasu'r ddelwedd cychwyn gyda "
+"pharamedrau cyffredin."
 
 #: ../pxe_wizard/Pxe.pm:163
-#, fuzzy
 msgid ""
 "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Dewiswch ddelwedd cychwyn PXE i'w newid"
+msgstr "Dewiswch, o'r rhestr,  y ddelwedd cychwyn PXE i'w newid"
 
 #: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
 msgid "Boot image to modify:"
 msgstr "Delwedd cychwyn i'w newid:"
 
 #: ../pxe_wizard/Pxe.pm:171
-#, fuzzy
 msgid "Add option to PXE boot disk"
-msgstr "Ychwanegu dewis i ddelwedd cychwyn:"
+msgstr "Ychwanegu dewis i ddelwedd cychwyn PXE"
 
 #: ../pxe_wizard/Pxe.pm:171
-#, fuzzy
 msgid "Install directory: the full path to MDK install server directory"
-msgstr "Gosod cyfeiriadur: llwybr llawn i gyfeiriadur gweinydd gosod MDK"
+msgstr "Gosod cyfeiriadur: y llwybr llawn i gyfeiriadur gweinydd gosod MDK"
 
 #: ../pxe_wizard/Pxe.pm:171
-#, fuzzy
 msgid "Installation method: choose NFS or HTTP."
-msgstr "Dull gosodi:"
+msgstr "Dull gosod: dewis NFS neu HTTP."
 
 #: ../pxe_wizard/Pxe.pm:171
-#, fuzzy
 msgid ""
 "Server IP: IP address of server, which contain installation directory. You "
 "can create one with MDK install server wizard."
@@ -2019,9 +1979,8 @@ msgstr ""
 "osod."
 
 #: ../pxe_wizard/Pxe.pm:181
-#, fuzzy
 msgid "Ramsize: adjust the ramsize parameter on boot disk."
-msgstr "Ramsize: newid ramsize ar y disg cychwyn."
+msgstr "Ramsize: newid paramedrau ramsize ar y disg cychwyn."
 
 #: ../pxe_wizard/Pxe.pm:181
 msgid "VGA option: if you encounter any problem whith VGA, please adjust. "
@@ -2052,13 +2011,12 @@ msgid "Custom option:"
 msgstr "Dewis addasu:"
 
 #: ../pxe_wizard/Pxe.pm:193
-#, fuzzy
 msgid ""
 "Now the wizard will configure all needed default configurations files to "
 "allow computers to boot through the network."
 msgstr ""
-"Bydd hwn yn ffurfweddu pob ffeil ffurfweddiad rhagosodedig angenrheidiol i "
-"osod gweinydd PXE/"
+"Bydd y dewin yn ffurfweddu pob ffeil ffurfweddiad rhagosodedig angenrheidiol "
+"i ganiatáu i gyfrifiaduron gychywn drwy'r rhwydwaith."
 
 #: ../pxe_wizard/Pxe.pm:193
 msgid ""
@@ -2072,6 +2030,8 @@ msgid ""
 "Please provide a bootable image. To boot through network, network computer "
 "need a boot image."
 msgstr ""
+"Darparwch ddelwedd cychwynadwy. I gychwyn drwy rhwydwaith, mae cyfrifiadur "
+"rhwydwaith angen delwedd cychwyn."
 
 #: ../pxe_wizard/Pxe.pm:201
 #, fuzzy
@@ -2082,7 +2042,7 @@ msgstr "Angen delwedd. Ychwanegwch un."
 msgid ""
 "Please provide an all.rdz image, wich contain all drivers. You can find one "
 "in first CD of Mandrakesoft product, in /isolinux/alt0/ directory."
-msgstr ""
+msgstr "Darparwch ddelwedd all.rdz, sy'n cynnwys yr holl yrwyr."
 
 #: ../pxe_wizard/Pxe.pm:213 ../pxe_wizard/Pxe.pm:217
 #, perl-format
@@ -2090,10 +2050,9 @@ msgid "Please choose an image from a different directory than %s."
 msgstr "Dewiswch ddelwedd o gyfeiriadur gwahanol i %s"
 
 #: ../pxe_wizard/Pxe.pm:221
-#, fuzzy
 msgid ""
 "Please provide a correct PXE name: one word or one number with no space."
-msgstr "Darparwch enw cywir i'r cofnod PXE (un gair)"
+msgstr "Darparwch enw PXE cywir: un gair neu un rhif gyda dim bylchau"
 
 #: ../pxe_wizard/Pxe.pm:225
 msgid ""
@@ -2103,19 +2062,16 @@ msgstr ""
 "PXE' yn gyntaf."
 
 #: ../pxe_wizard/Pxe.pm:230 ../pxe_wizard/Pxe.pm:234
-#, fuzzy
 msgid "A similar name is already used in PXE menu"
-msgstr "Mae enw tebyg yn cael ei ddefnyddio eisoes mewn cofnod dewislen PXE"
+msgstr "Mae enw tebyg yn cael ei ddefnyddio eisoes mewn dewislen PXE"
 
 #: ../pxe_wizard/Pxe.pm:230 ../pxe_wizard/Pxe.pm:234
-#, fuzzy
 msgid "Please provide another one."
-msgstr "Rhowch enw Dewislen PXE gwahanol"
+msgstr "Rhowch un gwahanol"
 
 #: ../pxe_wizard/Pxe.pm:238
-#, fuzzy
 msgid "The wizard will now prepare all default files to set your PXE server"
-msgstr "Yn paratoi pob ffeil rhagosodedig i osod y gweinydd PXE"
+msgstr "Bydd y dewin yn paratoi pob ffeil rhagosodedig i osod y gweinydd PXE"
 
 #: ../pxe_wizard/Pxe.pm:240
 msgid "TFTP directory:"
@@ -2134,14 +2090,12 @@ msgid "PXE 'help' file:"
 msgstr "Ffeil 'cymorth' PXE:"
 
 #: ../pxe_wizard/Pxe.pm:249
-#, fuzzy
 msgid "The wizard will now modify boot options with those parameters:"
-msgstr "Yn newid y dewisiadau cychwyn yn y ddelwedd"
+msgstr "Bydd y dewin yn newid y dewisiadau cychwyn gyda'r paramedrau hynny:"
 
 #: ../pxe_wizard/Pxe.pm:266
-#, fuzzy
 msgid "The wizard will now remove this PXE boot image"
-msgstr "Mae'r dewin wedi tynnu'r ddelwedd cychwyn PXE yn llwyddiannus."
+msgstr "Bydd y dewin yn tynnu'r ddelwedd cychwyn PXE"
 
 #: ../pxe_wizard/Pxe.pm:268
 msgid "PXE entry to remove:"
@@ -2183,15 +2137,16 @@ msgstr "Dewin Samba"
 msgid "%s does not exist."
 msgstr "Nid yw %s yn bod."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Pob - Dim cyfyngiad mynediad"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Fy rheol - parthau iawn a drwg"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Dewin Ffurfweddu Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2200,6 +2155,10 @@ msgstr ""
 "gyfer gorsafoedd gwaith sy'n rhedeg systemau heblaw Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Dewin Ffurfweddu Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau Samba eich gweinydd."
@@ -2221,7 +2180,7 @@ msgid "The Workgroup is wrong"
 msgstr "Mae'r Grwp Gwaith yn anghywir"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Baner Gweinydd"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2237,20 +2196,16 @@ msgid "Banner:"
 msgstr "Baner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Mae Baner y Gweinydd yn anghywir"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Rheoli mynediad"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Lefel mynediad:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Esiampl 1: caniatáu pob  IPs yn 150.203.*.*; heblaw un\\ngwesteiwr iawn = "
@@ -2296,7 +2251,7 @@ msgid "Deny hosts:"
 msgstr "Gwrthod gwesteiwr"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Gwasanaethau Samba "
 
 #: ../samba_wizard/Samba.pm:132
@@ -2314,7 +2269,7 @@ msgid "Enable file sharing area"
 msgstr "Galluogi gofod rhannu ffeil"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Galluogi gofod rhannu ffeil"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2353,7 +2308,7 @@ msgstr ""
 "root, fred, @defnyddiwr, @olwyn ar gyfer pob math o ganiatâd."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "rhestr ddarllen:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2361,7 +2316,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "gwraidd, fred, @defnyddwyr, @olwyn"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "rhestr ysgrifennu"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2383,15 +2338,15 @@ msgstr ""
 "ffurfweddu Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Baner Gweinydd"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Rhannu Ffeiliau:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Gwasanaethwr LDAP"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2451,15 +2406,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Dewiswch weinydd cynradd ac eilradd o'r rhestr."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Gweinyddion Amser"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Gweinydd Amser Cynradd:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Gweinyddion Amser Eilradd"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2532,16 +2487,16 @@ msgid "Web wizard"
 msgstr "Dewin Gwe"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu'r Gweinydd Gwe ar gyfer eich rhwydwaith."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Dewin Ffurfweddu Gweinydd Gwe"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gweinydd Gwe."
 
 #: ../web_wizard/Apache.pm:77
@@ -2549,23 +2504,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Dewiswch y math o wasanaeth Gwe rydych am ei weithredu:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Gweinydd Gwe"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Mae modd i'ch gweinydd weithredu fel Gweinydd Gwe ar gyfer eich rhwydwaith "
 "mewnol (mewnrwyd) ac fel Gweinydd Gwe ar gyfer y Rhyngrwyd."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Galluogi'r Gweinydd Gwe ar gyfer y Fewnrwyd"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Galluogi'r Gweinydd Gwe ar gyfer y Rhyngrwyd"
 
 #: ../web_wizard/Apache.pm:90
@@ -2606,18 +2561,18 @@ msgstr "is-gyfeiriadur defnyddiwr http: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Teipio Llwybr y cyfeiriadur i gychwyn gwraidd y ddogfen"
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Gwraidd Dogfen:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Gwraidd dogfen:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Ffurfweddu'r Gweinydd Gwe"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gweinydd Gwe"
@@ -2630,16 +2585,12 @@ msgstr "Gweinydd gwe mewnrwyd"
 msgid "Internet web server:"
 msgstr "Gweinydd gwe rhyngrwyd:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Gwraidd dogfen:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Cyfeiriadur defnyddiwr:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gweinydd Gwe Mewnrwyd/Rhyngrwyd"
 
@@ -2651,67 +2602,181 @@ msgstr "Gweinydd gwe Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ffurfweddu eich system fel gweinydd Apache..."
 
-#~ msgid "Configuring the Internet Mail"
-#~ msgstr "Ffurfweddu E-bost Rhyngrwyd"
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr "Os ydych am alluogi PXE ar eich gweinydd dhcp ticiwch y blwch."
 
-#, fuzzy
-#~ msgid "Similar PXE name is already used in PXE menu"
-#~ msgstr "Mae enw tebyg yn cael ei ddefnyddio eisoes mewn cofnod dewislen PXE"
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gweinydd."
+
+#~ msgid "FTP Server"
+#~ msgstr "Gweinydd FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Gweinydd Newyddion"
+
+#~ msgid "NFS Server"
+#~ msgstr "Gweinydd NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Gweinydd NIS gyda autofs map"
+
+#~ msgid ""
+#~ "User automatically mount their home directory from server, when they log "
+#~ "on a NIS client computer network."
+#~ msgstr ""
+#~ "Mae'r defnyddiwr yn gosod yn awtomatig eu cyfeiriadur cartref o'r "
+#~ "gweinydd wrth fewngofnodi i rwydwaith cyfrifiadurol cleient NIS"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Gweinydd NIS"
+
+#~ msgid ""
+#~ "A NIS server is usefull to create user, hostname database. The wizard "
+#~ "also build autofs map, so it provides the capabilitie for NIS user to "
+#~ "automount their home directory on a NIS client computer."
+#~ msgstr ""
+#~ "Mae gweinydd NIS yn ddefnyddiol ar gyfer creu cronfa ddata enw gwesteiwr "
+#~ "defnyddiwr . Mae'r Dewin hefyd yn adeiladu autofs map, ac felly'n "
+#~ "darparu'r gallu  ddefnyddwyr NIS i awto osod eu cyfeiriadur cartref fel "
+#~ "cyfrifiadur cleient NIS."
+
+#~ msgid "Network File:"
+#~ msgstr "Ffeil Rhwydwaith"
+
+#~ msgid "NFS exports:"
+#~ msgstr "Allforion NFS"
+
+#~ msgid "Auto master:"
+#~ msgstr "Awto Feistr"
+
+#~ msgid "Auto home:"
+#~ msgstr "Awto cartref"
+
+#~ msgid ""
+#~ "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
+#~ "binding informationdaem."
+#~ msgstr ""
+#~ "Mae daemon YPBIND yn canfod gweinydd ar gyfer parthau HIS ac yn cynnal "
+#~ "rhwymiad informationdaem NIS."
+
+#~ msgid "External Mail server"
+#~ msgstr "Gweinydd E-bost allanol"
+
+#~ msgid "Internal Mail server"
+#~ msgstr "Gweinydd E-bost mewnol"
+
+#~ msgid "Internet Mail Configuration Wizard"
+#~ msgstr "Dewin Ffurfweddu E-bost Rhyngrwyd"
+
+#~ msgid ""
+#~ "This wizard will help you configuring an Internet Mail serer for your "
+#~ "network, or configure an External Mail server."
+#~ msgstr ""
+#~ "Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau E-bost "
+#~ "Rhyngrwyd ar gyfer eich rhwydwaith, neu i ffurfweddu gweinydd E-bost "
+#~ "Allannol."
+
+#~ msgid "Outgoing Mail Address"
+#~ msgstr "Cyfeiriad E-bost Allfynd"
+
+#~ msgid "Internet Mail Gateway"
+#~ msgstr "Porth E-bost Rhyngrwyd"
+
+#~ 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 ""
+#~ "Rhaid i enw'r gwesteiwyr rhyngrwyd fod ar ffurf  \"gwesteiwr.parth."
+#~ "mathparth\"; e.e. os eich darparwr yw \"darparwr.com\", fel rheol y "
+#~ "gweinydd e-bost rhyngrwyd yw \"newyddion.darparwr.com\"."
 
-#~ msgid "Congratulations, Mandrake Install server is now ready."
-#~ msgstr "Llongyfarchiadau, mae gweinydd Gosod Mandrake yn barod."
+#~ msgid "Mail Server Name:"
+#~ msgstr "Enw Gweinydd E-bost::"
+
+#~ msgid "Configuring the Internet Mail"
+#~ msgstr "Ffurfweddu E-bost Rhyngrwyd"
 
 #~ msgid ""
-#~ "You need to readjust your NIS domainname. For a NIS server you need a "
-#~ "correct NIS domainname, not equal to localdomain or none. Add "
-#~ "NISDOMAIN=your_nis_domain in /etc/sysconfig/network file, and do a: "
-#~ "nisdomainname your_nis_domain."
+#~ "The wizard collected the following parameters needed to configure your "
+#~ "Internet Mail Service:"
 #~ msgstr ""
-#~ "Rhaid ail newid eich enw parth NIS. Ar gyfer gweinydd NIS rhaid cael enw "
-#~ "parth NIS cywir, nid cydradd â pharth lleol neu ddim. Ychwanegwch "
-#~ "NISDOMAIN=your_nis_domain in /etc/sysconfig/network file, a gwneud: "
-#~ "nisdomainname your_nis_domain."
+#~ "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+#~ "ffurfweddu eich Gwasanaeth E-bost Rhyngrwyd:"
+
+#~ msgid "Form of the Address"
+#~ msgstr "Ffurf y Cyfeiriad"
 
-#~ msgid "The ypbind daemon binds NIS client to a NIS domain"
-#~ msgstr "Mae daemon ypbind yn rhwymo'r cleient NIS i barth NIS"
+#~ msgid "The wizard now will configure an Internal Mail Server."
+#~ msgstr "Bydd y dewin yn ffurfweddu eich Gweinydd E-bost Rhyngrwyd."
+
+#~ msgid "The wizard successfully configured your Externet Mail server."
+#~ msgstr ""
+#~ "Mae'r dewin wedi ffurfweddu eich gweinydd E-bost Allannol yn llwyddiannus."
 
 #~ msgid ""
-#~ "Please adjust with domainname command or in /etc/sysconfig/network file "
-#~ "(NISDOMAIN=yournisdomain)"
+#~ "This wizard will help you configuring the PXE server, and PXE boot image "
+#~ "management. PXE (Pre-boot Execution Environment) is a protocol designed "
+#~ "by Intel that allows computers to boot through the network. PXE is stored "
+#~ "in the ROM of new generation network cards. When the computer boots up, "
+#~ "the BIOS loads the PXE ROM in the memory and executes it. A menu is "
+#~ "displayed, allowing the computer to boot an operating system loaded "
+#~ "through the network."
 #~ msgstr ""
-#~ "Newidiwch eich gorchymyn enw parth neu yn ffeil /etc/sysconfig/network "
-#~ "file (NISDOMAIN=yournisdomain)"
+#~ "Bydd y Dewin yn eich cynorthwyo i osod gweinydd PXE a rheolaeth delwedd "
+#~ "cychwyn PXE. Mae PXE (Pre-boot Execution Environment) yn brotocol wedi ei "
+#~ "gynllunio gan Intel sy'n caniatáu i gyfrifiaduron gychwyn drwy rwydwaith. "
+#~ "Mae PXE yn cael ei gadw ar ROM cenhedlaeth ddiweddaraf o gardiau "
+#~ "rhwydwaith. Pan fydd y cyfrifiadur yn cychwyn, bydd y BIOS yn llwytho'r "
+#~ "ROM PXE i'r cof a'i weithredu. Mae dewislen yn cael ei ddangos, sy'n "
+#~ "caniatáu i'r cyfrifiadur gychwyn cychwynnwr system weithredu drwy'r "
+#~ "rhwydwaith."
 
-#~ msgid "Masquerade not good!"
-#~ msgstr "Ffugio gwael!"
+#~ msgid ""
+#~ "Network client interface: which interface client should used to be "
+#~ "installed."
+#~ msgstr ""
+#~ "Rhyngwyneb cleient rwydwaith: drwy'r hwn ddylai cleient ryngwyneb gael ei "
+#~ "osod."
 
 #~ msgid ""
-#~ "This wizard will provide a pxe service, and ability to add/remove/modify "
-#~ "boot images."
+#~ "We need to use a special dhcpd.conf with PXE parameter. To set such a "
+#~ "DHCP server, launch drakwizard DHPC, and check the box 'enable PXE', if "
+#~ "you don't do that, PXE query will not be answered by this server."
 #~ msgstr ""
-#~ "Bydd y Dewin yn darparu gwasanaeth pxe, â'r gallu i ychwanegu/tynnu/newid "
-#~ "delweddau cychwyn."
+#~ "Mae angen defnyddio dhcpd.conf arbennig gyda pharamedrau PXE. I osod "
+#~ "gweinydd DHCP o'r fath, cychwynnwch DHPC drakwizard, a thicio'r b;lwch "
+#~ "'galluogi PXE', os na wnewch chi hynny, ni fydd ymholiad PXE yn cael ei "
+#~ "ateb gan y gweinydd hwn."
 
-#~ msgid "Boot image to configure:"
-#~ msgstr "Delwedd cychwyn i'w ffurfweddu:"
+#~ msgid "Need an image. Please add one."
+#~ msgstr "Angen delwedd. Ychwanegwch un."
 
-#~ msgid "Installation method: choose nfs/http to install via nfs/http."
-#~ msgstr "Dull gosod: dewis nfs/http i osod drwy nfs/http."
+#~ msgid "Similar PXE name is already used in PXE menu"
+#~ msgstr "Mae enw PXE tebyg yn cael ei ddefnyddio eisoes mewn dewislen PXE"
 
-#~ msgid "Options to add to PXE boot disk"
-#~ msgstr "Dewisiadau i'w hychwanegu at ddisg cychwyn PXE"
+#~ msgid "The wizard Will now add this PXE boot image"
+#~ msgstr "Bydd y dewin yn ychwanegu'r ddelwedd cychwyn PXE."
 
-#~ msgid "We need to use a special dhcpd.conf with PXE parameter."
-#~ msgstr "Byddwn yn defnyddio dhcpd.conf arbennig gyda pharamedr PXE."
+#~ msgid "The wizard successfully add the PXE boot image."
+#~ msgstr "Mae'r dewin wedi ychwanegu'r delwedd cychwyn PXE yn llwyddiannus."
 
-#~ msgid "Please provide a bootable image..."
-#~ msgstr "Darparwch ddelwedd cychwyn..."
+#~ msgid "The wizard successfully modify the boot option."
+#~ msgstr "Mae'r dewin wedi newid y dewis cychwyn."
 
-#~ msgid "Will now remove your PXE boot image"
-#~ msgstr "Yn tynnu eich delwedd cychwyn PXE"
+#~ msgid ""
+#~ "Your server can act as a Web Server toward your internal network "
+#~ "(intranet) and as a Web Server for the Internet."
+#~ msgstr ""
+#~ "Mae modd i'ch gweinydd weithredu fel Gweinydd Gwe ar gyfer eich "
+#~ "rhwydwaith mewnol (mewnrwyd) ac fel Gweinydd Gwe ar gyfer y Rhyngrwyd."
 
-#~ msgid "Will now add your PXE boot image"
-#~ msgstr "Yn ychwanegu eich delwedd PXE"
+#~ msgid "Document Root:"
+#~ msgstr "Gwraidd Dogfen:"
 
-#~ msgid "The wizard successfully modify image(s)."
-#~ msgstr "Mae'r dewin wedi newid delwedd(au) yn llwyddiannus."
+#~ msgid ""
+#~ "The wizard collected the following parameters needed to configure your "
+#~ "Web Server"
+#~ msgstr ""
+#~ "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+#~ "ffurfweddu eich Gweinydd Gwe"
diff --git a/po/da.po b/po/da.po
index 4be65bcc..0073424c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-26 19:42+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <<dansk@klid.dk>>\n"
@@ -46,7 +46,7 @@ msgstr "Fejl."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -85,7 +85,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Denne hj�lper vil hj�lpe dig med at tilf�je en ny klient i din lokale DNS."
+msgstr ""
+"Denne hj�lper vil hj�lpe dig med at tilf�je en ny klient i din lokale DNS."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -99,7 +100,8 @@ msgstr "Klientidentifikation:"
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
-msgstr "Bem�rk at angivet IP-nummer og klientnavn skal v�re unikke i netv�rket."
+msgstr ""
+"Bem�rk at angivet IP-nummer og klientnavn skal v�re unikke i netv�rket."
 
 #: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:126
 msgid ""
@@ -190,13 +192,15 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Denne hj�lper vil hj�lpe dig med at konfigurere DHCP-tjenester p� din server."
+msgstr ""
+"Denne hj�lper vil hj�lpe dig med at konfigurere DHCP-tjenester p� din server."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Hvis du �nsker at aktivere PXE for din dhcp-server s� afkryds venligst i "
-"boksen."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -213,15 +217,15 @@ msgstr ""
 "192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Laveste IP-adresse:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "H�jeste IP-adresse:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway-IP adresse:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -245,7 +249,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Konfigurerer DHCP-serveren"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -281,8 +285,10 @@ msgid "Interface:"
 msgstr "Gr�nsesnit:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
-msgstr "Hj�lperen konfigurerede DHCP-tjenesterne p� din serveren uden problemer."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
+msgstr ""
+"Hj�lperen konfigurerede DHCP-tjenesterne p� din serveren uden problemer."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
@@ -443,7 +449,8 @@ msgid "Default domain name to search:"
 msgstr "Standard dom�navn som skal s�ges:"
 
 #: ../dns_wizard/Bind.pm:168
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Dette er ikke en gyldig ip-adresse for din videresender, klik p� N�ste for "
 "at forts�tte"
@@ -519,7 +526,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Klient med denne identifikation vil blive fjernet fra din DNS"
 
 #: ../dns_wizard/Bind.pm:233
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr ""
 "DNS-serveren er i f�rd med at blive konfigureret med den f�lgende "
 "konfiguration"
@@ -568,11 +576,11 @@ msgstr "DHCP-server"
 msgid "DNS server"
 msgstr "DNS-server"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Nyhedsgruppeserver"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS-server"
 
@@ -580,7 +588,7 @@ msgstr "NFS-server"
 msgid "Mail server"
 msgstr "E-postserver"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP-server"
 
@@ -638,16 +646,14 @@ msgid "FTP wizard"
 msgstr "FTP-hj�lper"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Konfigurationshj�lper for FTP-server"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
-msgstr "Denne hj�lper vil hj�lpe dig med at konfigurere en FTP-server til dit netv�rk."
-
-#: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP-server"
+msgid "This wizard will help you configuring an FTP server for your network."
+msgstr ""
+"Denne hj�lper vil hj�lpe dig med at konfigurere en FTP-server til dit "
+"netv�rk."
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
@@ -655,22 +661,22 @@ msgstr "V�lg hvilken form af FTP-tjeneste du vil aktivere:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Aktiv�r FTP-serveren for Intranettet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Aktiv�r FTP-serveren for Internettet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Admin-epost: epostadresse til FTP-administratoren."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -684,7 +690,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "Tillad FXP: tillad filoverf�ring via en anden FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "Hjemme-Chroot bruger: brugere vil kun se deres hjemmekatalog."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -700,11 +706,11 @@ msgid "Admin email:"
 msgstr "Admin-epost:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Tillad root-indlogning:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Hjemme-Chroot bruger:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -729,27 +735,27 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
-"Jeg kan ikke finde 'bash' i listen af skaller. Det ser ud til at du har �ndret "
-"den i h�nden! Ret venligst."
+"Jeg kan ikke finde 'bash' i listen af skaller. Det ser ud til at du har "
+"�ndret den i h�nden! Ret venligst."
 
 #: ../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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Konfigurerer FTP-serveren"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
-"Hj�lperen samlede de f�lgende parametre "
-"som beh�ves for at konfigurere din FTP-server"
+"Hj�lperen samlede de f�lgende parametre som beh�ves for at konfigurere din "
+"FTP-server"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
@@ -760,11 +766,11 @@ msgstr ""
 "N�ste-knappen, eller bruge Tilbage-knappen for at �ndre dem"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet-FTP-server:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet-FTP-server:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -788,8 +794,9 @@ msgid "Allow FXP"
 msgstr "Tillad FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
-msgstr "Hj�lperen konfigurerede din Intranet/Internet FTP-server uden problemer"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
+msgstr ""
+"Hj�lperen konfigurerede din Intranet/Internet FTP-server uden problemer"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
 #: ../pxe_wizard/Pxe.pm:332
@@ -841,11 +848,11 @@ msgstr ""
 "installationskatalog."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "M�l-kataloget er allerede i brug, v�lg venligst et andet."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Din installeringsserver vil blive konfigureret med f�lgende parametre"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -862,8 +869,8 @@ msgid ""
 "a DHCP server with PXE suport, and a PXE server. So it will be very easy to "
 "install Mandrake through network."
 msgstr ""
-"Tillykke. Mandrake Installerings-server er klar nu. Du kan nu konfigurere "
-"en DHCP-server med PXE-underst�ttelse, og en PXE-server. S� vil det v�re meget "
+"Tillykke. Mandrake Installerings-server er klar nu. Du kan nu konfigurere en "
+"DHCP-server med PXE-underst�ttelse, og en PXE-server. S� vil det v�re meget "
 "nemt at installere Mandrake over nettet."
 
 #: ../installsrv_wizard/Installsrv.pm:143
@@ -1065,7 +1072,7 @@ msgstr "Velkommen til News-hj�lperen"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internet-v�rtsnavne skal v�re p� formen \"v�rt.dom�ne.dom�netype\"; fx hvis "
@@ -1073,10 +1080,6 @@ msgstr ""
 "udbyder.dk\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Nyhedsgruppeserver"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1085,24 +1088,24 @@ msgstr ""
 "dit netv�rk; navnet er normalt opgivet af din udbyder."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Navn p� nyhedsserver:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Afh�ngig af hvilken type internet-opkobling du har. En passende tjekke- "
 "periode kan v�re mellem 6 til 24 timer."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Tjekkeperiode"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1111,7 +1114,7 @@ msgstr ""
 "f�lgende tjek."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Tjekkeperiode (Timer):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1128,32 +1131,31 @@ msgstr "Konfigurerer Internet-nyheder"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Hj�lperen samlede de f�lgende parametre\n"
 "som beh�ves for at konfigurere din Internet nyheds-tjeneste:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"For at godtage disse v�rdier og konfigurere din serveren skal du klikke p� "
-"N�ste-knappen, eller bruge Tilbage-knappen for at �ndre dem."
+"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"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Nyhedsgruppeserver:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Tjekkeinterval:"
 
-#: ../news_wizard/Inn.pm:96
-msgid "The wizard successfully configured your Internet News service of your server."
+#: ../news_wizard/Inn.pm:95
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr ""
 "Hj�lperen konfigurerede Internet nyheds-tjenesten p� din server uden "
 "problemer."
@@ -1163,7 +1165,6 @@ msgid "NFS Wizard"
 msgstr "NFS-hj�lper"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Alle - Ingen adgangsrestriktioner"
 
@@ -1176,25 +1177,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Konfigurationshj�lper for NFS-server"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr "Denne hj�lper vil hj�lpe dig med at konfigurere NFS-serveren til dit netv�rk."
-
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS-server"
+msgid "This wizard will help you configuring the NFS server for your network."
+msgstr ""
+"Denne hj�lper vil hj�lpe dig med at konfigurere NFS-serveren til dit netv�rk."
 
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Adgangskontrol"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "V�lg niveauet som passer til dine behov. Hvis du ikke er sikker, er Lokalt "
@@ -1243,7 +1242,7 @@ msgid "Netmask :"
 msgstr "Netmaske:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Hj�lperen konfigurerede din NFS-server uden problemer."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1254,29 +1253,27 @@ msgstr ""
 "Du beh�ver at omjustere dit NIS-dom�nenavn. For en NIS-server beh�ver du et "
 "korrekt NIS-dom�nenavn, ikke det samme som localdomain eller ingenting."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
-msgstr "NIS-server med Autofs-kort"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
+msgstr "NIS-server med autofs-kort"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS-klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "NIS-server med autofs-kort"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
-msgstr "Ops�tning af en NIS-server med autofs-kort, auto.home og auto.master filer."
+msgstr ""
+"Ops�tning af en NIS-server med autofs-kort, auto.home og auto.master filer."
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
-"Brugere kan automatisk montere deres hjemmekatalog fra serveren, "
-"n�r de logger p� et NIS klientmaskine-netv�rk."
+"Brugere kan automatisk montere deres hjemmekatalog fra serveren, n�r de "
+"logger p� et NIS klientmaskine-netv�rk."
 
 #: ../nisautofs_wizard/Nisautofs.pm:85
 msgid "What do you want to do ?"
@@ -1290,23 +1287,24 @@ msgstr "Konfigurerer dit system som en Nis-klient"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Du skal blot putte nisdomain og nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
-msgstr "NFS-server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
+msgstr "NIS-server:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS-Dom�ne:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
-"En NIS-server er god til at oprette en bruger-v�rtsnavn database. Hj�lperen bygger "
-"ogs� et autofs-kort, s� den giver mulighed for en NIS-bruger at automontere "
-"deres hjemmekatalog p� en NIS-klientmaskine."
+"En NIS-server er god til at oprette en bruger-v�rtsnavn database. Hj�lperen "
+"bygger ogs� et autofs-kort, s� den giver mulighed for en NIS-bruger at "
+"automontere deres hjemmekatalog p� en NIS-klientmaskine."
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
@@ -1319,18 +1317,13 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid "NIS domain: NIS domain to use (generally same as your DNS domainaname)."
 msgstr ""
-"NIS-dom�ne: NIS-dom�ne der skal bruges (normalt det samme som "
-"dit DNS-dom�nenavn)."
+"NIS-dom�ne: NIS-dom�ne der skal bruges (normalt det samme som dit DNS-"
+"dom�nenavn)."
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid "NIS server: name of your computer."
 msgstr "NIS-server: navn p� din maskine."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS-server:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Hjemme-NIS:"
@@ -1348,22 +1341,6 @@ msgstr "Hj�lperen vil s�tte din NIS-server med autofs-kort"
 msgid "NIS directory:"
 msgstr "NIS-katalog:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Netv�rksfil:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "NIS-eksporteringer:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto hjem:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS-dom�nenavn: navn p� NIS-dom�ne."
@@ -1375,10 +1352,10 @@ msgstr "NIS-server: v�rtsnavn p� NIS-serveren."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
-"YPBIND-d�monen finder serveren for NIS-dom�ner og vedligeholder NIS "
-"binding informationd�mon."
+"YPBIND-d�monen finder serveren for NIS-dom�ner og vedligeholder NIS binding "
+"informationd�mon."
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
 msgid "Error should be a directory."
@@ -1394,7 +1371,8 @@ msgstr "Ret det venlist til."
 
 #: ../nisautofs_wizard/Nisautofs.pm:142
 msgid "The wizard successfully configured your machine to be a NIS client."
-msgstr "Hj�lperen konfigurerede din makine til at v�re en NIS-klient uden problemer."
+msgstr ""
+"Hj�lperen konfigurerede din makine til at v�re en NIS-klient uden problemer."
 
 #: ../nisautofs_wizard/Nisautofs.pm:149
 msgid ""
@@ -1409,11 +1387,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurerer dit system som en NIS-server med autofs-kort ..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS med Autofs-kort"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurerer dit system som en NIS-klient ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1500,7 +1478,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internet-v�rtsnavne skal v�re p� formen \"v�rt.dom�ne.dom�netype\"; fx hvis "
@@ -1525,7 +1503,8 @@ msgstr "Navn p� e-postserver:"
 
 #: ../postfix_wizard/Postfix.pm:120
 msgid "The default is to append myhostname which is fine for small sites."
-msgstr "Standard er at tilf�je myhostname hvilket er fint for sm� installationer."
+msgstr ""
+"Standard er at tilf�je myhostname hvilket er fint for sm� installationer."
 
 #: ../postfix_wizard/Postfix.pm:120
 msgid ""
@@ -1548,16 +1527,8 @@ msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
 msgstr ""
-"Hj�lperen indsamlede de f�lgende parametre som beh�ves for at konfigurere din "
-"eksterne epost-server:"
-
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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"
+"Hj�lperen indsamlede de f�lgende parametre som beh�ves for at konfigurere "
+"din eksterne epost-server:"
 
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
@@ -1639,7 +1610,8 @@ msgid "Proxy port:"
 msgstr "Proxy-port:"
 
 #: ../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 ""
 "Klik p� N�ste for at beholde denne v�rdi eller Tilbage for at korrigere dit "
 "valg"
@@ -1657,7 +1629,8 @@ msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Du skal v�lge en port st�rre end 1024 og lavere end 65535"
 
 #: ../proxy_wizard/Squid.pm: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 "Disk-cache er m�ngden af diskplads som kan bruges til cache p� disken."
 
 #: ../proxy_wizard/Squid.pm:92
@@ -1687,8 +1660,23 @@ msgid "Disk space (MB):"
 msgstr "Diskplads (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Adgangskontrol"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"V�lg niveauet som passer til dine behov. Hvis du ikke er sikker, er Lokalt "
+"netv�rksniveau normalt det mest passende. V�r klar over at Alle-niveauet nok "
+"ikke er sikkert."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
-msgstr "Proxyen kan konfigureres til at bruge forskellige adgangskontrolniveauer"
+msgstr ""
+"Proxyen kan konfigureres til at bruge forskellige adgangskontrolniveauer"
 
 #: ../proxy_wizard/Squid.pm:117
 msgid ""
@@ -1747,11 +1735,21 @@ msgid "Configuring the Proxy"
 msgstr "Konfigurerer 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 ""
 "Hj�lperen samlede f�lgende parametre som beh�ves for at konfigurere din "
 "proxy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"For at godtage disse v�rdier og konfigurere din serveren skal du klikke p� "
+"N�ste-knappen, eller bruge Tilbage-knappen for at �ndre dem."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -1781,8 +1779,8 @@ msgid ""
 "You need to readjust your domainname, not equal to localdomain or none. "
 "Please launch drakconnect to adjust it."
 msgstr ""
-"Du beh�ver at omjustere dit dom�nenavn, ikke det samme som localdomain "
-"eller 'none'. K�r drakconnect for at justere det."
+"Du beh�ver at omjustere dit dom�nenavn, ikke det samme som localdomain eller "
+"'none'. K�r drakconnect for at justere det."
 
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:193
 msgid "Set PXE server"
@@ -1837,14 +1835,15 @@ msgid ""
 "PXE description is used to explain the rule of the boot image, ie: Mandrake "
 "9.2 image, Mandrake cooker image.."
 msgstr ""
-"PXE-beskrivelse bruges til at forklare opstartsaftrykkets regler, dvs Mandrake "
-"9.2 aftryk, eller Mandrake cooker aftryk..."
+"PXE-beskrivelse bruges til at forklare opstartsaftrykkets regler, dvs "
+"Mandrake 9.2 aftryk, eller Mandrake cooker aftryk..."
 
 #: ../pxe_wizard/Pxe.pm:135
 msgid ""
 "PXE name: the name displayed in PXE menu (please provide a word or a  "
 "number, with no space)"
-msgstr "PXE-navn: navn i PXE-menu (angiv �t ord eller tal, venligst ingen mellemrum)"
+msgstr ""
+"PXE-navn: navn i PXE-menu (angiv �t ord eller tal, venligst ingen mellemrum)"
 
 #: ../pxe_wizard/Pxe.pm:135
 msgid "Path to image: provide the full path to the network boot image"
@@ -1856,10 +1855,10 @@ msgid ""
 "need to name this image, so each boot image is related to a name in PXE "
 "menu. User can then choose which image he wants to boot through PXE."
 msgstr ""
-"For at starte op over nettet har netv�rksmaskinen brug for et opstartsaftryk. "
-"Desuden skal vi navngive dette aftryk, s� hvert opstartsaftryk er knyttet til et "
-"navn i PXE-menuen. Brugeren kan s� v�lge hvilket aftryk han �nsker at "
-"starte op via PXE."
+"For at starte op over nettet har netv�rksmaskinen brug for et "
+"opstartsaftryk. Desuden skal vi navngive dette aftryk, s� hvert "
+"opstartsaftryk er knyttet til et navn i PXE-menuen. Brugeren kan s� v�lge "
+"hvilket aftryk han �nsker at starte op via PXE."
 
 #: ../pxe_wizard/Pxe.pm:145
 msgid "Add all.rdz boot image"
@@ -1872,14 +1871,16 @@ msgid ""
 "all drivers needed (in our case all.rdz)."
 msgstr ""
 "Af tekniske �rsager er det i tilf�lde af flere opstartsaftryk simplere at "
-"opstarte netv�rksmaskinen via en kerne (vmlinuz), og levere �n fil med "
-"alle n�dvendige drivere (i vores tilf�lde all.rdz)."
+"opstarte netv�rksmaskinen via en kerne (vmlinuz), og levere �n fil med alle "
+"n�dvendige drivere (i vores tilf�lde all.rdz)."
 
 #: ../pxe_wizard/Pxe.pm:145
 msgid ""
 "PXE name: the name displayed in PXE menu (please provide a word or a number, "
 "with no space)"
-msgstr "PXE-navn: navnet der vises i PXE-menuen (angiv �t ord eller tal, uden mellemrum)"
+msgstr ""
+"PXE-navn: navnet der vises i PXE-menuen (angiv �t ord eller tal, uden "
+"mellemrum)"
 
 #: ../pxe_wizard/Pxe.pm:145
 msgid "Path to all.rdz: provide the full path to all.rdz image"
@@ -1891,9 +1892,10 @@ msgid ""
 "to name this image, so each boot image is related to a name in PXE menu. So "
 "user can choose wich image he wants to boot through PXE."
 msgstr ""
-"For at starte op via nettet beh�ver netv�rksmaskinen et opstartsaftryk. Desuden "
-"beh�ver vi at navngive dette aftryk, s� hvert opstartsaftryk er knyttet til et navn "
-"i PXE-menuen. Da kan brugeren v�lge hvilket aftryk han �nsker at starte op via PXE."
+"For at starte op via nettet beh�ver netv�rksmaskinen et opstartsaftryk. "
+"Desuden beh�ver vi at navngive dette aftryk, s� hvert opstartsaftryk er "
+"knyttet til et navn i PXE-menuen. Da kan brugeren v�lge hvilket aftryk han "
+"�nsker at starte op via PXE."
 
 #: ../pxe_wizard/Pxe.pm:156
 msgid "Please choose the PXE boot image you want to remove from PXE server."
@@ -1905,7 +1907,9 @@ msgstr "Fjern et opstatsaftryk"
 
 #: ../pxe_wizard/Pxe.pm:156
 msgid "The PXE boot image, and the related entry in PXE menu will be deleted."
-msgstr "PXE-opstartsaftrykket, og den dertil knyttede indgang PXE-menuen, vil blive slettet."
+msgstr ""
+"PXE-opstartsaftrykket, og den dertil knyttede indgang PXE-menuen, vil blive "
+"slettet."
 
 #: ../pxe_wizard/Pxe.pm:158
 msgid "Boot image to remove:"
@@ -1920,12 +1924,15 @@ msgid ""
 "In some case, you want to add some option to PXE boot image. This wizard "
 "provides an easy way to custom boot image with common parameters."
 msgstr ""
-"Nogen gange vil du gerne tilf�je nogle tilvalg til PXE-opstartsaftrykket. Denne hj�lper "
-"giver en nem m�de til at tilpasse et opstartsaftryk med nogen almindelige parametre."
+"Nogen gange vil du gerne tilf�je nogle tilvalg til PXE-opstartsaftrykket. "
+"Denne hj�lper giver en nem m�de til at tilpasse et opstartsaftryk med nogen "
+"almindelige parametre."
 
 #: ../pxe_wizard/Pxe.pm:163
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Venligst v�lg PXE-opstartsaftryk som skal �ndres fra nedenst�ende liste"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Venligst v�lg PXE-opstartsaftryk som skal �ndres fra nedenst�ende liste"
 
 #: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
 msgid "Boot image to modify:"
@@ -2021,17 +2028,18 @@ msgid ""
 "a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you "
 "don't do that, PXE query will not be answered by this server."
 msgstr ""
-"Vi skal bruge en s�rlig dhcpd.conf fil med PXE-parameter. For at ops�tte en s�dan "
-"DHCP-server skal du starte DHCP-hj�lperen og afkrydse boksen 'Aktiv�r PXE'. Hvis du "
-"ikke g�r dette, vil PXE-foresp�rgsler ikke blive besvaret af denne server."
+"Vi skal bruge en s�rlig dhcpd.conf fil med PXE-parameter. For at ops�tte en "
+"s�dan DHCP-server skal du starte DHCP-hj�lperen og afkrydse boksen 'Aktiv�r "
+"PXE'. Hvis du ikke g�r dette, vil PXE-foresp�rgsler ikke blive besvaret af "
+"denne server."
 
 #: ../pxe_wizard/Pxe.pm:197
 msgid ""
 "Please provide a bootable image. To boot through network, network computer "
 "need a boot image."
 msgstr ""
-"Angiv et opstarteligt aftryk. For at starte op via nettet beh�ver netv�rksmaskinen "
-"et opstartsaftryk."
+"Angiv et opstarteligt aftryk. For at starte op via nettet beh�ver "
+"netv�rksmaskinen et opstartsaftryk."
 
 #: ../pxe_wizard/Pxe.pm:201
 msgid "We need an image. Please add one."
@@ -2042,8 +2050,8 @@ msgid ""
 "Please provide an all.rdz image, wich contain all drivers. You can find one "
 "in first CD of Mandrakesoft product, in /isolinux/alt0/ directory."
 msgstr ""
-"Angiv et all.rdz-aftryk, som indeholder alle drivere. Du kan finde �t "
-"p� den f�rste CD for Mandrakesoft produktet, i /isolinux/alt0/ kataloget."
+"Angiv et all.rdz-aftryk, som indeholder alle drivere. Du kan finde �t p� den "
+"f�rste CD for Mandrakesoft produktet, i /isolinux/alt0/ kataloget."
 
 #: ../pxe_wizard/Pxe.pm:213 ../pxe_wizard/Pxe.pm:217
 #, perl-format
@@ -2051,11 +2059,14 @@ msgid "Please choose an image from a different directory than %s."
 msgstr "V�lg venligst et aftryk fra et andet katalog end %s."
 
 #: ../pxe_wizard/Pxe.pm:221
-msgid "Please provide a correct PXE name: one word or one number with no space."
-msgstr "Angiv venligst et korrekt PXE-navn: �t ord ord eller �t tal, uden mellemrum."
+msgid ""
+"Please provide a correct PXE name: one word or one number with no space."
+msgstr ""
+"Angiv venligst et korrekt PXE-navn: �t ord ord eller �t tal, uden mellemrum."
 
 #: ../pxe_wizard/Pxe.pm:225
-msgid "To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
+msgid ""
+"To add/remove/modify PXE boot image, you need to run 'Set PXE server' before."
 msgstr ""
 "For at tilf�je/fjerne/�ndre PXE opstartsaftrykket skal du k�re 'Set PXE "
 "server' f�rst."
@@ -2070,7 +2081,8 @@ msgstr "Angiv venligst et andet navn."
 
 #: ../pxe_wizard/Pxe.pm:238
 msgid "The wizard will now prepare all default files to set your PXE server"
-msgstr "Hj�lperen vil nu forberede alle standardfiler for at ops�tte PXE-serveren"
+msgstr ""
+"Hj�lperen vil nu forberede alle standardfiler for at ops�tte PXE-serveren"
 
 #: ../pxe_wizard/Pxe.pm:240
 msgid "TFTP directory:"
@@ -2133,15 +2145,16 @@ msgstr "Samba-hj�lper"
 msgid "%s does not exist."
 msgstr "%s eksisterer ikke."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Alle - Ingen adgangsrestriktioner"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mine regler - Sp�rg mig om tilladte og afviste v�rter"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Konfigurationshj�lper for Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2150,7 +2163,12 @@ msgstr ""
 "arbejdstationer som k�re ikke-Linux-systemer."
 
 #: ../samba_wizard/Samba.pm:71
-msgid "This wizard will help you configuring the Samba services of your server."
+msgid "Samba configuration wizard"
+msgstr "Konfigurationshj�lper for Samba"
+
+#: ../samba_wizard/Samba.pm:71
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Denne hj�lper vil hj�lpe dig med at konfigurere Samba-tjenesterne p� din "
 "server."
@@ -2172,34 +2190,31 @@ msgid "The Workgroup is wrong"
 msgstr "Arbejdsgruppen er forkert"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Server-beskrivelse."
 
 #: ../samba_wizard/Samba.pm:92
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
-msgstr "Banner er m�den denne server vil blive omtalt i Windows arbejdstationerne."
+msgstr ""
+"Banner er m�den denne server vil blive omtalt i Windows arbejdstationerne."
 
 #: ../samba_wizard/Samba.pm:98
 msgid "Banner:"
 msgstr "Beskrivelse:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Serverens beskrivelse er ukorrekt"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Adgangskontrol"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Adgangsniveau:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Eksempel 1: tillad alle IP'er i 150.203.*.*; undtagen �n\n"
@@ -2246,7 +2261,7 @@ msgid "Deny hosts:"
 msgstr "Afvis v�rter:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Aktiverede Samba tjenester"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2263,7 +2278,7 @@ msgid "Enable file sharing area"
 msgstr "Aktiv�r fildelingsomr�de"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Aktiv�r server-printerdeling"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2303,7 +2318,7 @@ msgstr ""
 "for hver slags tilladelse."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "l�s liste:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2311,12 +2326,13 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "skriv liste:"
 
 #: ../samba_wizard/Samba.pm:182
 msgid "Select which printers you want to be accessible from known users"
-msgstr "V�lg hvilke printere du �nsker skal v�re tilg�ngelige for kendte brugere"
+msgstr ""
+"V�lg hvilke printere du �nsker skal v�re tilg�ngelige for kendte brugere"
 
 #: ../samba_wizard/Samba.pm:189
 msgid "Enable all printers"
@@ -2331,15 +2347,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Hj�lperen samlede f�lgende parametre for at konfigurere Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Server-beskrivelse:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Fildeling:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Printserver:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2384,7 +2400,8 @@ msgstr "S�ledes vil din server v�re den lokale tidsserver for dit netv�rk."
 
 #: ../time_wizard/Ntp.pm:82
 msgid "press next to begin, or cancel to leave this wizard"
-msgstr "Klik p� N�ste for at begynde eller Afbryd for at afslutte denne hj�lper."
+msgstr ""
+"Klik p� N�ste for at begynde eller Afbryd for at afslutte denne hj�lper."
 
 #: ../time_wizard/Ntp.pm:87
 msgid ""
@@ -2399,15 +2416,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "V�lg en prim�r og en sekund�r server fra listen."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Tidsservere"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Prim�r tidsserver:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekund�r tidsserver:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2479,15 +2496,16 @@ msgid "Web wizard"
 msgstr "Webhj�lper"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
-msgstr "Denne hj�lper vil hj�lpe dig med at konfigurere web-serveren for dit netv�rk."
+msgid "This wizard will help you configuring the Web server for your network."
+msgstr ""
+"Denne hj�lper vil hj�lpe dig med at konfigurere web-serveren for dit netv�rk."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Konfigurationshj�lper for webserver"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Mark�r ingen boks hvis du ikke vil aktivere webserveren."
 
 #: ../web_wizard/Apache.pm:77
@@ -2495,23 +2513,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "V�lg hvilken form af webtjeneste du vil aktivere:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Webserver"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Din server kan opf�re sig som en web-server mod dit interne netv�rk "
 "(intranet) og som en web-server for Internettet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Aktiv�r web-serveren for Intranettet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Aktiv�r web-serveren for Internettet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2552,18 +2570,18 @@ msgstr "brugers http-underkatalog: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Indtast stien p� kataloget du �nsker skal v�re dokumentroden."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Dokumentrod:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Konfigurerer webserveren"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Hj�lperen samlede f�lgende parametre som beh�ves for at konfigurere din web-"
 "server"
@@ -2576,17 +2594,14 @@ msgstr "Intranet-webserver:"
 msgid "Internet web server:"
 msgstr "Internet-webserver:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Dokumentrod:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Brugerkatalog:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr "Hj�lperen konfigurerede din Intranet/Internet web-server uden problemer"
+msgid "The wizard successfully configured your intranet/Internet Web server"
+msgstr ""
+"Hj�lperen konfigurerede din Intranet/Internet web-server uden problemer"
 
 #: ../web_wizard/Apache.pm:236
 msgid "Apache server"
@@ -2596,6 +2611,52 @@ msgstr "Apache-server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer dit system som en Apache-server ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Hvis du �nsker at aktivere PXE for din dhcp-server s� afkryds venligst i "
+#~ "boksen."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr ""
+#~ "Hj�lperen konfigurerede DHCP-tjenesterne p� din serveren uden problemer."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP-server"
+
+#~ msgid "News Server"
+#~ msgstr "Nyhedsgruppeserver"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS-server"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "NIS-server med Autofs-kort"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NFS-server:"
+
+#~ msgid "Network File:"
+#~ msgstr "Netv�rksfil:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "NIS-eksporteringer:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto hjem:"
+
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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"
+
+#~ msgid "Document Root:"
+#~ msgstr "Dokumentrod:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Konfigurerer Internet epost"
 
@@ -2660,4 +2721,3 @@ msgstr "Konfigurerer dit system som en Apache-server ..."
 
 #~ msgid "Masquerade not good!"
 #~ msgstr "Maskering ikke i orden!"
-
diff --git a/po/de.po b/po/de.po
index 723c0af4..fbe048c4 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-01-30 00:32+0100\n"
 "Last-Translator: Sebastian Deutscher <sebastian_deutscher@web.de>\n"
 "Language-Team: german <cooker-i18n@linux-mandrake.com>\n"
@@ -50,7 +50,7 @@ msgstr "Fehler."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -209,7 +209,10 @@ msgstr ""
 "Der Assistent wird Ihnen helfen, den DHCP-Dienst Ihres Servers einzurichten."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -228,16 +231,16 @@ msgstr ""
 "haben, können Sie die Vorgaben getrost übernehmen."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Niedrigste IP-Adresse:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Höchste IP-Adresse:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -261,7 +264,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Die Server-IP-Adresse darf nicht im DHCP-Adress-Bereich liegen."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP-Server konfigurieren"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -297,7 +300,8 @@ msgid "Interface:"
 msgstr "Schnittstelle:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 "Der Assistent hat die DHCP-Dienste Ihres Servers erfolgreich eingerichtet."
 
@@ -578,12 +582,12 @@ msgstr "DHCP-Server"
 msgid "DNS server"
 msgstr "DNS-Server"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "News-Server"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS-Server"
 
@@ -591,7 +595,7 @@ msgstr "NFS-Server"
 msgid "Mail server"
 msgstr "Mail-Server"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP-Server"
 
@@ -649,43 +653,39 @@ msgid "FTP wizard"
 msgstr "FTP-Assistent"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP-Server Konfigurations-Assistent"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Der Assistent wird Ihnen helfen, den FTP-Server für Ihr Netzwerk "
 "einzurichten."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP-Server"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Den FTP-Server für das Intranet aktivieren"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Den FTP-Server für das Internet aktivieren"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Admin-E-Mail: E-Mail-Adresse oder FTP-Verantwortlicher."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -697,7 +697,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -718,11 +718,11 @@ msgstr "Admin-E-Mail"
 
 #: ../ftp_wizard/Proftpd.pm:97
 #, fuzzy
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Root-Login erlauben"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -750,8 +750,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -759,14 +759,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Für diese Aktion benötigen Sie Administrator-Rechte."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP-Server konfigurieren"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Der Assistent hat die folgenden Parameter\n"
 "zusammengestellt, um Ihren FTP-Server einzurichten"
@@ -781,11 +781,11 @@ msgstr ""
 "einzurichten. Mit \"Zurück\" können Sie Korrekturen an den Werten vornehmen."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP-Server:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP-Server:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -809,7 +809,7 @@ msgid "Allow FXP"
 msgstr "FXP erlauben"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Der Assistent hat den Intranet/Internet FTP-Server erfolgreich eingerichtet."
 
@@ -867,12 +867,12 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Ziel-Verzeichnis schon in Benutzung, bitte wählen Sie ein anderes."
 
 #: ../installsrv_wizard/Installsrv.pm:83
 #, fuzzy
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Der Installations-Server wird mit diesen Parametern konfiguriert"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1094,7 +1094,7 @@ msgstr "Willkommen beim News-Assistenten"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internet-Hostnamen müssen in der Form \"host.domain.domaintyp\" angegeben "
@@ -1102,10 +1102,6 @@ msgstr ""
 "News-Server \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "News-Server"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1115,24 +1111,24 @@ msgstr ""
 "Sie ihn nicht kennen."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Name des News-Servers:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Je nach Ihrer Internetanbindung sollte die Aktualisierung alle sechs bis 24 "
 "Stunden stattfinden."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Aktualisierungsintervall"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1142,7 +1138,7 @@ msgstr ""
 "Aktualisierungen."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Aktualisierungsintervall (Std):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1159,31 +1155,30 @@ msgstr "Internet-News konfigurieren"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Der Assistent hat die folgenden Parameter\n"
 "zusammengestellt, um Ihren Internet-News-Dienst einzurichten:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Verwenden Sie \"Weiter\", um diese Werte zu akzeptieren und den Server "
 "einzurichten. Mit \"Zurück\" können Sie Korrekturen an den Werten vornehmen."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "News-Server:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Aktualisierungsintervall:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Der Assistent hat den Internet-News-Dienst erfolgreich eingerichtet."
@@ -1193,7 +1188,6 @@ msgid "NFS Wizard"
 msgstr "NFS-Assistent"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Alle - Keine Zugangsbeschränkung"
 
@@ -1206,27 +1200,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS-Server Konfigurations-Assistent"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Der Assistent wird Ihnen helfen, den NFS-Server für Ihr Netzwerk "
 "einzurichten."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS-Server"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Verzeichnis:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Zugriffskontrolle"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Zugangskontrolle"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Wählen Sie den Level, der Ihren Anforderungen entspricht. Im Zweifel ist "
@@ -1276,7 +1267,7 @@ msgid "Netmask :"
 msgstr "Netzmaske:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Der Assistent hat Ihren NFS-Server erfolgreich eingerichtet."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1289,25 +1280,22 @@ msgstr ""
 "korrekten Domänen-Namen, der weder leer noch 'localdomain' ist. Starten Sie "
 "DrakeConnect zur Korrektur."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS-Client"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1324,18 +1312,19 @@ msgstr "Computer als NIS-Client konfigurieren"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Sie müssen nur die NIS-Domäne und den NIS-Server angeben"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS-Server:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS-Domäne:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1354,11 +1343,6 @@ msgstr "NIS-Domäne: NIS-Domäne Ihres NIS-Servers."
 msgid "NIS server: name of your computer."
 msgstr "NIS-Server: Name Ihre Computers."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS-Server:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr ""
@@ -1379,22 +1363,6 @@ msgstr ""
 msgid "NIS directory:"
 msgstr "NIS-Verzeichnis:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Netzwerk-Datei:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1408,7 +1376,7 @@ msgstr "NIS-Server: Name des NIS-Servers."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1442,12 +1410,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Konfiguriere Ihr System als NIS-Client ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1535,7 +1503,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internet-Hostnamen müssen in der Form \"host.domain.domaintyp\" angegeben "
@@ -1591,15 +1559,6 @@ msgstr ""
 "Der Assistent hat die folgenden Parameter gesammelt, die gebraucht werden um "
 "Ihr Internet-Mail-Dienst zu konfigurieren:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Verwenden Sie \"Weiter\", um diese Werte zu akzeptieren und den Server "
-"einzurichten. Mit \"Zurück\" können Sie Korrekturen an den Werten vornehmen."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1739,6 +1698,20 @@ msgid "Disk space (MB):"
 msgstr "Speicherplatz (MB)"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Zugriffskontrolle"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Wählen Sie den Level, der Ihren Anforderungen entspricht. Im Zweifel ist "
+"'Lokales Netzwerk' die beste Wahl. Achtung! Der Level 'Alle' könnte nicht "
+"sicher sein."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Der Proxy kann konfiguriert werden um verschiedene Zugangskontrollebenen zu "
@@ -1809,6 +1782,15 @@ msgstr ""
 "Der Assistent hat folgende Parameter gesammelt, die er für die Konfiguration "
 "des Proxys braucht:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Verwenden Sie \"Weiter\", um diese Werte zu akzeptieren und den Server "
+"einzurichten. Mit \"Zurück\" können Sie Korrekturen an den Werten vornehmen."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2201,15 +2183,16 @@ msgstr "Samba-Assistent"
 msgid "%s does not exist."
 msgstr "%s existiert nicht."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Alle - Keine Zugangsbeschränkung"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Meine Regeln - Frag mich nach erlaubten und verbotenen Rechnern"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba Konfigurations-Assistent"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2218,6 +2201,10 @@ msgstr ""
 "Linux läuft, sich als File- und Printserver auszugben."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba Konfigurations-Assistent"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2241,7 +2228,7 @@ msgid "The Workgroup is wrong"
 msgstr "Die Arbeitsgruppe ist falsch"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
@@ -2255,20 +2242,16 @@ msgid "Banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Zugangskontrolle"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Zugangslevel:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Beispiel 1: Alle IPs im Bereich \"150.203.*.*\" erlauben, außer einer\n"
@@ -2317,7 +2300,7 @@ msgid "Deny hosts:"
 msgstr "Verweigerte Rechner:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Aktivierte Samba-Dienste"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2335,7 +2318,7 @@ msgid "Enable file sharing area"
 msgstr "Dateitauschplattform aktivieren"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Server-Drucker-Freigabe aktivieren"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2373,7 +2356,7 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
 #, fuzzy
-msgid "read list:"
+msgid "Read list:"
 msgstr "Leseliste:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2381,7 +2364,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "Schreibliste:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2404,15 +2387,15 @@ msgstr ""
 "die für die Konfiguration von Samba gebraucht werden."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Dateifreigabe:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Druck-Server:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2475,15 +2458,15 @@ msgstr ""
 "Wählen Sie einen primären und einen sekundären Server von der Liste aus."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Zeit-Server"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primärer Zeit-Server:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekundärer Zeit-Server:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2555,17 +2538,17 @@ msgid "Web wizard"
 msgstr "Web-Assistent"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Der Assisten wird Ihnen helfen den Web-Server für Ihr Netzwerk zu "
 "konfigurieren."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Web-Server Konfigurations-Assistent"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Klicken Sie kein Feld an, wenn Sie Ihren Web-Server nicht aktivieren wollen."
 
@@ -2574,23 +2557,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Wählen Sie die Web-Dienste aus, die Sie aktivieren möchten:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web-Server"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Ihr Server kann als ein Web-Server für Ihr internes Netz (Intranet) und für "
 "das Internet dienen."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Den Web-Server für das Intranet aktivieren"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Den Web-Server für das Internet aktivieren"
 
 #: ../web_wizard/Apache.pm:90
@@ -2635,18 +2618,18 @@ msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Geben Sie den Pfad des Verzeichnisses an, das 'document root' werden soll."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Document-Root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Konfiguriere den Web-Server"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Der Assistent hat folgende Parameter gesammelt, die für die Konfiguration "
 "Ihres Web-Servers gebraucht werden."
@@ -2659,16 +2642,12 @@ msgstr "Intranet Web-Server:"
 msgid "Internet web server:"
 msgstr "Internet Web-Server:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Document-Root:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Benutzer-Verzeichnis:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Der Assistent hat ihren Intranet/Internet Web-Server erfolgreich "
 "konfiguriert."
@@ -2683,6 +2662,37 @@ msgstr "Apache Web-Server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfiguriere Ihr System als Slave-DNS-Server..."
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr ""
+#~ "Der Assistent hat die DHCP-Dienste Ihres Servers erfolgreich eingerichtet."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP-Server"
+
+#~ msgid "News Server"
+#~ msgstr "News-Server"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS-Server"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS-Server:"
+
+#~ msgid "Network File:"
+#~ msgstr "Netzwerk-Datei:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Verwenden Sie \"Weiter\", um diese Werte zu akzeptieren und den Server "
+#~ "einzurichten. Mit \"Zurück\" können Sie Korrekturen an den Werten "
+#~ "vornehmen."
+
+#~ msgid "Document Root:"
+#~ msgstr "Document-Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Konfiguriere den Internet-E-Mail-Server"
 
@@ -3406,5 +3416,5 @@ msgstr "Konfiguriere Ihr System als Slave-DNS-Server..."
 #~ msgid "Client wizard"
 #~ msgstr "Klienten Assistent"
 
-#~ msgid "Highest IP address:"
+#~ msgid "Highest IP Address:"
 #~ msgstr "Höchste IP-Adresse:"
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index 6af34397..d7bf448b 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -40,7 +40,7 @@ msgstr ""
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -174,7 +174,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -189,15 +192,15 @@ msgid ""
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -221,7 +224,7 @@ msgid "The IP of the server must not be in range."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -255,7 +258,7 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -509,11 +512,11 @@ msgstr ""
 msgid "DNS server"
 msgstr ""
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr ""
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr ""
 
@@ -521,7 +524,7 @@ msgstr ""
 msgid "Mail server"
 msgstr ""
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr ""
 
@@ -577,15 +580,11 @@ msgid "FTP wizard"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:79
@@ -594,20 +593,20 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -619,7 +618,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -635,11 +634,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -662,8 +661,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -671,13 +670,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -687,11 +686,11 @@ msgid ""
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -715,7 +714,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -762,11 +761,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -971,43 +970,39 @@ msgstr ""
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr ""
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:76
@@ -1024,27 +1019,25 @@ msgstr ""
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1054,7 +1047,6 @@ msgid "NFS Wizard"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr ""
 
@@ -1067,25 +1059,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr ""
-
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 
@@ -1129,7 +1118,7 @@ msgid "Netmask :"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1138,16 +1127,13 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
+msgid "NIS client"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
@@ -1156,7 +1142,7 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1172,18 +1158,19 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1201,11 +1188,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr ""
@@ -1223,22 +1205,6 @@ msgstr ""
 msgid "NIS directory:"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
@@ -1250,7 +1216,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1280,11 +1246,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1360,7 +1326,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
@@ -1402,12 +1368,6 @@ msgid ""
 "external mail server:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
 msgstr ""
@@ -1529,6 +1489,17 @@ msgid "Disk space (MB):"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 
@@ -1583,6 +1554,13 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr ""
@@ -1930,12 +1908,12 @@ msgstr ""
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+#: ../samba_wizard/Samba.pm:65
+msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
+#: ../samba_wizard/Samba.pm:66
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
@@ -1945,6 +1923,10 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -1966,7 +1948,7 @@ msgid "The Workgroup is wrong"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
@@ -1980,11 +1962,7 @@ msgid "Banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
-msgstr ""
-
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
+msgid "The server banner is incorrect"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:114
@@ -1993,7 +1971,7 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2030,7 +2008,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
@@ -2045,7 +2023,7 @@ msgid "Enable file sharing area"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:142
@@ -2079,7 +2057,7 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2087,7 +2065,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:182
@@ -2107,15 +2085,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:220
@@ -2171,15 +2149,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2247,15 +2225,15 @@ msgid "Web wizard"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
@@ -2263,21 +2241,21 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:90
@@ -2311,18 +2289,18 @@ msgstr ""
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:137
@@ -2333,16 +2311,12 @@ msgstr ""
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr ""
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:236
diff --git a/po/el.po b/po/el.po
index 3895e428..047b5448 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -43,7 +43,7 @@ msgstr "Σφάλμα Οδηγού."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -202,7 +202,10 @@ msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει στη ρύθμιση των υπηρεσιών στον διακομιστή σας."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -221,16 +224,16 @@ msgstr ""
 "τις προτεινόμενες τιμές."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Μικρότερη Διεύθυνση ΙΡ:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Μεγαλύτερη διεύθυνση ΙΡ:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP Πύλης:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -257,7 +260,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Η IP του εξυπηρετητή πρέπει να είναι εκτός της περιοχής διευθύνσεων"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Ρυθμίζεται ο Διακομιστή DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -293,7 +296,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τις υπηρεσίες DHCP στον διακομιστή σας."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -578,12 +582,12 @@ msgstr "Διακομιστής NFS"
 msgid "DNS server"
 msgstr "Διακομιστής NFS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "Διακομιστής Ειδήσεων"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 #, fuzzy
 msgid "NFS server"
 msgstr "Διακομιστής NFS"
@@ -593,8 +597,7 @@ msgstr "Διακομιστής NFS"
 msgid "Mail server"
 msgstr "Όνομα Διακομιστή Αλληλογραφίας:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Διακομιστής FTP"
 
@@ -657,42 +660,38 @@ msgid "FTP wizard"
 msgstr "Οδηγός FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων Διακομιστή FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει στη ρύθμιση του Διακομιστή FTP στο δίκτυο "
 "σας. "
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Διακομιστής FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Επιλέξτε το είδος της υπηρεσίας FTP που θέλετε να ενεργοποιήσετε:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Ο διακομιστής σας μπορεί να λειτουργεί ως Διακομιστής FTP για το εσωτερικό "
 "σας δίκτυο (intranet) και ως διακομιστής FTP για το διαδίκτυο."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Ενεργοποίηση του διακομιστή FTP για το Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Ενεργοποίηση του Διακομιστή FTP για το Διαδίκτυο"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -704,7 +703,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -720,11 +719,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -751,8 +750,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -760,14 +759,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Συγγνώμη, πρέπει να είστε root για να το κάνετε αυτό..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Ρυθμίζεται ο διακομιστής FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "τον Διακομιστή FTP"
@@ -782,11 +781,11 @@ msgstr ""
 "κλικ στο Επόμενο ή επιλέξτε Πίσω για να τις διορθώσετε."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Διακομιστής Intranet FTP:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Διακομιστής FTP διαδικτύου:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -810,7 +809,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον Διακομιστή Διαδικτύου/Intranet FTP"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -858,11 +857,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1087,7 +1086,7 @@ msgstr "Καλώς Ορίσατε στον Οδηγό Ειδήσεων"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Το όνομα κεντρικού υπολογιστή διαδικτύου πρέπει να είναι της μορφής \"host."
@@ -1095,10 +1094,6 @@ msgstr ""
 "διακομιστής ειδήσεων διαδικτύου είναι συνήθως \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Διακομιστής Ειδήσεων"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1108,24 +1103,24 @@ msgstr ""
 "παροχέας σας."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Όνομα Διακομιστή Ειδήσεων:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Ανάλογα με το είδος της σύνδεσης στο διαδίκτυο, μια καλή περίοδος ερωτήσεων "
 "μπορεί να είναι μεταξύ 6 και 24 ώρες."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Περίοδος Ερωτήσεων"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1134,7 +1129,7 @@ msgstr ""
 "τη μεταξύ δύο συνεχόμενων ερωτήσεων."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Περίοδος Ερωτήσεων (Ώρες):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1152,31 +1147,30 @@ msgstr "Ρυθμίζονται οι Ειδήσεις Διαδικτύου"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "την υπηρεσία Ειδήσεων Διαδικτύου:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Για να γίνουν δεκτές αυτές οι τιμές, και να ρυθμιστεί ο διακομιστής, κάντε "
 "κλικ στο Επόμενο ή επιλέξτε Πίσω για να τις διορθώσετε."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Διακομιστής Ειδήσεων:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Διάστημα Ερωτήσεων:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1188,7 +1182,6 @@ msgid "NFS Wizard"
 msgstr "Οδηγός NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Όλοι - Χωρίς περιορισμούς πρόσβασης"
 
@@ -1201,27 +1194,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Οδηγός Ρυθμίσεων Διακομιστή NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει στη ρύθμιση του Διακομιστή NFS για το δίκτυό "
 "σας."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Διακομιστής NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Κατάλογος:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Έλεγχος Πρόσβασης"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Επιλέξτε το επίπεδο που ταιριάζει στις ανάγκες σας. Αν δεν ξέρετε, το "
@@ -1271,7 +1261,7 @@ msgid "Netmask :"
 msgstr "Μάσκα Δικτύου:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον Διακομιστή NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1280,28 +1270,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Διακομιστής Ειδήσεων"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "IP Πελάτη:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Διακομιστής Ειδήσεων"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1317,19 +1303,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Διακομιστής NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1347,12 +1334,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Διακομιστής NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1374,23 +1355,6 @@ msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομ
 msgid "NIS directory:"
 msgstr "Κατάλογος Χρήστη:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Συσκευή Δικτύου"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1403,7 +1367,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1438,12 +1402,12 @@ msgstr "Ρυθμίζεται ο Διακομιστής DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Διακομιστής Ειδήσεων"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Ρυθμίζεται ο Διακομιστής DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1533,7 +1497,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Τα ονόματα υπολογιστών διαδικτύου πρέπει να είναι της μορφής \"host.domain."
@@ -1586,15 +1550,6 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "την υπηρεσία Αλληλογραφία Διαδικτύου"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Για να γίνουν δεκτές αυτές οι τιμές, και να ρυθμιστεί ο διακομιστής, κάντε "
-"κλικ στο Επόμενο ή επιλέξτε Πίσω για να τις διορθώσετε."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1738,6 +1693,20 @@ msgid "Disk space (MB):"
 msgstr "Χώρος δίσκου (MB): "
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Έλεγχος Πρόσβασης"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Επιλέξτε το επίπεδο που ταιριάζει στις ανάγκες σας. Αν δεν ξέρετε, το "
+"επίπεδο, το Τοπικό Δίκτυο είναι συνήθως το πιο σωστό. Προσοχή, το επίπεδο "
+"Όλα μπορεί να μην είναι ασφαλές."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1806,6 +1775,15 @@ msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "το proxy σας:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Για να γίνουν δεκτές αυτές οι τιμές, και να ρυθμιστεί ο διακομιστής, κάντε "
+"κλικ στο Επόμενο ή επιλέξτε Πίσω για να τις διορθώσετε."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Θύρα:"
@@ -2169,17 +2147,18 @@ msgstr "Οδηγός Samba"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Όλοι - Χωρίς περιορισμούς πρόσβασης"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 "Οι κανόνες μου - Ρωτήστε με ποιοι είναι οι επιτρεπόμενοι και ποιοι οι "
 "απαγορευμένοι υπολογιστές"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Οδηγός Ρυθμίσεων Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2188,6 +2167,10 @@ msgstr ""
 "αρχείων και εξυπηρετητή εκτυπώσεων για σταθμούς εργασίας χωρίς Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Οδηγός Ρυθμίσεων Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2211,7 +2194,7 @@ msgid "The Workgroup is wrong"
 msgstr "Η Ομάδα εργασίας είναι λάθος"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Αρχικό μήνυμα διακομιστή."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2227,13 +2210,9 @@ msgid "Banner:"
 msgstr "Αρχικό μήνυμα διακομιστή:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Το Αρχικό Μήνυμα του Διακομιστή είναι λανθασμένο"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Έλεγχος Πρόσβασης"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Επίπεδο πρόσβασης :"
@@ -2241,7 +2220,7 @@ msgstr "Επίπεδο πρόσβασης :"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Παράδειγμα 1: επέτρεψε όλα τις IP στο 150.203.*.*; εκτός από μια\\nhosts "
@@ -2292,7 +2271,7 @@ msgid "Deny hosts:"
 msgstr "Απέτρεψε τους υπολογιστές:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Ενεργοποιημένες Υπηρεσίες Samba"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2310,7 +2289,7 @@ msgid "Enable file sharing area"
 msgstr "Ενεργοποίηση της περιοχής κοινόχρηστων αρχείων"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Ενεργοποίηση του Διακομιστή Κοινής Χρήσης Εκτυπωτών"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2351,7 +2330,7 @@ msgstr ""
 "δικαιωμάτων."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "λίστα ανάγνωσης:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2359,7 +2338,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "λίστα εγγραφής:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2382,15 +2361,15 @@ msgstr ""
 "το Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Αρχικό Μήνυμα Διακομιστή:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Κοινή Χρήση Αρχείων:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Εξυπηρετητής Εκτυπώσεων:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2452,15 +2431,15 @@ msgstr ""
 "Επιλέξτε έναν πρωτεύοντα και ένα δευτερεύοντα εξυπηρετητή από τη λίστα."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Εξυπηρετητές Ώρας"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Πρωτεύων Εξυπηρετητή Ώρας:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Δευτερεύων Εξυπηρετητής Ώρας:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2538,17 +2517,17 @@ msgid "Web wizard"
 msgstr "Οδηγός Ιστού"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Αυτός ο οδηγός θα σας βοηθήσει στη ρύθμιση τον Διακομιστή Ιστού για το "
 "δίκτυό σας."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Οδηγός Ρυθμίσεων Διακομιστή Ιστού"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Μην τσεκάρετε κανένα κουτί αν δεν θέλετε να ενεργοποιήσετε τον Διακομιστή "
 "Ιστού."
@@ -2558,23 +2537,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Επιλέξτε το είδος της υπηρεσίας Ιστού που θέλετε να ενεργοποιήσετε:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Διακομιστής Ιστού"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Ο διακομιστής σας μπορεί να λειτουργεί ως Διακομιστής Ιστού για το εσωτερικό "
 "σας δίκτυο (intranet) και ως διακομιστής Ιστού για το Διαδίκτυο."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Ενεργοποίηση του Διακομιστή Ιστού για το Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Ενεργοποίηση του Διακομιστή Ιστού για το Διαδίκτυο"
 
 #: ../web_wizard/Apache.pm:90
@@ -2620,18 +2599,18 @@ msgstr ""
 "Εισάγετε τη θέση του καταλόγου που θέλετε να γίνει ο αρχικός κατάλογος "
 "εγγράφων."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Αρχικός Κατάλογος Εγγράφων:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Ρύθμιση του Διακομιστή Ιστού"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Ο οδηγός συνέλεξε τις παρακάτω παραμέτρους που απαιτούνται για να ρυθμίσει "
 "τον Διακομιστή Ιστού"
@@ -2644,16 +2623,12 @@ msgstr "Διακομιστής ιστού Intranet:"
 msgid "Internet web server:"
 msgstr "Διακομιστής Ιστού Διαδικτύου:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Αρχικός Κατάλογος Εγγράφων:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Κατάλογος Χρήστη:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Ο οδηγός ρύθμισε με επιτυχία τον διακομιστή Ιστού Διαδικτύου/Intranet"
 
 #: ../web_wizard/Apache.pm:236
@@ -2666,6 +2641,42 @@ msgstr "Διακομιστής ιστού Intranet:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ρυθμίζεται ο Διακομιστής DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr ""
+#~ "Ο οδηγός ρύθμισε με επιτυχία τις υπηρεσίες DHCP στον διακομιστή σας."
+
+#~ msgid "FTP Server"
+#~ msgstr "Διακομιστής FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Διακομιστής Ειδήσεων"
+
+#~ msgid "NFS Server"
+#~ msgstr "Διακομιστής NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Διακομιστής Ειδήσεων"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Διακομιστής NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Συσκευή Δικτύου"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Για να γίνουν δεκτές αυτές οι τιμές, και να ρυθμιστεί ο διακομιστής, "
+#~ "κάντε κλικ στο Επόμενο ή επιλέξτε Πίσω για να τις διορθώσετε."
+
+#~ msgid "Document Root:"
+#~ msgstr "Αρχικός Κατάλογος Εγγράφων:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Ρυθμίζεται η Αλληλογραφία Διαδικτύου"
 
diff --git a/po/eo.po b/po/eo.po
index 36f7ce99..ee846cdb 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -43,7 +43,7 @@ msgstr "Sorĉil-eraro."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -196,7 +196,10 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -215,16 +218,16 @@ msgstr ""
 "proponitajn valorojn."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Plej malalta IP-adreso:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Plej alta IP-adreso:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Kluza IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -252,7 +255,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Konfigurante la DHCP-servilon"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -288,7 +291,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "La sorĉilo sukcese konfiguris la DHCP-servojn de via servilo."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -573,23 +577,20 @@ msgstr "NFS-servilo"
 msgid "DNS server"
 msgstr "NFS-servilo"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "Novaĵ-servilo"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS-servilo"
 
 #: ../drakwizard.pl:45
-#, fuzzy
 msgid "Mail server"
-msgstr "Nomo de poŝt-servilo:"
+msgstr "Poŝt-servilo"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP-servilo"
 
@@ -604,9 +605,8 @@ msgid "Proxy"
 msgstr "Prokura pordo"
 
 #: ../drakwizard.pl:49
-#, fuzzy
 msgid "Time server"
-msgstr "Tempo-serviloj"
+msgstr "Tempo-servilo"
 
 #: ../drakwizard.pl:50
 #, fuzzy
@@ -652,40 +652,36 @@ msgid "FTP wizard"
 msgstr "FTP-sorĉilo"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Sorĉilo por konfigurado de FTP-servilo"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Tiu ĉi sorĉilo helpos vin konfiguri la FTP-servilon por via reto."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP-servilo"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Via servilo povas konduti kiel FTP-servilo al via interna reto (intrareto) "
 "kaj kiel FTP-servilo por la interreto."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Enŝaltu la FTP-servilon por la intrareto"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Enŝaltu la FTP-servilon por la interreto"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -697,7 +693,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -713,11 +709,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -743,8 +739,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -752,14 +748,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Bedaŭrinde, vi devas esti root por tion fari..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Mi konfiguras la FTP-servilon"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "La sorĉilo kolektis la sekvajn parametrojn bezonatajn por konfiguri vian FTP-"
 "servilon"
@@ -774,11 +770,11 @@ msgstr ""
 "butonon aŭ uzu la Reen-butonon por korekti ilin."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intrareta FTP-servilo:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Interreta FTP-servilo:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -802,7 +798,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "La sorĉilo sukcese konfiguris vian intraretan/interretan FTP-servilon"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -850,11 +846,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1079,7 +1075,7 @@ msgstr "Bonvenon al la Novaĵ-sorĉilo"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Interretaj gastiganto-nomoj devas esti en la formo \"host.domain.domaintype"
@@ -1087,10 +1083,6 @@ msgstr ""
 "servo estas kutime \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Novaĵ-servilo"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1100,24 +1092,24 @@ msgstr ""
 "provizisto."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nomo de novaĵ-servilo:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Depende de la speco de via interret-konekto, taŭga skrutini-periodo povas "
 "ŝanĝi inter 6 kaj 24 horoj."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Skrutini-periodo"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1126,7 +1118,7 @@ msgstr ""
 "sinsekvaj skrutinioj:"
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Skrutini-periodo (horoj):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1144,31 +1136,30 @@ msgstr "Mi konfiguras la interret-novaĵojn"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "La sorĉilo kolektis sekvajn parametrojn bezonatajn por konfiguri vian "
 "interretan novaĵ-servon:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Por akcepti tiujn valorojn kaj konfiguri vian servilon, alklaku la Daŭrigu-"
 "butonon aŭ uzu la Reen-butonon por korekti ilin."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Novaĵ-servilo:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Skrutini-intervalo:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1179,7 +1170,6 @@ msgid "NFS Wizard"
 msgstr "NFS-sorĉilo"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Ĉiuj - Neniu aliro-restrikto"
 
@@ -1192,25 +1182,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Sorĉilo por konfigurado de NFS-servilo"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Tiu ĉi sorĉilo helpos vin konfiguri la NFS-servilon por via reto."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS-servilo"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Dosierujo:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Alirkontrolo"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Alir-kontrolo"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Elektu la taŭgan nivelon por viaj bezonoj. Se vi ne scias, la Loka Ret-"
@@ -1259,7 +1246,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "La sorĉilo sukcese konfiguris vian NFS-servilon"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1268,28 +1255,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Novaĵ-servilo"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Klienta IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Novaĵ-servilo"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1305,19 +1288,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS-servilo"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1335,12 +1319,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS-servilo"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1362,23 +1340,6 @@ msgstr "La sorĉilo sukcese konfiguris vian Samba-servilon."
 msgid "NIS directory:"
 msgstr "Uzul-dosierujo:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Ret-disponaĵo"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1391,7 +1352,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1426,12 +1387,12 @@ msgstr "Konfigurante la DNS-servilon"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Novaĵ-servilo"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurante la DNS-servilon"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1518,7 +1479,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Interretaj gastigant-nomoj devas esti en la formo \"host.domain.domaintype"
@@ -1571,15 +1532,6 @@ msgstr ""
 "La sorĉilo kolektis jenajn parametrojn bezonatajn por konfiguri vian "
 "interretan poŝt-servon:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Por akcepti tiujn valorojn kaj konfiguri vian servilon, alklaku la Daŭrigu-"
-"butonon aŭ uzu la Reen-butonon por korekti ilin."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1716,6 +1668,20 @@ msgid "Disk space (MB):"
 msgstr "Disko-spaco (MB)"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Alirkontrolo"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Elektu la taŭgan nivelon por viaj bezonoj. Se vi ne scias, la Loka Ret-"
+"nivelo estas kutime la plej taŭga. Konsciu ke 'Ĉiuj niveloj' eble ne estas "
+"sekura."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1785,6 +1751,15 @@ msgstr ""
 "La sorĉilo kolektis jenajn parametrojn bezonatajn por konfiguri vian "
 "prokuron:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Por akcepti tiujn valorojn kaj konfiguri vian servilon, alklaku la Daŭrigu-"
+"butonon aŭ uzu la Reen-butonon por korekti ilin."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Pordo:"
@@ -2148,15 +2123,16 @@ msgstr "Samba-sorĉilo"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Ĉiuj - Neniu aliro-restrikto"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Miaj reguloj - Demandu min pri permesitaj kaj rifuzitaj gastigantoj"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Sorĉilo por Samba-konfigurado"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2165,6 +2141,10 @@ msgstr ""
 "laborstacioj funkciantaj per nelinuksaj sistemoj."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Sorĉilo por Samba-konfigurado"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Tiu ĉi sorĉilo helpos vin konfiguri la Samba-servojn de via servilo."
@@ -2186,7 +2166,7 @@ msgid "The Workgroup is wrong"
 msgstr "La laborgrupo malĝustas"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Servil-rubando."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2202,13 +2182,9 @@ msgid "Banner:"
 msgstr "Rubando:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "La servil-rubando malĝustas"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Alir-kontrolo"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Alir-nivelo:"
@@ -2216,7 +2192,7 @@ msgstr "Alir-nivelo:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Ekzemplo 1: permesu ĉiujn IP-ojn en 150.203.*.*; escepte de unu\\nhosts "
@@ -2265,7 +2241,7 @@ msgid "Deny hosts:"
 msgstr "Rifuzu gastigantojn:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Enŝaltitaj Samba-servoj"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2283,7 +2259,7 @@ msgid "Enable file sharing area"
 msgstr "Enŝaltu areon de dosiera opuzado"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Enŝaltu opuzon de servil-presilo"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2322,7 +2298,7 @@ msgstr ""
 "tiu ĉi: \\nroot, fred, @users, @wheel por ĉiu speco de permeso."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "legu liston:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2330,7 +2306,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "skribu liston:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2352,15 +2328,15 @@ msgstr ""
 "La sorĉilo kolektis jenajn parametrojn bezonatajn por konfiguri Samba-on."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Servil-rubando:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Dosier-opuzo:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Presil-servilo:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2419,15 +2395,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Elektu primaran kaj sekundaran servilon de la listo."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Tempo-serviloj"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primara tempo-servilo:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekundara Tempo-servilo:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2503,15 +2479,15 @@ msgid "Web wizard"
 msgstr "Teksaĵ-sorĉilo"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Tiu ĉi sorĉilo helpos vin konfiguri la Teksaĵ-servilon por via reto."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Sorĉilo por konfiguri Teksaĵ-servilon"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Kontrolu nenian keston se vi ne deziras aktivigi vian Teksaĵ-servilon."
 
 #: ../web_wizard/Apache.pm:77
@@ -2519,23 +2495,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Elektu la specon de Teksaĵ-servilo kiun vi deziras aktivigi:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Teksaĵ-servilo"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Via servilo povas agi kiel Teksaĵ-servilo rilate al via interna reto "
 "(intrareto) kaj kiel Teksaĵ-servilo por la Interreto."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Enŝaltu la Teksaĵ-servilon por la Intrareto"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Enŝaltu la Teksaĵ-servilon por la Interreto"
 
 #: ../web_wizard/Apache.pm:90
@@ -2579,18 +2555,18 @@ msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Entajpu la padon de la dosieruno kiun vi deziras esti la document root."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Document root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Mi konfiguras la Teksaĵ-servilon"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "La sorĉilo kolektis jenajn parametrojn bezonatajn por konfiguri vian Teksaĵ-"
 "servilon"
@@ -2603,16 +2579,12 @@ msgstr "Intrareta teksaĵ-servilo:"
 msgid "Internet web server:"
 msgstr "Interreta teksaĵ-servilo:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Document root:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Uzul-dosierujo:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "La sorĉilo sukcese konfiguris vian intraretan/interretan Teksaĵ-servilon"
 
@@ -2626,6 +2598,41 @@ msgstr "Intrareta teksaĵ-servilo:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurante la DNS-servilon"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "La sorĉilo sukcese konfiguris la DHCP-servojn de via servilo."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP-servilo"
+
+#~ msgid "News Server"
+#~ msgstr "Novaĵ-servilo"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS-servilo"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Novaĵ-servilo"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS-servilo"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Ret-disponaĵo"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Por akcepti tiujn valorojn kaj konfiguri vian servilon, alklaku la "
+#~ "Daŭrigu-butonon aŭ uzu la Reen-butonon por korekti ilin."
+
+#~ msgid "Document Root:"
+#~ msgstr "Document Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Mi konfiguras la interretan poŝton"
 
diff --git a/po/es.po b/po/es.po
index 7299b642..01bba779 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-23 08:49-0300\n"
 "Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -38,7 +38,7 @@ msgstr "Error."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -190,9 +190,11 @@ msgstr ""
 "Este asistente lo ayudar� a configurar los servicios DHCP de su servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Si desea habilitar PXE para su servidor DHCP, por favor marque la casilla."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -210,15 +212,15 @@ msgstr ""
 "192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Direcci�n IP m�s baja:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Direcci�n IP m�s alta:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Direcci�n IP de la pasarela:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -242,7 +244,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Configurando el servidor de DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -278,7 +280,8 @@ msgid "Interface:"
 msgstr "Interfaz:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "El asistente configur� exitosamente los servicios DHCP de su servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -567,11 +570,11 @@ msgstr "Servidor DHCP"
 msgid "DNS server"
 msgstr "Servidor DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Servidor de noticias"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Servidor NFS"
 
@@ -579,7 +582,7 @@ msgstr "Servidor NFS"
 msgid "Mail server"
 msgstr "Servidor de correo"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Servidor FTP"
 
@@ -637,39 +640,35 @@ msgid "FTP wizard"
 msgstr "Asistente de FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Asistente de configuraci�n del servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Este asistente lo ayudar� a configurar un servidor FTP para su red."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Activar el servidor FTP para la Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Activar el servidor FTP para la Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Correo admin: direcci�n de correo electr�nico del administrador FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -684,7 +683,7 @@ msgstr ""
 "Permitir FXP: permitir transferencia de archivos por medio de otro FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Chroot home usuario: los usuarios s�lo ver�n sus directorios personales."
 
@@ -701,11 +700,11 @@ msgid "Admin email:"
 msgstr "Correo del admin:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Permitir conexi�n de root:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot home usuario:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -731,8 +730,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 "No puedo encontrar a bash en la lista de shells �Parece que lo modific� a "
 "mano! Por favor, corrija."
@@ -742,13 +741,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Lo siento, debe ser el superusuario (root) para hacer esto..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Configurando el servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "El asistente recolect� los par�metros siguientes necesarios para configurar "
 "su servidor FTP"
@@ -762,11 +761,11 @@ msgstr ""
 "bot�n Siguiente o utilice el bot�n Anterior para corregirlos"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Servidor FTP Intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Servidor de FTP Internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -790,7 +789,7 @@ msgid "Allow FXP"
 msgstr "Permitir FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "El asistente configur� exitosamente su servidor FTP Intranet/Internet"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -844,11 +843,11 @@ msgstr ""
 "directorio de instalaci�n de Mandrake completo."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The 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 "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Configurar� su servidor de instalaci�n con dichos par�metros"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1067,7 +1066,7 @@ msgstr "Bienvenido al asistente de Noticias"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Los nombres de host de Internet deben ser de la forma \"host.dominio."
@@ -1075,10 +1074,6 @@ msgstr ""
 "servidor de noticias de Internet por lo general es \"news.proveedor.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Servidor de noticias"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1088,24 +1083,24 @@ msgstr ""
 "nombre."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nombre del servidor de noticias:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Dependiendo del tipo de conexi�n de Internet que tenga, un per�odo de "
 "consulta apropiado puede variar entre 6 y 24 horas."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Per�odo de consulta"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1114,7 +1109,7 @@ msgstr ""
 "entre dos consultas consecutivas."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Per�odo de consulta (horas):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1131,31 +1126,30 @@ msgstr "Configurando las noticias de Internet"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "El asistente recolect� los par�metros siguientes\n"
 "necesarios para configurar su servicio de Noticias de Internet:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"Para aceptar estos valores, y configurar su servidor, haga clic sobre el "
-"bot�n Siguiente o utilice el bot�n Anterior para corregirlos."
+"Para aceptar dichos valores, y configurar su servidor, haga clic sobre el "
+"bot�n Siguiente o utilice el bot�n Anterior para corregirlos"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Servidor de noticias:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Intervalo de consulta:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1167,7 +1161,6 @@ msgid "NFS Wizard"
 msgstr "Asistente NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Todo - Sin restricci�n de acceso"
 
@@ -1180,25 +1173,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Asistente de configuraci�n del servidor NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Este asistente lo ayudar� a configurar el servidor NFS para su red."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Servidor NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Directorio:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Control de acceso"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Seleccione el nivel que se ajusta a sus necesidades. Si no sabe qu� elegir, "
@@ -1248,7 +1238,7 @@ msgid "Netmask :"
 msgstr "M�scara de red:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "El asistente configur� exitosamente su servidor NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1259,18 +1249,15 @@ msgstr ""
 "Debe volver a ajustar su nombre de dominio NIS. Para un servidor NIS "
 "necesita un nombre de dominio NIS correcto, distinto a 'localdomain' o vac�o."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "Servidor NIS + Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Servidor NIS + Autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
@@ -1279,7 +1266,7 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Los clientes pueden montar autom�ticamente sus directorios personales cuando "
@@ -1297,18 +1284,19 @@ msgstr "Configurar la computadora como cliente NIS"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "S�lo tiene que poner nisdomain y nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Servidor NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Dominio NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 "Un servidor NIS es �til para crear bases de datos de hosts y usuarios. El "
@@ -1334,11 +1322,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr "Servidor NIS: nombre de su computadora."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Servidor NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Home NIS:"
@@ -1356,22 +1339,6 @@ msgstr "El asistente configurar� su servidor NIS con mapeo autofs"
 msgid "NIS directory:"
 msgstr "Directorio NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Archivo de red:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "Exportado por NFS:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Master autom�tico:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Home Autom�tico:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nombre de dominio NIS: nombre del dominio NIS."
@@ -1383,7 +1350,7 @@ msgstr "Servidor NIS: Nombre de host del servidor NIS."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 "El demonio YPBIND encuentra el servidor para los dominios NIS y mantiene la "
 "informaci�n de enlace del demonio NIS."
@@ -1417,11 +1384,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Configurando su sistema para ser un servidor NIS+Autofs..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Servidor NIS + Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Configurando su sistema como Cliente NIS..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1514,7 +1481,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Los nombres de host de Internet deben ser de la forma \"host.dominio."
@@ -1570,15 +1537,6 @@ msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su servicio de Correo de Internet:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Para aceptar dichos valores, y configurar su servidor, haga clic sobre el "
-"bot�n Siguiente o utilice el bot�n Anterior para corregirlos"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1715,6 +1673,20 @@ msgid "Disk space (MB):"
 msgstr "Espacio en disco (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Control de acceso"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Seleccione el nivel que se ajusta a sus necesidades. Si no sabe qu� elegir, "
+"generalemente el nivel Red Local es el m�s apropiado. Tenga presente que el "
+"nivel Todo puede no ser seguro."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "El proxy se puede configurar para utilizar niveles de control de acceso "
@@ -1784,6 +1756,15 @@ msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su proxy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Para aceptar estos valores, y configurar su servidor, haga clic sobre el "
+"bot�n Siguiente o utilice el bot�n Anterior para corregirlos."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Puerto:"
@@ -2198,15 +2179,16 @@ msgstr "Asistente de Samba"
 msgid "%s does not exist."
 msgstr "%s no existe."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Todo - Sin restricci�n de acceso"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mis reglas - Preguntarme los hosts permitidos y negados"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Asistente de configuraci�n de Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2215,6 +2197,10 @@ msgstr ""
 "impresoras para las estaciones de trabajo que no corren sistemas Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Asistente de configuraci�n de Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2237,7 +2223,7 @@ msgid "The Workgroup is wrong"
 msgstr "El Grupo de trabajo es incorrecto"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Cartel del servidor."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2253,20 +2239,16 @@ msgid "Banner:"
 msgstr "Cartel:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "El Cartel del Servidor es incorrecto"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Control de acceso"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Nivel de acceso:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Ejemplo 1: permitir todas las IP en 150.203.*.*; excepto una\n"
@@ -2314,7 +2296,7 @@ msgid "Deny hosts:"
 msgstr "Negar hosts:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Servicios Samba habilitados"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2332,7 +2314,7 @@ msgid "Enable file sharing area"
 msgstr "Habilitar el �rea para compartir archivos"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Habilitar el compartir impresoras del servidor"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2372,7 +2354,7 @@ msgstr ""
 "root, fred, @usuarios, @wheel para cada tipo de permiso."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "lista de lectura:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2380,7 +2362,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "lista de escritura:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2402,15 +2384,15 @@ msgstr ""
 "El asistente recolect� los par�metros siguientes para configurar Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Cartel del servidor:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Compartir archivos:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Servidor de Impresi�n:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2471,15 +2453,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Seleccione un servidor primario y uno secundario de la lista."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Servidores de la hora"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Servidor de la hora primario:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Servidor de la hora secundario:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2553,15 +2535,15 @@ msgid "Web wizard"
 msgstr "Asistente web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Este asistente lo ayudar� a configurar el servidor Web para su red."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Asistente de configuraci�n del servidor web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "No marque casilla alguna si no desea activar su servidor web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2569,23 +2551,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Seleccione el tipo de servicio web que desea activar:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Servidor web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Su servidor puede actuar como un servidor web hacia su red interna "
 "(Intranet) y como un servidor web para la Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Habilitar el servidor web para la Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Habilitar el servidor web para la Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2630,18 +2612,18 @@ msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Ingrese la ruta del directorio que desea que sea la ra�z de los documentos."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Ra�z de los documentos:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Configurando el servidor web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su servidor web"
@@ -2654,16 +2636,12 @@ msgstr "Servidor web Intranet:"
 msgid "Internet web server:"
 msgstr "Servidor web de Internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Ra�z de los documentos:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Directorio de usuario:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "El asistente configur� exitosamente su servidor web Intranet/Internet"
 
 #: ../web_wizard/Apache.pm:236
@@ -2674,6 +2652,52 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando su sistema como un servidor Apache ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Si desea habilitar PXE para su servidor DHCP, por favor marque la casilla."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr ""
+#~ "El asistente configur� exitosamente los servicios DHCP de su servidor."
+
+#~ msgid "FTP Server"
+#~ msgstr "Servidor FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Servidor de noticias"
+
+#~ msgid "NFS Server"
+#~ msgstr "Servidor NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Servidor NIS + Autofs"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Servidor NIS:"
+
+#~ msgid "Network File:"
+#~ msgstr "Archivo de red:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "Exportado por NFS:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Master autom�tico:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Home Autom�tico:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Para aceptar dichos valores, y configurar su servidor, haga clic sobre el "
+#~ "bot�n Siguiente o utilice el bot�n Anterior para corregirlos"
+
+#~ msgid "Document Root:"
+#~ msgstr "Ra�z de los documentos:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Configurando el correo de Internet"
 
@@ -3581,8 +3605,8 @@ msgstr "Configurando su sistema como un servidor Apache ..."
 #~ msgid "by the DHCP service; unless you have special needs,"
 #~ msgstr "por el servicio DHCP; a no ser que tenga necesidades especiales,"
 
-#~ msgid "Highest IP address:"
-#~ msgstr "Direcci�n IP mas alta:"
+#~ msgid "Highest IP Address:"
+#~ msgstr "Direcci�n IP m�s alta:"
 
 #~ msgid "the DHCP services of your server."
 #~ msgstr "los servicios DHCP de tu servidor."
@@ -3593,7 +3617,7 @@ msgstr "Configurando su sistema como un servidor Apache ..."
 #~ msgid "you can safely accept the proposed values."
 #~ msgstr "puedes aceptar de forma segura los valores propuestos."
 
-#~ msgid "Lowest  IP Address:"
+#~ msgid "Lowest  IP address:"
 #~ msgstr "Direcci�n IP mas baja:"
 
 #~ msgid "networking addresses to your workstations."
@@ -3694,9 +3718,6 @@ msgstr "Configurando su sistema como un servidor Apache ..."
 #~ msgid "Firewall configuration wizard"
 #~ msgstr "Asistente de configuraci�n del cortafuegos"
 
-#~ msgid "Samba configuration wizard"
-#~ msgstr "Asistente de configuraci�n del Samba"
-
 #~ msgid "is usually \"news.provider.com\"."
 #~ msgstr "normalmente es \"news.provider.com\"."
 
@@ -3706,8 +3727,5 @@ msgstr "Configurando su sistema como un servidor Apache ..."
 #~ msgid "End"
 #~ msgstr "Fin"
 
-#~ msgid "file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-squid.html"
-#~ msgstr "file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-squid.html"
-
 #~ msgid "with the Proxy configuration."
 #~ msgstr "con la configuraci�n del proxy."
diff --git a/po/et.po b/po/et.po
index 76b24b08..d630e7ef 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-25 16:53+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -39,7 +39,7 @@ msgstr "Viga."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -186,8 +186,11 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "Märkige, kui soovite lubada PXE oma DHCP serverile."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -204,15 +207,15 @@ msgstr ""
 "väärtustega (nt. 192.168.100.20 192.168.100.40)."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Väikseim IP aadress:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Suurim IP aadress:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Lüüsi (gateway) IP aadress:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -237,7 +240,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Serveri IP ei tohi olla vahemikus."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP serveri seadistamine"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -272,7 +275,8 @@ msgid "Interface:"
 msgstr "Liides:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Nõustaja seadistas edukalt serveri DHCP teenused."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -557,11 +561,11 @@ msgstr "DHCP server"
 msgid "DNS server"
 msgstr "DNS server"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Uudisteserver"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS server"
 
@@ -569,7 +573,7 @@ msgstr "NFS server"
 msgid "Mail server"
 msgstr "Meiliserver"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP server"
 
@@ -628,37 +632,33 @@ msgid "FTP wizard"
 msgstr "FTP nõustaja"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP serveri seadistamise nõustaja"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "See nõustaja aitab seadistada Teie võrgu FTP serveri."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP server"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "FTP serveri lubamine intraneti jaoks"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "FTP serveri lubamine Interneti jaoks"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Administraatori e-posti aadress: FTP haldaja e-posti aadress."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -672,7 +672,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "FXP lubamine: failiedastuse lubamine muu FTP vahendusel."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "Chroot Home kasutaja: kasutajad näevad ainult oma kodukataloogi."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -690,11 +690,11 @@ msgid "Admin email:"
 msgstr "Administraatori e-posti aadress:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Administraatori sisselogimise lubamine:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot Home kasutaja:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -717,8 +717,8 @@ msgstr "Palun valige, kas lubada FTP serverile sisesed või välised ühendused.
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "Bash puudub shellide nimekirjas. Palun kontrollige valikut."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -726,13 +726,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Vabandust, selleks peab olema administraator..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP serveri seadistamine"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja FTP serveri seadistamiseks"
 
@@ -745,11 +745,11 @@ msgstr ""
 "'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intraneti FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Interneti FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -773,7 +773,7 @@ msgid "Allow FXP"
 msgstr "FXP lubamine"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Nõustaja seadistas edukalt intraneti/Interneti FTP serveri"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -822,11 +822,11 @@ msgid ""
 msgstr "Viga: lähtekataloog peab sisaldama täielikku Mandrake kataloogipuud."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The 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 "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Teie paigaldusserver seadistatakse järgmiste parameetritega"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1044,7 +1044,7 @@ msgstr "Tere tulemast uudistegruppide nõustajasse"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Interneti masinanimed peavad olema kujul \"masin.domeen.domeenitüüp\". Kui "
@@ -1052,10 +1052,6 @@ msgstr ""
 "\"news.pakkuja.ee\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Uudisteserver"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1064,24 +1060,24 @@ msgstr ""
 "Tavaliselt annab selle Internetiteenuse pakkuja."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Uudisteserveri nimi:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Sõltuvalt Teie Internetiühendusest võib kohane pollimisperiood kõikuda 6 ja "
 "24 tunni vahel."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Pollimise periood"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1090,7 +1086,7 @@ msgstr ""
 "pollimise vahel."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Pollimise periood (tundides):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1107,31 +1103,29 @@ msgstr "Uudistegruppide seadistamine"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja\n"
 " uudistegruppide teenuse seadistamiseks:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Nende väärtustega nõustumiseks ja serveri seadistamiseks vajutage nupule "
-"'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta."
+"'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Uudisteserver:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Pollimise intervall:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Nõustaja seadistas edukalt serveri uudistegruppide teenuse."
@@ -1141,7 +1135,6 @@ msgid "NFS Wizard"
 msgstr "NFS nõustaja"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Kõik - ei mingeid ligipääsupiiranguid"
 
@@ -1154,25 +1147,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS serveri seadistamise nõustaja"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "See nõustaja aitab seadistada Teie NFS serveri."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS server"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Kataloog:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Ligipääsu kontroll"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Valige tase, mis vastab Teie vajadustele. Kui Te ei ole kindel, on enamasti "
@@ -1220,7 +1210,7 @@ msgid "Netmask :"
 msgstr "Võrgumask: "
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Nõustaja seadistas edukalt Teie NFS serveri"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1231,18 +1221,15 @@ msgstr ""
 "Teil tuleb täpsustada NIS domeeni nime. NIS serveril peab olema korrektne "
 "NIS domeeni nimi, mitte localdomain või üldse puuduma."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "NIS server Autofs tabeliga"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "NIS server Autofs tabeliga"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
@@ -1251,7 +1238,7 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Kasutaja saab automaatselt haakida oma kodukataloogi, kui logib sisse NIS "
@@ -1269,18 +1256,19 @@ msgstr "Süsteemi seadistamine NIS kliendiks"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Tuleb ainult anda NIS domeen ja server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS server:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS domeen:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 "NIS server on tulus kasutajate ja masinanimede andmebaasi loomiseks. "
@@ -1303,11 +1291,6 @@ msgstr "NIS domeen: Teie NIS serveri NIS domeen."
 msgid "NIS server: name of your computer."
 msgstr "NIS server: Teie arvuti nimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS server:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "NIS kodukataloog:"
@@ -1325,22 +1308,6 @@ msgstr "Nõustaja seadistab Teie NIS serveri Autofs tabeliga"
 msgid "NIS directory:"
 msgstr "NIS kataloog:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Võrgufail:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "NFS eksport:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Automaatne master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Automaatne kodu:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS domeeninimi: NIS domeeni nimi."
@@ -1352,7 +1319,7 @@ msgstr "NIS server: NIS serveri masinanimi."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 "YPBIND deemon otsib NIS domeenidele serveri ja hooldab NIS serverite "
 "sidumise infot."
@@ -1385,11 +1352,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Süsteemi seadistamine NIS serveriks Autofs tabeliga..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS Autofs tabeliga"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Süsteemi seadistamine NIS kliendiks..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1477,7 +1444,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Interneti masinanimi peab olema kujul \"masin.domeen.domeenitüüp\". Kui "
@@ -1528,14 +1495,6 @@ msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja välise meiliserveri "
 "seadistamiseks:"
 
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Nende väärtustega nõustumiseks ja serveri seadistamiseks vajutage nupule "
-"'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta"
-
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
 msgstr "Aadressi vorm"
@@ -1667,6 +1626,19 @@ msgid "Disk space (MB):"
 msgstr "Kettaruum (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Ligipääsu kontroll"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Valige tase, mis vastab Teie vajadustele. Kui Te ei ole kindel, on enamasti "
+"kohane kohtvõrgu tase. Pange tähele, et tase 'Kõik' ei pruugi olla turvaline."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Vahendajat võib seadistada erinevaid ligipääsu kontrolli tasemeid kasutades"
@@ -1733,6 +1705,15 @@ msgid ""
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja vahendaja seadistamiseks:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Nende väärtustega nõustumiseks ja serveri seadistamiseks vajutage nupule "
+"'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2116,15 +2097,16 @@ msgstr "Samba nõustaja"
 msgid "%s does not exist."
 msgstr "%s puudub."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Kõik - ei mingeid ligipääsupiiranguid"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Minu reeglid - küsi minu käest lubatud ja keelatud masinaid"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba seadistamise nõustaja"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2133,6 +2115,10 @@ msgstr ""
 "mis ei kasuta Linuxit."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba seadistamise nõustaja"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "See nõustaja aitab seadistada Teie serveri Samba-teenused."
@@ -2154,7 +2140,7 @@ msgid "The Workgroup is wrong"
 msgstr "Töögrupp on vale"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Serveri nimetus."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2169,20 +2155,16 @@ msgid "Banner:"
 msgstr "Nimetus:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Serveri nimetus ei ole korrektne"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Ligipääsu kontroll"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Ligipääsu tase:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Näide 1: kõigi IP-de lubamine aadressil 150.203.*.*, välja arvatud üks\n"
@@ -2229,7 +2211,7 @@ msgid "Deny hosts:"
 msgstr "Keelatud masinad:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Samba-teenused on lubatud"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2246,7 +2228,7 @@ msgid "Enable file sharing area"
 msgstr "Failide jagamisala lubamine"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Printserveri jagamise lubamine"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2285,7 +2267,7 @@ msgstr ""
 "root, fred, @users, @wheel igat liiki õiguse jaoks."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "lugemisõigusega:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2293,7 +2275,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "kirjutamisõigusega:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2313,15 +2295,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Nõustaja kogus järgmised andmed, mida on vaja Samba seadistamiseks."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Serveri nimetus:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Failijagamine:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Printserver:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2382,15 +2364,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Valige nimekirjast esmane ja teisene server."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Ajaserverid"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Esmane ajaserver:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Teisene ajaserver:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2463,15 +2445,15 @@ msgid "Web wizard"
 msgstr "Veebinõustaja"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "See nõustaja aitab seadistada Teie veebiserveri."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Veebiserveri seadistamise nõustaja"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Ärge märkige ühtegi kastikest, kui Te ei soovi oma veebiserverit aktiveerida."
 
@@ -2480,23 +2462,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Valige veebiteenus, mida soovite aktiveerida:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Veebiserver"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Server võib toimida veebiserverina nii Teie kohtvõrgu (intranet) kui "
 "Interneti jaoks."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Veebiserveri lubamine intranetile"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Veebiserveri lubamine Internetile"
 
 #: ../web_wizard/Apache.pm:90
@@ -2538,18 +2520,18 @@ msgstr "kasutaja http-alamkataloog: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Sisestage kataloogi asukoht, mis peaks olema dokumentide juurkataloog."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Dokumentide juurkataloog:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Veebiserveri seadistamine"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja veebiserveri seadistamiseks"
 
@@ -2561,16 +2543,12 @@ msgstr "Intraneti veebiserver:"
 msgid "Internet web server:"
 msgstr "Interneti veebiserver:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Dokumentide juurkataloog:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Kasutaja kataloog:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Nõustaja seadistas edukalt intraneti/Interneti veebiserveri"
 
 #: ../web_wizard/Apache.pm:236
@@ -2580,3 +2558,46 @@ msgstr "Apache server"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Süsteemi seadistamine Apache serveriks..."
+
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr "Märkige, kui soovite lubada PXE oma DHCP serverile."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Nõustaja seadistas edukalt serveri DHCP teenused."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP server"
+
+#~ msgid "News Server"
+#~ msgstr "Uudisteserver"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS server"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "NIS server Autofs tabeliga"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS server:"
+
+#~ msgid "Network File:"
+#~ msgstr "Võrgufail:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "NFS eksport:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Automaatne master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Automaatne kodu:"
+
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Nende väärtustega nõustumiseks ja serveri seadistamiseks vajutage nupule "
+#~ "'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta"
+
+#~ msgid "Document Root:"
+#~ msgstr "Dokumentide juurkataloog:"
diff --git a/po/eu.po b/po/eu.po
index 1979f72d..79568076 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -40,7 +40,7 @@ msgstr "Okerra."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -197,7 +197,10 @@ msgstr ""
 "dizu."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -215,16 +218,16 @@ msgstr ""
 "bereziak ez badituzu, arazorik gabe onartu ditzakezu proposaturiko balioak."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "IP Helbide Txikiena:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "IP Helbide Handiena:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Atariaren IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -248,7 +251,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Zerbitzariaren IP ez da heinean egon behar."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP Zerbitzaria ezartzen"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -284,7 +287,8 @@ msgid "Interface:"
 msgstr "Interfazea:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Morroiak zure zerbitzariaren DHCP zerbitzuak konfiguratu ditu."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -570,11 +574,11 @@ msgstr "Ezarri PXE zerbitzaria"
 msgid "DNS server"
 msgstr "NFS zerbitzaria"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Berrien zerbitzaria"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS zerbitzaria"
 
@@ -582,10 +586,9 @@ msgstr "NFS zerbitzaria"
 msgid "Mail server"
 msgstr "Posta zerbitzaria"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
-msgstr "FTP Zerbitzaria"
+msgstr "FTP zerbitzaria"
 
 #: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:473
 msgid "Samba server"
@@ -644,41 +647,37 @@ msgid "FTP wizard"
 msgstr "FTP morroia"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP Zerbitzariaren Konfigurazio Morroia"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Morroi honek zure sarerako FTP Zerbitzaria konfiguratzen lagunduko dizu."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP Zerbitzaria"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Zure zerbitzariak zure barne sarerako (intraneta) FTP Zerbitzari bezala lan "
 "egin dezake eta Interneterako FTP Zerbitzari bezala."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Gaitu FTP Zerbitzaria Intraneterako"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Gaitu FTP Zerbitzaria Interneterako"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -690,7 +689,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -706,11 +705,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -737,8 +736,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -746,14 +745,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Barkatu, root izan behar duzu hau egiteko..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP Zerbitzaria konfiguratzen"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Morroiak, zure FTP Zerbitzaria konfiguratzeko behar\n"
 "diren hurrengo parametroak bildu ditu"
@@ -768,11 +767,11 @@ msgstr ""
 "botoia edo erabili Atzera botoia hauek zuzentzeko"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP Zerbitzaria:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP Zerbitzaria:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -796,7 +795,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Morroiak zure Intranet/Internet FTP Zerbitzaria konfiguratu du"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -844,11 +843,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1073,7 +1072,7 @@ msgstr "Ongi etorri Berrien Morroira"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internet ostalari izenak \"ostalaria.domeinua.domeinumota\" erakoak izan "
@@ -1081,10 +1080,6 @@ msgstr ""
 "interneteko berrien zerbitzaria normalean \"news.hornitzailea.com\" da."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Berrien Zerbitzariak"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1094,24 +1089,24 @@ msgstr ""
 "dizu."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Berrien Zerbitzari Izena:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Daukazun internet loturaren arabera, arakatzeko epe egokia 6 eta 24 ordu "
 "bitarteko izan daiteke."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Arakatze Epea"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1120,7 +1115,7 @@ msgstr ""
 "du."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Arakatze Epea (Orduak):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1137,31 +1132,30 @@ msgstr "Internet Berriak konfiguratzen"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Morroiak zure Interneteko Berrien Zerbitzua konfiguratzeko\n"
 "behar diren hurrengo parametroak bildu ditu:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Balio hauek onartu, eta zure zerbitzaria konfiguratzeko, klikatu Hurrengoa "
-"botoia edo erabili Atzera botoia hauek zuzentzeko."
+"botoia edo erabili Atzera botoia hauek zuzentzeko"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Berrien Zerbitzaria:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Arakatzeko Tartea:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1172,7 +1166,6 @@ msgid "NFS Wizard"
 msgstr "NFS Morroia"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Guztiak - Sartzeko mugarik ez"
 
@@ -1185,26 +1178,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS Zerbitzariaren Konfigurazio Morroia"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Morroi honek zure sarerako NFS Zerbitzaria konfiguratzen lagunduko dizu."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS Zerbitzaria"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Direktorioa:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Sarrera Kontrola"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Hautatu zure beharretara egokitzen den maila. Ez badakizu, \"Bertako Sarea"
@@ -1253,7 +1243,7 @@ msgid "Netmask :"
 msgstr "Saremaskara :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Morroiak zure NFS Zerbitzaria konfiguratu du"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1262,28 +1252,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Nis zerbitzaria + Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Nis Bezeroa"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Nis zerbitzaria + Autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1301,20 +1287,21 @@ msgstr "Zure sistema Nis Bezero bezala konfiguratzen ..."
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Nisdomeinua eta niszerbitzaria jarri besterik ez duzu egin behar"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
-msgstr "NFS Zerbitzaria"
+msgid "NIS server:"
+msgstr "NFS zerbitzaria"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
 #, fuzzy
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Nis Domeinua:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1332,12 +1319,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS zerbitzaria"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1359,22 +1340,6 @@ msgstr "Morroiak zure Samba zerbitzaria konfiguratu du"
 msgid "NIS directory:"
 msgstr "Erabiltzailearen direktorioa:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Sareko Fitxategia:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto ataria:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1387,7 +1352,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1422,12 +1387,12 @@ msgstr "Zure sistema Nis+Autofs(nfs) zerbitzari bezala konfiguratzen ..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Nis zerbitzaria + Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Zure sistema Nis Bezero bezala konfiguratzen ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1517,7 +1482,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internet ostalari izenak \"ostalaria.domeinua.domeinumota\" erakoak izan "
@@ -1570,15 +1535,6 @@ msgstr ""
 "Morroiak zure Internet Posta Zerbitzua konfiguratzeko behar diren hurrengo "
 "parametroak bildu ditu:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Balio hauek onartu, eta zure zerbitzaria konfiguratzeko, klikatu Hurrengoa "
-"botoia edo erabili Atzera botoia hauek zuzentzeko"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1715,6 +1671,20 @@ msgid "Disk space (MB):"
 msgstr "Diskoan lekua (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Sarrera Kontrola"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Hautatu zure beharretara egokitzen den maila. Ez badakizu, \"Bertako Sarea"
+"\"maila da normalean egokiena. Kontu izan \"Guztiak\" maila segurua ez "
+"izatea posible dela."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Proxya sarrera kontrol maila desberdinak erabil ditzan konfiguratu daiteke"
@@ -1782,6 +1752,15 @@ msgstr ""
 "Morroiak zure proxya konfiguratzeko behar diren hurrengo parametroak bildu "
 "ditu:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Balio hauek onartu, eta zure zerbitzaria konfiguratzeko, klikatu Hurrengoa "
+"botoia edo erabili Atzera botoia hauek zuzentzeko."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Portua:"
@@ -2157,15 +2136,16 @@ msgstr "Samba morroia"
 msgid "%s does not exist."
 msgstr "%s ez da existitzen."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Guztiak - Sartzeko mugarik ez"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Nere arauak - Galdetu neri baimendu eta ukatzeko ostalariak"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba Konfigurazio Morroia"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2174,6 +2154,10 @@ msgstr ""
 "fitxategi eta inprimaketa zerbitzari bezala lanegin dezan modua jartzen du."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba Konfigurazio Morroia"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2197,7 +2181,7 @@ msgid "The Workgroup is wrong"
 msgstr "Lantaldea gaizki dago"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Zerbitzariaren Goiburua."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2212,20 +2196,16 @@ msgid "Banner:"
 msgstr "Goiburua:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Zerbitariaren Goiburua oker dago"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Sarrera Kontrola"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Sarrera maila:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* 1. adibidea: baimendu 150.203.*.*-ko IP guztiak, bat ezik\n"
@@ -2273,7 +2253,7 @@ msgid "Deny hosts:"
 msgstr "Ukatu ostalariei: "
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Aktibatu Samba Zerbitzuak"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2291,7 +2271,7 @@ msgid "Enable file sharing area"
 msgstr "Fitxategi elkarbanatze gunea gaitu"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Gaitu Zerbitzari Inprimagailuen Elkarbanatzea"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2331,7 +2311,7 @@ msgstr ""
 "root, fred, @users, @wheel baimen mota bakoitzarentzako."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "irakurgai zerrenda:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2339,7 +2319,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "idazgai zerrenda:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2364,15 +2344,15 @@ msgstr ""
 "hurrengo parametroak bildu ditu."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Zerbitzariaren Goiburua:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Fitxategi Elkarbanatzea:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Inprimaketa Zerbitzaria:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2435,15 +2415,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Hautatu lehenengo eta bigarren zerbitzaria zerrendatik."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Ordu Zerbitzariak"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Lehenengo Ordu Zerbitzaria:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Bigarren Ordu Zerbitzaria:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2517,16 +2497,16 @@ msgid "Web wizard"
 msgstr "Web morroia"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Morroi honek zure sarerako Web zerbitzaria konfiguratzen lagunduko dizu."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Web Zerbitzari Ezarpen Morroia"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Ez markatu lauki batere ez baduzu Web Zerbitzaria aktibatu nahi."
 
 #: ../web_wizard/Apache.pm:77
@@ -2534,23 +2514,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Aukeratu aktibatu nahi duzun Web zerbitzua:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web Zerbitzaria"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Zure zerbitzariak zure barneko sarearentzat (intraneta) Web zerbitzari "
 "bezela lan egin dezake eta Interneterako Web Zerbitzari bezala."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Gaitu Intraneterako Web Zerbitzaria"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Gaitu Web Zerbitzaria Interneterako"
 
 #: ../web_wizard/Apache.pm:90
@@ -2593,18 +2573,18 @@ msgstr "erabiltzaile http azpidirektorioa : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Idatzi dokumentuen erro izatea nahi duzun direktorioaren bidea."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Dokumentuen Erroa:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "dokumentu erroa:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Web Zerbitzaria konfiguratzen"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Morroiak Web Zerbitzaria konfiguratzeko behar diren ondorengo datuak bildu "
 "ditu"
@@ -2617,16 +2597,12 @@ msgstr "Intranet web zerbitzaria:"
 msgid "Internet web server:"
 msgstr "Internet Web Zerbitzaria:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "dokumentu erroa:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Erabiltzailearen direktorioa:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Morroiak zure Intranet/Internet Web Zerbitzariak konfiguratu ditu"
 
 #: ../web_wizard/Apache.pm:236
@@ -2639,6 +2615,43 @@ msgstr "Apache web zerbitzaria"
 msgid "Configuring your system as Apache server ..."
 msgstr "Zure sistema Nis+Autofs(nfs) zerbitzari bezala konfiguratzen ..."
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Morroiak zure zerbitzariaren DHCP zerbitzuak konfiguratu ditu."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP Zerbitzaria"
+
+#~ msgid "News Server"
+#~ msgstr "Berrien Zerbitzariak"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS Zerbitzaria"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Nis zerbitzaria + Autofs"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS Zerbitzaria"
+
+#~ msgid "Network File:"
+#~ msgstr "Sareko Fitxategia:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto ataria:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Balio hauek onartu, eta zure zerbitzaria konfiguratzeko, klikatu "
+#~ "Hurrengoa botoia edo erabili Atzera botoia hauek zuzentzeko"
+
+#~ msgid "Document Root:"
+#~ msgstr "Dokumentuen Erroa:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Internet Posta konfiguratzen"
 
diff --git a/po/fa.po b/po/fa.po
index 63e06925..7239c1fd 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2003-09-10 01:04+0200\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -41,7 +41,7 @@ msgstr "خطا."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -190,7 +190,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "این جادوگر به شما در پیکربندی سرویس‌های DHCP کارگزارتان کمک خواهد کرد."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -209,16 +212,16 @@ msgstr ""
 "بپذیرید."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "کوچکترین نشانی آی‌پی:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "بزرگترین نشانی آی‌پی:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "آی پی دروازه:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -242,7 +245,7 @@ msgid "The IP of the server must not be in range."
 msgstr "آی‌پی کارگزار نباید در گستره باشد"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "پیکربندی کارگزار DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -278,7 +281,8 @@ msgid "Interface:"
 msgstr "واسط:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "جادوگر با موفقیت سرویس‌های DHCP کارگزارتان را پیکربندی کرد."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -569,11 +573,11 @@ msgstr "کارگزار DHCP"
 msgid "DNS server"
 msgstr "کارگزار DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "کارگزار اخبار"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "کارگزار NFS"
 
@@ -581,7 +585,7 @@ msgstr "کارگزار NFS"
 msgid "Mail server"
 msgstr "کارگزار پست"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "کارگزار FTP"
 
@@ -639,41 +643,37 @@ msgid "FTP wizard"
 msgstr "جادوگر FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "جادوگر پیکربندی کارگزار FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "این جادوگر به شما در پیکربندی کارگزار FTP شبکه‌تان کمک می‌کند."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "کارگزار FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "نوع سرویس FTP را که می‌خواهید فعال کنید انتخاب نمایید:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "کارگزار شما می‌تواند مانند یک کارگزار FTP برای شبکه‌ی داخلی (اینترانت) شما و "
 "مانند یک کارگزار FTP برای اینترنت عمل کند."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "فعال کردن کارگزار FTP برای اینترانت"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "فعال کردن کارگزار FTP برای اینترنت "
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "پست الکترونیکی مدیر: نشانی پست الکترونیکی نگهدارنده‌ی FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -690,7 +690,7 @@ msgstr "اجازه‌ی FXP: اجازه دادن به انتقال پرونده
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "Chroot Home user: سد کردن کاربر در شاخه‌ی خانه‌ی آنها."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -710,12 +710,12 @@ msgstr "پست الکترونیکی مدیر"
 
 #: ../ftp_wizard/Proftpd.pm:97
 #, fuzzy
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "اجازه‌ی ثبت‌ورود مدیر"
 
 #: ../ftp_wizard/Proftpd.pm:98
 #, fuzzy
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "تغییر ‌ریشه‌ی خانه‌ی کاربر"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -741,8 +741,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -750,14 +750,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "متاسفم، شما برای انجام این کار باید مدیر سیستم باشید..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "پیکربندی کارگزار FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "جادوگر پارامترهای بدنبال آمده‌ی مورد نیاز را برای\n"
 "پیکربندی کارگزار FTP شما جمع‌آوری کرد"
@@ -772,11 +772,11 @@ msgstr ""
 "دکمه‌ی برگشت برای تصحیح آنها استفاده کنید"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "کارگزار FTP اینترانت:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "کارگزار FTP اینترنت:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -800,7 +800,7 @@ msgid "Allow FXP"
 msgstr "اجازه‌ی FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "جادوگر با موفقیت کارگزار FTP اینترنت/اینترانت شما را پیکربندی کرد"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -852,12 +852,12 @@ msgstr "خطا، شاخه‌ی منبع باید شاخه‌ای با شاخه�
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "شاخه‌ی منبع از قبل مورد استفاده است، لطفاً یکی دیگر را انتخاب کنید."
 
 #: ../installsrv_wizard/Installsrv.pm:83
 #, fuzzy
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "من کارگزار نصب شما را با آن پارامترها پیکربندی خواهم کرد"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1074,7 +1074,7 @@ msgstr "به جادوگر اخبار خوش آمدید"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "نام‌های میزبان اینترنت باید به شکل \"host.domain.domaintype\" باشد; برای "
@@ -1082,10 +1082,6 @@ msgstr ""
 "اینترنت شما معمولاً \"news.provider.com\" می‌باشد."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "کارگزار اخبار"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1094,24 +1090,24 @@ msgstr ""
 "می‌دارد، این نام توسط شرکت عرضه کننده‌ی اینترنت شما عرضه می‌گردد."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "نام کارگزار اخبار:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "بستگی به نوع ارتباط اینترنت شما، یک دوره‌ی مناسب رأی گیری می‌تواند بین ۶ و ۲۴ "
 "ساعت تغییر کند."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "دوره‌ی رأی گیری"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1120,7 +1116,7 @@ msgstr ""
 "می‌کند."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "دوره‌ی رأی گیری (ساعت):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1137,31 +1133,30 @@ msgstr "پیکربندی اخبار اینترنت"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "پارامترهای بدنبال آمده‌ی لازم را جادوگر برای پیکربندی\n"
 "سرویس اخبار اینترنت شما جمع آوری نمود:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"برای پذیرش این مقدار‌ها و پیکربندی کارگزارتان، دکمه بعدی را کلیک کرده یا از "
-"دکمه‌ی برگشت برای تصحیح آنها استفاده کنید."
+"برای پذیرش این مقدارها و پیکربندی کارگزارتان، دکمه‌ی بعدی را کلیک کنید یا از "
+"دکمه‌ی برگشت برای تصحیح آنها استفاده کنید"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "کارگزار اخبار:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "فاصله‌ی رأی گیری:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "جادوگر با موفقیت سرویس اخبار اینترنت کارگزار شما را پیکربندی کرد."
@@ -1171,7 +1166,6 @@ msgid "NFS Wizard"
 msgstr "جادوگر NFS "
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "همه - هیچ محدودیت دستیابی"
 
@@ -1184,25 +1178,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "جادوگر پیکربندی کارگزار NFS "
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "این شاخه به شما در پیکربندی کارگزار NFS برای شبکه‌تان کمک می‌کند."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "کارگزار NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "شاخه:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "کنترل دستیابی"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "سطحی را که مناسب نیاز شما است انتخاب کنید. اگر نمی‌دانید، معمولاً سطح شبکه "
@@ -1250,7 +1241,7 @@ msgid "Netmask :"
 msgstr "نقاب‌شبکه :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "جادوگر با موفقیت کارگزار NFS شما را پیکربندی کرد"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1263,18 +1254,15 @@ msgstr ""
 "نام دامنه‌ی درست، نه همان دامنه‌ی محلی یا هیچکدام دیگر، دارید. drakconnect را "
 "برای سازگار کردن آن اجرا کنید."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "کارگزار NIS با autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "کارگیر NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "کارگزار NIS با autofs map"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
@@ -1283,7 +1271,7 @@ msgstr "برپاسازی کارگزار NIS با autofs map، auto.home و auto.
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "کارگیرها می‌توانند بطور خودکار شاخه‌ی خانه‌ی خود را وقتی که بر شبکه‌ی رایانه‌ی "
@@ -1302,18 +1290,19 @@ msgstr "پیکربندی رایانه برای کارگیر NIS شدن"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "شما فقط باید nisdomain و nisserver را بگذارید"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
-msgstr "کارگزار NFS:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
+msgstr "کارگزار NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "دامنه‌ی NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1335,11 +1324,6 @@ msgstr "دامنه‌ی NIS: دامنه‌ی NIS برای کارگزار NIS ش�
 msgid "NIS server: name of your computer."
 msgstr "کارگزار NIS: نام رایانه‌ی شما."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "کارگزار NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "خانه‌ی NIS:"
@@ -1359,23 +1343,6 @@ msgstr "کارگزار NIS شما را با autofs map خواهد گذارد"
 msgid "NIS directory:"
 msgstr "شاخه‌ی NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "پرونده‌ی شبکه:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-#, fuzzy
-msgid "NFS exports:"
-msgstr "صادرات Nfs:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "ارشد خودکار:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "خانه‌ی خودکار:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1389,7 +1356,7 @@ msgstr "NIS server: نام‌میزبان nisserver."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1423,12 +1390,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "پیکربندی سیستم‌تان به کارگزار NIS شدن با autofs map..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS با autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "پیکربندی سیستم‌تان مانند کارگیر Nis ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1514,7 +1481,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "نام‌های میزبان اینترنت باید به شکل \"host.domain.domaintype\" باشد; برای "
@@ -1569,15 +1536,6 @@ msgstr ""
 "جادوگر پارامترهای بدنبال آمده‌ی لازم را برای پیکربندی سرویس پست اینترنت شما "
 "جمع‌آوری کرد:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"برای پذیرش این مقدارها و پیکربندی کارگزارتان، دکمه‌ی بعدی را کلیک کنید یا از "
-"دکمه‌ی برگشت برای تصحیح آنها استفاده کنید"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1714,6 +1672,19 @@ msgid "Disk space (MB):"
 msgstr "فضای دیسک (مگابایت):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "کنترل دستیابی"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"سطحی را که مناسب نیاز شما است انتخاب کنید. اگر نمی‌دانید، معمولاً سطح شبکه "
+"محلی مناسب‌ترین است. مواظب باشید که همه سطوح ممکن است امن نباشند."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "پراکسی می‌تواند برای سطوح گوناگون کنترل دستیابی پیکربندی گردد."
 
@@ -1779,6 +1750,15 @@ msgid ""
 msgstr ""
 "جادوگر پارامترهای بدنبال آمده‌ی لازم را برای پیکربندی پراکسی شما جمع آوری کرد:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"برای پذیرش این مقدار‌ها و پیکربندی کارگزارتان، دکمه بعدی را کلیک کرده یا از "
+"دکمه‌ی برگشت برای تصحیح آنها استفاده کنید."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "درگاه:"
@@ -2172,15 +2152,16 @@ msgstr "جادوگر سامبا"
 msgid "%s does not exist."
 msgstr "%s وجود ندارد."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "همه - هیچ محدودیت دستیابی"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "قواعد من - میزبان‌های مجاز و غیرمجاز از من پرسیده شود"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "جادوگر پیکربندی سامبا"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2189,6 +2170,10 @@ msgstr ""
 "پایگاه‌هایی که سیستم‌های غیر-لینوکس را اجرا می‌کنند رفتار کند."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "جادوگر پیکربندی سامبا"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2211,7 +2196,7 @@ msgid "The Workgroup is wrong"
 msgstr "گروه‌کاری اشتباه است"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "اعلانیه‌ی کارگزار."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2225,20 +2210,16 @@ msgid "Banner:"
 msgstr "اعلانیه:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "اعلانیه‌ی کارگزار درست نیست"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "کنترل دستیابی"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "سطح دستیابی :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "مثال ۱: اجازه‌ی تمام آی پی‌ها در ۱۵۰.۲۰۳.*.*؛ بجز یکی\n"
@@ -2283,7 +2264,7 @@ msgid "Deny hosts:"
 msgstr "میزبان‌های غیرمجاز:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "سرویس‌های بکار افتاده‌ی سامبا"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2301,7 +2282,7 @@ msgid "Enable file sharing area"
 msgstr "بکار انداختن ناحیه‌ی اشتراک پرونده"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "بکار انداختن اشتراک کارگزار چاپگر"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2340,7 +2321,7 @@ msgstr ""
 " root, fred, @users, @wheel برای هر نوع اجازه."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "لیست خواندن:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2348,7 +2329,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "لیست نگارش:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2372,15 +2353,15 @@ msgstr ""
 "جمع آوری کرد."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "اعلانیه‌ی کارگزار:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "اشتراک پرونده:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "کارگزار چاپ:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2442,15 +2423,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "انتخاب  یک کارگزار اولیه و ثانویه از لیست."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "کارگزارهای زمان"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "کارگزار زمان اولیه:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "کارگزار زمان ثانویه:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2523,15 +2504,15 @@ msgid "Web wizard"
 msgstr "جادوگر وب"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "این جادوگر به شما در پیکربندی کارگزار وب برای شبکه‌تان کمک خواهد کرد."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "جادوگر پیکربندی کارگزار وب"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "اگر نمی‌خواهید کارگزار وب خود را فعال کنید هیچ جعبه‌ای را علامت نزنید."
 
 #: ../web_wizard/Apache.pm:77
@@ -2539,23 +2520,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "نوع سرویس وبی را که می‌خواهید فعال کنید انتخاب کنید:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "کارگزار وب"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "کارگزار شما می‌تواند مانند یک کارگزار وب برای شبکه درونی (اینترانت) و یک "
 "کارگزار وب برای اینترنت عمل کند."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "بکار انداختن کارگزار وب برای اینترانت"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "بکار انداختن کارگزار وب برای اینترنت"
 
 #: ../web_wizard/Apache.pm:90
@@ -2596,18 +2577,18 @@ msgstr "زیر-شاخه اینترنت کاربر: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "مسیر شاخه‌ای را که می‌خواهید ریشه‌ی نوشتار باشد تایپ کنید."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "ریشه‌ی نوشتار:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "ریشه نوشتار:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "پیکربندی کارگزار وب"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "جادوگر پارامترهای بدنبال آمده‌ی لازم را برای پیکربندی کارگزار وب شما جمع آوری "
 "کرد"
@@ -2620,16 +2601,12 @@ msgstr "کارگزار وب اینترانت:"
 msgid "Internet web server:"
 msgstr "کارگزار وب اینترنت:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "ریشه نوشتار:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "شاخه‌ی کاربر:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "جادوگر با موفقیت کارگزار وب اینترنت/اینترانت شما را پیکربندی کرد"
 
 #: ../web_wizard/Apache.pm:236
@@ -2642,6 +2619,48 @@ msgstr "کارگزار وب آپاچی:"
 msgid "Configuring your system as Apache server ..."
 msgstr "پیکربندی سیستم شما مانند کارگزار برده‌ی DNS ..."
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "جادوگر با موفقیت سرویس‌های DHCP کارگزارتان را پیکربندی کرد."
+
+#~ msgid "FTP Server"
+#~ msgstr "کارگزار FTP"
+
+#~ msgid "News Server"
+#~ msgstr "کارگزار اخبار"
+
+#~ msgid "NFS Server"
+#~ msgstr "کارگزار NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "کارگزار NIS با autofs map"
+
+#~ msgid "NIS Server:"
+#~ msgstr "کارگزار NFS:"
+
+#~ msgid "Network File:"
+#~ msgstr "پرونده‌ی شبکه:"
+
+#, fuzzy
+#~ msgid "NFS exports:"
+#~ msgstr "صادرات Nfs:"
+
+#~ msgid "Auto master:"
+#~ msgstr "ارشد خودکار:"
+
+#~ msgid "Auto home:"
+#~ msgstr "خانه‌ی خودکار:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "برای پذیرش این مقدارها و پیکربندی کارگزارتان، دکمه‌ی بعدی را کلیک کنید یا "
+#~ "از دکمه‌ی برگشت برای تصحیح آنها استفاده کنید"
+
+#~ msgid "Document Root:"
+#~ msgstr "ریشه‌ی نوشتار:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "پیکربندی پست اینترنت"
 
diff --git a/po/fi.po b/po/fi.po
index 484087bc..80c0c8f4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fi - MDK Linux Release 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-26 00:19+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mandrake.org>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -46,7 +46,7 @@ msgstr "Virhe."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -85,7 +85,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 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."
+msgstr ""
+"Tämä velho auttaa sinua lisäämään asiakkaan paikalliseen DNS-palveluun."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -195,8 +196,11 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "Jos haluat ottaa PXE käyttöön dhcp-palvelimellesi, laita rasti ruutuun."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -213,15 +217,15 @@ msgstr ""
 "arvot. (eli: 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Matalin IP-osoite:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Korkein IP-osoite:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Yhdyskäytävän IP-osoite:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -245,7 +249,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Palvelimen IP ei saa olla tästä osoiteavaruudesta."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Asetetaan DHCP-palvelin"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -281,7 +285,8 @@ msgid "Interface:"
 msgstr "Liitäntä:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Velho asetti palvelimesi DHCP-palvelun onnistuneesti."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -442,7 +447,8 @@ msgid "Default domain name to search:"
 msgstr "Oletusverkkoalue jossa etsitään:"
 
 #: ../dns_wizard/Bind.pm:168
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Tämä ei ole oikeanmuotoinen osoite edelleenlähettäjällesi... paina "
 "'seuraava' jatkaaksesi"
@@ -518,7 +524,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr "Asiakas näillä tunnisteilla poistetaan DNS-palvelusta"
 
 #: ../dns_wizard/Bind.pm:233
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr "DNS-palvelinta ollaan asettamassa seuraavilla asetuksilla:"
 
 #: ../dns_wizard/Bind.pm:235
@@ -565,11 +572,11 @@ msgstr "DHCP palvelin"
 msgid "DNS server"
 msgstr "DNS-palvelin"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Uutisryhmäpalvelin"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS-palvelin"
 
@@ -577,7 +584,7 @@ msgstr "NFS-palvelin"
 msgid "Mail server"
 msgstr "Sähköpostipalvelin"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP-palvelin"
 
@@ -635,52 +642,50 @@ msgid "FTP wizard"
 msgstr "FTP velho"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP-palvelimen asetusvelho"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Tämä velho auttaa sinua asettamaan FTP-palvelimen verkollesi."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP-palvelin"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Palvelimesi voi toimia FTP-palvelimena paikallisverkolle (intranet), sekä "
 "FTP-palvelimena Internetin käyttäjille."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Ota käyttöön FTP-palvelin paikallisverkolle"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Ota käyttöön FTP-palvelin Internetiin."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Ylläpitäjän sähköposti: FTP ylläpitäjän sähköpostiosoite."
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "Allow FTP resume: allow resume upload or download on FTP server."
-msgstr "Salli jatkettava FTP: salli jatkettava siirto (ylös/alas) FTP-palvelimella."
+msgstr ""
+"Salli jatkettava FTP: salli jatkettava siirto (ylös/alas) FTP-palvelimella."
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "Salli FXP: salli tiedostonsiirtoa toisten FTP-palvelimien kautta."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
-msgstr "Aseta käyttäjät Chroot:iin: Rajoittaa käyttäjät omiin kotihakemistoihin."
+msgid "Chroot home user: 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:88
 msgid "FTP Proftpd server options"
@@ -688,18 +693,19 @@ msgstr "Ftp Proftpd palvelinasetukset"
 
 #: ../ftp_wizard/Proftpd.pm:88
 msgid "Permit root login: allow root to log on FTP server."
-msgstr "Salli root login: sallii kirjautuminen root-tunnuksella FTP-palvelimelle."
+msgstr ""
+"Salli root login: sallii kirjautuminen root-tunnuksella FTP-palvelimelle."
 
 #: ../ftp_wizard/Proftpd.pm:96
 msgid "Admin email:"
 msgstr "Ylläpitäjän sähköposti:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Salli kirjautuminen root tunnuksella:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "aseta kotikäyttäjät chroot:iin:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -718,12 +724,13 @@ msgstr "Käytät DHCP-osoitetta, voi olla ettei palvelin toimi asetuksillasi."
 msgid ""
 "Please choose whether to allow a connection to FTP server from internal or "
 "external hosts."
-msgstr "Ole hyvä ja valitse jos sallitan FTP yhteyksiä paikallisista ja etä-koneista."
+msgstr ""
+"Ole hyvä ja valitse jos sallitan FTP yhteyksiä paikallisista ja etä-koneista."
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "En löydä bash komentotulkkien listasta, ole hyvä ja korjaa."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -731,13 +738,13 @@ 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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Asetetaan FTP-palvelin"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan FTP-palvelimesi "
 "asettamiseksi"
@@ -751,11 +758,11 @@ msgstr ""
 "'Edellinen' korjataksesi asetuksia"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP Palvelin:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP Palvelin:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -779,7 +786,7 @@ msgid "Allow FXP"
 msgstr "Salli FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Velho asetti Intranet/Internet FTP-palvelimesi onnistuneesti"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -832,11 +839,11 @@ msgstr ""
 "asennushakemisto."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The 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 "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Asennuspalvelimesi asetetaan nyt näillä parametreilla"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1044,7 +1051,8 @@ msgstr "Uutispalvelin velho"
 msgid ""
 "This wizard will help you configuring the Internet News services for your "
 "network."
-msgstr "Tämä velho auttaa sinua asettamaan Internetin uutisryhmäpalvelun verkollesi."
+msgstr ""
+"Tämä velho auttaa sinua asettamaan Internetin uutisryhmäpalvelun verkollesi."
 
 #: ../news_wizard/Inn.pm:44
 msgid "Welcome to the News Wizard"
@@ -1053,7 +1061,7 @@ msgstr "Tervetuloa Uutispalvelin velhoon"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internetin konenimet on oltava muodossa \"palvelin.verkkoalue.aluetyyppi\"; "
@@ -1061,10 +1069,6 @@ msgstr ""
 "uutispalvelimen nimi on yleensä \"news.tarjoaja.fi\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Uutisryhmäpalvelin"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1074,24 +1078,24 @@ msgstr ""
 "yhteydentarjoajaltasi."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Uutispalvelimen nimi:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Riippuen siitä, minkä tyyppinen Internetyhteys sinulla on, sopiva viestien "
 "noutoaikaväli voi olla 6-24 tuntia."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Viestien noutoaikaväli"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1099,7 +1103,7 @@ msgstr ""
 "viestien noutoaikaväli määrittää ajan kahden peräkkäisen noudon välillä."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Viestien noutoaikaväli (tuntia):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1116,32 +1120,31 @@ msgstr "Asetetaan Internet uutisryhmäpalvelu"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan\n"
 "Internet uutisryhmäpalvelun asettamiseksi:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
-"'Edellinen' korjataksesi asetuksia."
+"'Edellinen' korjataksesi asetuksia"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Uutisryhmäpalvelin:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Viestien noutoaikaväli:"
 
-#: ../news_wizard/Inn.pm:96
-msgid "The wizard successfully configured your Internet News service of your server."
+#: ../news_wizard/Inn.pm:95
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr "Velho asetti Internet uutisryhmäpalvelun onnistuneesti."
 
 #: ../nfs_wizard/NFS.pm:34
@@ -1149,7 +1152,6 @@ msgid "NFS Wizard"
 msgstr "NFS velho"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Kaikki - Ei käyttörajoituksia"
 
@@ -1162,25 +1164,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS-palvelimen asetusvelho"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Tämä velho auttaa sinua asettamaan NFS-palvelimen verkollesi."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS-palvelin"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Hakemisto:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Käyttörajoitus"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Valitse taso joka vastaa tarpeitasi. Jos et tiedä, Paikallisverkko-taso on "
@@ -1228,7 +1227,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Velho asetti NFS-palvelimen onnistuneesti."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1240,25 +1239,23 @@ msgstr ""
 "tarvitset oikean NIS verkkoalueen nimi, joka ei saa olla localdomain tai "
 "none."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "Nis palvelin + Autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Nis-asiakas"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Nis palvelin + Autofs map"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
-msgstr "Aseta NIS-palvelinta + autofs map, auto.home ja auto.master tiedostoja."
+msgstr ""
+"Aseta NIS-palvelinta + autofs map, auto.home ja auto.master tiedostoja."
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Asiakkaat voivat automattisesti littää kotihakemistonsa kun he kirjautuvat "
@@ -1276,18 +1273,19 @@ msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Tarvitset vain asettaa nis-verkkoalue ja nis-palvelin"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS-palvelin:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Nis verkkoalue:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 "NIS palvelin on hyödyllinen kun haluat luoda käyttäja ja "
@@ -1313,11 +1311,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr "NIS palvelin: koneesi nimi."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS-palvelin:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "NIS Kotihakemisto:"
@@ -1335,22 +1328,6 @@ msgstr "Welho asettaa NIS palvelintasi + autofs map"
 msgid "NIS directory:"
 msgstr "NIS hakemisto:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Verkkotiedosto:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "NFS exports:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Automattinen isäntä:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Automaattinen kotihakemisto:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS verkkoalueen nimi: NIS verkkoalueen nimi."
@@ -1362,7 +1339,7 @@ msgstr "NIS palvelin: NIS-palvelimen konenimi."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 "YPBIND demoni löytää NIS verkkoalueiden palvelimet ja hallitsee NIS-"
 "liitoksien tietoja."
@@ -1394,11 +1371,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Asetetaan järjestelmäsi Nis+Autofs(nfs) palvelimeksi ..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Nis palvelin + Autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Asetetaan järjestelmäsi Nis asiakkaaksi ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1485,7 +1462,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internet palvelinnimet on oltava muodossa \"palvelin.verkkoalue.aluetyyppi"
@@ -1532,13 +1509,9 @@ msgstr "Asetetaan ulkoinen sähköpostipalvelin"
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "external mail server:"
-msgstr "Velho keräsi seuraavat parametrit jotka vaaditaan ulkoisen Internet sähköpostipalvelimen asettamiseksi:"
-
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr "Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina 'Edellinen' korjataksesi asetuksia"
+msgstr ""
+"Velho keräsi seuraavat parametrit jotka vaaditaan ulkoisen Internet "
+"sähköpostipalvelimen asettamiseksi:"
 
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
@@ -1620,7 +1593,8 @@ msgid "Proxy port:"
 msgstr "Välityspalvelimen portti:"
 
 #: ../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 ""
 "Paina 'Seuraava' jos haluat pitää tämän arvon, tai 'Takaisin' jos haluat "
 "korjata valintasi."
@@ -1635,10 +1609,12 @@ msgstr "Paina 'Takaisin' muuttaaksesi asetusta."
 
 #: ../proxy_wizard/Squid.pm:88
 msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Sinun pitää valita portti joka on suurempi kuin 1024 ja pienempi kuin 65535."
+msgstr ""
+"Sinun pitää valita portti joka on suurempi kuin 1024 ja pienempi kuin 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 ""
 "Levyvälimuisti on määrätty osa levytilasta joka voidaan käyttää "
 "välimuistitietojen tallentamiseen levylle."
@@ -1671,6 +1647,19 @@ msgid "Disk space (MB):"
 msgstr "Levytila (Mt):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Käyttörajoitus"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Valitse taso joka vastaa tarpeitasi. Jos et tiedä, Paikallisverkko-taso on "
+"yleensä paras vaihtoehto. Huomaa, että taso 'Kaikki' voi olla turvaton."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Välityspalvelin voidaan asettaa käyttämään eri käyttörajoitustasoja"
 
@@ -1731,11 +1720,21 @@ msgid "Configuring the Proxy"
 msgstr "Asetetaan välityspalvelin"
 
 #: ../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 ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan välityspalvelimen "
 "asettamiseksi:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
+"'Edellinen' korjataksesi asetuksia."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Portti:"
@@ -1891,7 +1890,8 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:156
 msgid "Please choose the PXE boot image you want to remove from PXE server."
-msgstr "Valitse PXE käynnistyslevykuvatiedosto jota haluat poistaa PXE palvelimelta."
+msgstr ""
+"Valitse PXE käynnistyslevykuvatiedosto jota haluat poistaa PXE palvelimelta."
 
 #: ../pxe_wizard/Pxe.pm:156
 msgid "Remove a boot image"
@@ -1921,7 +1921,8 @@ msgstr ""
 "käynnistyskuvatiedoston."
 
 #: ../pxe_wizard/Pxe.pm:163
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
 msgstr "Valitse muutettava PXE käynnistyskuvatiedosto alla olevasta listasta."
 
 #: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
@@ -1934,7 +1935,8 @@ msgstr "Lisää optiota PXE käynnistyskuvatiedostoon"
 
 #: ../pxe_wizard/Pxe.pm:171
 msgid "Install directory: the full path to MDK install server directory"
-msgstr "Asennushakemisto: koko hakemistopolku MDK asennuspalvelimen hakemistoon"
+msgstr ""
+"Asennushakemisto: koko hakemistopolku MDK asennuspalvelimen hakemistoon"
 
 #: ../pxe_wizard/Pxe.pm:171
 msgid "Installation method: choose NFS or HTTP."
@@ -2047,11 +2049,14 @@ msgid "Please choose an image from a different directory than %s."
 msgstr "Valitse kuvatiedosto toiselta hakemistolta kuin %s."
 
 #: ../pxe_wizard/Pxe.pm:221
-msgid "Please provide a correct PXE name: one word or one number with no space."
-msgstr "ole hyvä ja valitse oikea PXE nimi: yksi sana tai numero ilman välilyöntejä"
+msgid ""
+"Please provide a correct PXE name: one word or one number with no space."
+msgstr ""
+"ole hyvä ja valitse oikea PXE nimi: yksi sana tai numero ilman välilyöntejä"
 
 #: ../pxe_wizard/Pxe.pm:225
-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 ""
 "Jos haluat lisätä/poistaa/muokata PXE käynnistyskuvatiedostoa, sinun pitää "
 "suorita 'Aseta PXE palvelin' ensin."
@@ -2086,7 +2091,8 @@ msgstr "PXE 'apu' tiedosto:"
 
 #: ../pxe_wizard/Pxe.pm:249
 msgid "The wizard will now modify boot options with those parameters:"
-msgstr "Nyt muokataan käynnistyskuvatiedoston käynnistysoptiot näillä parametreilla."
+msgstr ""
+"Nyt muokataan käynnistyskuvatiedoston käynnistysoptiot näillä parametreilla."
 
 #: ../pxe_wizard/Pxe.pm:266
 msgid "The wizard will now remove this PXE boot image"
@@ -2129,15 +2135,16 @@ msgstr "Samba velho"
 msgid "%s does not exist."
 msgstr "%s ei ole olemassa."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Kaikki - Ei käyttörajoituksia"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Omat säännöt - Vahvista sallitut ja kielletyt osoitteet"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba asetusvelho"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2146,7 +2153,12 @@ msgstr ""
 "työasemille, jotka eivät käytä Linuxia."
 
 #: ../samba_wizard/Samba.pm:71
-msgid "This wizard will help you configuring the Samba services of your server."
+msgid "Samba configuration wizard"
+msgstr "Samba asetusvelho"
+
+#: ../samba_wizard/Samba.pm:71
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr "Tämä velho auttaa asettamaan palvelimesi Samba-palvelut."
 
 #: ../samba_wizard/Samba.pm:76
@@ -2166,7 +2178,7 @@ msgid "The Workgroup is wrong"
 msgstr "Työryhmä on väärä"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Palvelin juliste:"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2180,20 +2192,16 @@ msgid "Banner:"
 msgstr "Juliste:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Palvelimen juliste on virheellinen"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Käyttörajoitus"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Käyttörajoitustaso:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Esimerkki 1: hyväksy kaikki ip-osoitteet välillä 150.203.*.* paitsi yksi "
@@ -2241,7 +2249,7 @@ msgid "Deny hosts:"
 msgstr "Kiellä osoitteet:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Käytössä olevat Samba-palvelut"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2258,7 +2266,7 @@ msgid "Enable file sharing area"
 msgstr "Ota käyttöön jaettu alue"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Ota käyttöön Palvelimen jaettu tulostus"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2298,7 +2306,7 @@ msgstr ""
 "root fred @users @wheel jokaiselle eri oikeudelle."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "Lukulista:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2306,7 +2314,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "Kirjoituslista:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2330,15 +2338,15 @@ msgstr ""
 "asettamiseksi."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Palvelin juliste:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Tiedostojako:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Tulostuspalvelin"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2398,15 +2406,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Valitse ensisijainen ja toissijainen palvelin listalta."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Aikapalvelimet"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Ensisijainen aikapalvelin:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Toissijainen aikapalvelin:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2478,15 +2486,15 @@ msgid "Web wizard"
 msgstr "WWW velho"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Tämä velho auttaa asettamaan WWW-palvelimen verkollesi."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "WWW-palvelimen asetusvelho"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Älä aseta yhtäkään ruutua jos et halua käynnistää WWW-palvelinta."
 
 #: ../web_wizard/Apache.pm:77
@@ -2494,23 +2502,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Valitse WWW-palvelun tyyppi jonka haluat ottaa käyttöön:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "WWW-palvelin"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Palvelimesi voi toimia WWW-palvelimena paikallisverkollesi (intranet) sekä "
 "Internetiin."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Ota käyttöön paikallisverkon (intranet) WWW-palvelin"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Ota käyttöön Internetin WWW-palvelin"
 
 #: ../web_wizard/Apache.pm:90
@@ -2551,18 +2559,18 @@ msgstr "käyttäjän http-alihakemisto: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Anna hakemisto jonka haluat olevan dokumenttien juurihakemisto."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Juurihakemisto:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Dokumenttien juurihakemisto:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Asetetaan WWW-palvelin"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Velho keräsi seuraavat parametrit jotka vaaditaan WWW-palvelimen "
 "asettamiseksi:"
@@ -2575,16 +2583,12 @@ msgstr "Intranet WWW-palvelin:"
 msgid "Internet web server:"
 msgstr "Internet WWW-palvelin:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Dokumenttien juurihakemisto:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Käyttäjien hakemisto:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Velho asetti Intranet/Internet WWW-palvelimesi onnistuneesti."
 
 #: ../web_wizard/Apache.pm:236
@@ -2595,3 +2599,46 @@ msgstr "Apache palvelin"
 msgid "Configuring your system as Apache server ..."
 msgstr "Asetetaan järjestelmäsi Apache-palvelimeksi ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Jos haluat ottaa PXE käyttöön dhcp-palvelimellesi, laita rasti ruutuun."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Velho asetti palvelimesi DHCP-palvelun onnistuneesti."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP-palvelin"
+
+#~ msgid "News Server"
+#~ msgstr "Uutisryhmäpalvelin"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS-palvelin"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Nis palvelin + Autofs map"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS-palvelin:"
+
+#~ msgid "Network File:"
+#~ msgstr "Verkkotiedosto:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "NFS exports:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Automattinen isäntä:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Automaattinen kotihakemisto:"
+
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
+#~ "'Edellinen' korjataksesi asetuksia"
+
+#~ msgid "Document Root:"
+#~ msgstr "Juurihakemisto:"
diff --git a/po/fr.po b/po/fr.po
index a96885bf..48ae20ed 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-06 14:39GMT\n"
 "Last-Translator: Pierre Soubourou <poupoune5@yahoo.fr>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "Erreur."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -198,8 +198,11 @@ msgstr ""
 "Cet assistant vous aide � configurer les services DHCP de votre serveur."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "Si vous souhaitez permettre PXE � votre serveur dhcp, cochez la case."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -216,15 +219,15 @@ msgstr ""
 "propos�es. (c. � d. 192.168.100.20 et 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Adresse IP la plus basse�:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Adresse IP la plus haute�:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Adresse IP passerelle�:"
 
 # add non breaking space before  colon in french
@@ -249,7 +252,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Configuration du serveur DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -286,7 +289,8 @@ msgid "Interface:"
 msgstr "Interface�:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 "L'assistant a configur� avec succ�s les services DHCP de votre serveur."
 
@@ -577,11 +581,11 @@ msgstr "Serveur DHCP (dhcpd)"
 msgid "DNS server"
 msgstr "Serveur de nom (DNS)"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Serveur de forums (News)"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Serveur de fichier (NFS)"
 
@@ -589,7 +593,7 @@ msgstr "Serveur de fichier (NFS)"
 msgid "Mail server"
 msgstr "Serveur de messagerie (Postfix)"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Serveur de fichier (FTP)"
 
@@ -647,41 +651,37 @@ msgid "FTP wizard"
 msgstr "Assistant FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Assistant de configuration du FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Cet assistant vous aide � configurer un serveur FTP pour votre r�seau."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Serveur FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Votre serveur peut servir de serveur FTP pour votre r�seau local (intranet) "
 "ainsi que pour l'Internet."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Activer le service FTP pour le r�seau local"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Activer le serveur FTP pour l'internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 "Adresse �lectronique de l'administrateur: adresse �lectronique de "
 "l'administrateur du FTP."
@@ -698,7 +698,7 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Chroot des utilisateurs: les utilisateurs ne verront que leur r�pertoire "
 "personnel."
@@ -718,12 +718,12 @@ msgid "Admin email:"
 msgstr "Adresse �lectronique de l'administrateur"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Autoriser root � se connecter:"
 
 # put non breaking space before colon in french
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Utilisateur Chroot Home :"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -754,8 +754,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:115
 #, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "Bash introuvable dans la liste des shells. Veuillez corriger."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -763,14 +763,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "D�sol�, vous devez �tre root pour faire ceci..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Configuration du service FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "L'assistant a rassembl� les param�tres suivants\n"
 "n�cessaires � la configuration de de votre serveur FTP"
@@ -785,11 +785,11 @@ msgstr ""
 "��Suivant�� ou utilisez le bouton ��Pr�c�dent�� pour les corriger"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Service FTP pour l'intranet�:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Service FTP pour Internet�:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -813,7 +813,7 @@ msgid "Allow FXP"
 msgstr "Autorise FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "L'assistant a configur� avec succ�s votre serveur FTP Intranet/Internet"
 
@@ -871,11 +871,11 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Le r�pertoire cible est d�j� utilis�, veuillez en choisir un autre."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 "Je vais configurer votre serveur d'installation avec les parametres suivant"
 
@@ -1095,7 +1095,7 @@ msgstr "Assistant de configuration des forums (News)"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Les noms d'h�tes Internet doivent �tre de la forme ��h�te.domaine."
@@ -1103,10 +1103,6 @@ msgstr ""
 "serveur de forums est souvent ��news.fournisseur.fr��."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Serveur de forums (News)"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1115,24 +1111,24 @@ msgstr ""
 "votre r�seau; ce nom est habituellement donn� par votre fournisseur d'acc�s."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nom du serveur de forums�:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "En fonction de votre type de connexion Internet, une fr�quence appropri�e "
 "d'interrogation varie de 6 � 24 heures."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Fr�quence d'alimentation"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1141,7 +1137,7 @@ msgstr ""
 "l'intervalle entre deux interrogations successives."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Fr�quence de rafraichissement (heures)�:"
 
 #: ../news_wizard/Inn.pm:76
@@ -1158,31 +1154,30 @@ msgstr "Configuration du serveur de forums"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "L'assistant a rassembl� les param�tres suivants\n"
 "n�cessaires pour configurer votre Service de forums :"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"Pour accepter ces valeurs et configurer le serveur, cliquez sur ��Suivant�� "
-"ou utilisez le bouton ��Pr�c�dent�� pour les corriger."
+"Pour accepter ces valeurs et configurer votre serveur, cliquez sur le bouton "
+"��Suivant�� ou utilisez le bouton ��Pr�c�dent�� pour les corriger"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Serveur de forums�:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Fr�quence d'alimentation�:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1193,7 +1188,6 @@ msgid "NFS Wizard"
 msgstr "Assistant de configuration NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Pas de restriction d'acc�s"
 
@@ -1206,25 +1200,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Assistant de configuration du serveur NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Cet assistant vous aide � configurer les services NFS de votre r�seau."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Serveur NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "R�pertoire :"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Contr�le d'acc�s"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Choisissez le niveau qui r�pond � vos besoins. En cas de doute, le niveau "
@@ -1273,7 +1264,7 @@ msgid "Netmask :"
 msgstr "Masque de r�seau :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "L'assistant a configur� avec succ�s votre serveur NFS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1285,18 +1276,15 @@ 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"
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "Serveur NIS  avec mappage Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Client NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Serveur NIS  avec mappage Autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
@@ -1305,7 +1293,7 @@ msgstr "Configurer un serveur NIS, avec des maps autofs."
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Le client peut automatiquement monter leur r�pertoire personnel lorsqu'ils "
@@ -1324,18 +1312,19 @@ msgstr "Configurer votre syst�me en tant que client NIS"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Remplissez les champs nisdomain et nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Serveur NFS :"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Domaine NIS :"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1357,11 +1346,6 @@ msgstr "Domaine NIS : domaine NIS pour votre serveur NIS"
 msgid "NIS server: name of your computer."
 msgstr "Serveur NIS : nom de votre ordinateur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Serveur NFS :"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "R�pertoire NIS personnel :"
@@ -1380,24 +1364,6 @@ msgstr "Ceci installera votre serveur NIS avec le mappage Autofs"
 msgid "NIS directory:"
 msgstr "Dossier NIS :"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Fichier r�seau :"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-# see next comment
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto master :"
-
-# don't know much how to translate that one and Auto master (item 115)
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto home :"
-
 # i love this sort of explanation!
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
@@ -1412,7 +1378,7 @@ msgstr "Serveur NIS : nom d'h�te du serveur NIS"
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 # I had to modify that one a bit...
@@ -1449,11 +1415,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Configurer votre syst�me en tant que client NIS avec mappage Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Serveur NIS avec mappage Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Configurer votre syst�me en tant que client NIS ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1546,7 +1512,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Les noms d'h�tes Internet doivent �tre de la forme ��h�te.domaine."
@@ -1603,15 +1569,6 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
 "votre Service de Courrier �lectronique :"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Pour accepter ces valeurs et configurer votre serveur, cliquez sur le bouton "
-"��Suivant�� ou utilisez le bouton ��Pr�c�dent�� pour les corriger"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1752,6 +1709,20 @@ msgid "Disk space (MB):"
 msgstr "Cache Disque (Mo)�:"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Contr�le d'acc�s"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Choisissez le niveau qui r�pond � vos besoins. En cas de doute, le niveau "
+"R�seau Local est souvent le choix le plus appropri�. Attention au fait que "
+"le niveau Tous peut �tre un probl�me de s�curit�."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Le proxy peut �tre configur� selon diff�rents niveaux de contr�le d'acc�s"
@@ -1820,6 +1791,15 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
 "votre proxy :"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Pour accepter ces valeurs et configurer le serveur, cliquez sur ��Suivant�� "
+"ou utilisez le bouton ��Pr�c�dent�� pour les corriger."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port�:"
@@ -2222,15 +2202,16 @@ msgstr "Assistant Samba"
 msgid "%s does not exist."
 msgstr "%s n'existe pas."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Pas de restriction d'acc�s"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Sp�cifier quels h�tes sont autoris�s ou non"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Configuration du partage de fichiers"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2239,6 +2220,10 @@ msgstr ""
 "des postes clients n'utilisant pas Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Configuration du partage de fichiers"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2261,7 +2246,7 @@ msgid "The Workgroup is wrong"
 msgstr "Le groupe de travail est incorrect"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Banni�re du serveur Samba."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2277,20 +2262,16 @@ msgid "Banner:"
 msgstr "Banni�re�:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "La banni�re du serveur est incorrecte"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Contr�le d'acc�s"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Niveau d'acc�s :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Exemple 1 : autoriser toutes les adresses IP dans la plage 150.203.*.* "
@@ -2340,7 +2321,7 @@ msgid "Deny hosts:"
 msgstr "H�tes non autoris�s :"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Services Samba actifs"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2358,7 +2339,7 @@ msgid "Enable file sharing area"
 msgstr "Activer l'espace public d'�change"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Activer le partage d'imprimantes"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2398,7 +2379,7 @@ msgstr ""
 "root, fred, @users, @wheel pour chaque type de permission."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "droit de lecture :"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2406,7 +2387,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @utilisateurs, @superutilisateurs"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "droit d'�criture :"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2430,15 +2411,15 @@ msgstr ""
 "configuration de Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Banni�re du serveur�:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Partage de fichiers�:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Partage d'imprimante�:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2501,15 +2482,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Selectionnez un serveur primaire et secondaire parmis la liste."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Serveurs de temps"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Serveur de temps (primaire) :"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Serveur de temps (secondaire)�:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2583,15 +2564,15 @@ msgid "Web wizard"
 msgstr "Assistant Web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Cet assistant vous aide � configurer un serveur Web pour votre r�seau."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Assistant de configuration du serveur Web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Ne cochez aucune case si vous ne voulez pas activer le serveur Web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2599,23 +2580,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "S�lectionnez le type de service Web que vous souhaitez activer"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Serveur Web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Votre serveur peut �tre configur� comme serveur Web pour votre r�seau local "
 "(intranet), ou comme serveur Web pour Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Activer le serveur Web pour l'intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Activer le serveur Web pour l'internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2663,18 +2644,18 @@ msgstr ""
 "Tapez le chemin local qui correspond � la racine des documents fournis par "
 "votre serveur Web."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Racine des documents :"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Configuration du serveur Web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "L'assistant a rassembl� les param�tres suivants n�cessaires pour la "
 "configuration du serveur web�:"
@@ -2687,16 +2668,12 @@ msgstr "Serveur Web intranet�:"
 msgid "Internet web server:"
 msgstr "Serveur Web�:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Racine des documents :"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "R�pertoire utilisateur :"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "L'assistant a configur� avec succ�s le service Web intranet/Internet sur "
 "votre serveur."
@@ -2709,6 +2686,51 @@ msgstr "Serveur Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurer votre syst�me en tant que serveur Apache ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Si vous souhaitez permettre PXE � votre serveur dhcp, cochez la case."
+
+#~ 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."
+
+#~ msgid "FTP Server"
+#~ msgstr "Serveur FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Serveur de forums (News)"
+
+#~ msgid "NFS Server"
+#~ msgstr "Serveur NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Serveur NIS  avec mappage Autofs"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Serveur NFS :"
+
+#~ msgid "Network File:"
+#~ msgstr "Fichier r�seau :"
+
+# see next comment
+#~ msgid "Auto master:"
+#~ msgstr "Auto master :"
+
+# don't know much how to translate that one and Auto master (item 115)
+#~ msgid "Auto home:"
+#~ msgstr "Auto home :"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Pour accepter ces valeurs et configurer votre serveur, cliquez sur le "
+#~ "bouton ��Suivant�� ou utilisez le bouton ��Pr�c�dent�� pour les corriger"
+
+#~ msgid "Document Root:"
+#~ msgstr "Racine des documents :"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Configuration de la messagerie Internet"
 
@@ -2862,9 +2884,7 @@ msgstr "Configurer votre syst�me en tant que serveur Apache ..."
 #~ msgid "Now will add your PXE boot image"
 #~ msgstr "Ajout de l'image d'amor�age de PXE"
 
-#~ msgid ""
-#~ "The wizard collected the following parameters\n"
-#~ "configure Samba."
+#~ msgid "The wizard collected the following parameters configure Samba."
 #~ msgstr ""
 #~ "L'assistant a rassembl� les param�tres suivants\n"
 #~ "n�cessaires � la configuration de Samba."
diff --git a/po/he.po b/po/he.po
index fe1c417c..6b56594d 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-02-26 12:24+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-25 21:05+0200\n"
 "Last-Translator: dovix <dovix2003@yahoo.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -43,7 +43,7 @@ msgstr "שגיאה"
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -183,8 +183,11 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "אשף זה יעזור לך בהגדרת שרותי DHCP של השרת שלך."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "אם ברצונך לאפשר PXE לשרת ה DHCP שלך יש לאשר בתיבת הסימון."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -201,15 +204,15 @@ msgstr ""
 "192.168.100.40)."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "כתובת ה IP הנמוכה:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "כתובת ה-IP הגבוהה:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "כתובת IP של השער (gateway):"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -233,7 +236,7 @@ msgid "The IP of the server must not be in range."
 msgstr "אסור שכתובת ה IP של השרת תהיה בטווח."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "הגדרת שרת ה-DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -267,7 +270,8 @@ msgid "Interface:"
 msgstr "ממשק:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרותי DHCP של השרת שלך."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -538,11 +542,11 @@ msgstr "שרת DHCP"
 msgid "DNS server"
 msgstr "שרת DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "שרת קבוצות דיון"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "שרת NFS"
 
@@ -550,7 +554,7 @@ msgstr "שרת NFS"
 msgid "Mail server"
 msgstr "שרת דואר"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "שרת FTP"
 
@@ -608,39 +612,35 @@ msgid "FTP wizard"
 msgstr "אשף FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "אשף הגדרת שרת FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "אשף זה יעזור לך להגדיר את שרת ה-FTP (העברת קבצים) ברשת שלך."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "שרת FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "נא לבחור את סוג שירות ה-FTP שברצונך לאפשר"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "השרת שלך יכול לתפקד כשרת FTP כלפי הרשת המקומית (רשת מקומית) וכשרת FTP כלפי "
 "האינטרנט."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "אפשור שרת ה-FTP עבור הרשת המקומית"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "אפשור שרת ה-FTP עבור האינטרנט"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "דוא\"ל מנהל: כתובת הדוא\"ל של מנהל שרות ה FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -652,7 +652,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -668,11 +668,11 @@ msgid "Admin email:"
 msgstr "דוא\"ל מנהל:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "אפשר התחברות כמנהל מערכת:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -695,8 +695,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "איני יכול למצוא את bash ברשימת המעטפות. עליך לתקן בעיה זו באופן ידני."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -704,13 +704,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr "צר לי, עליך להיות מנהל בכדי לבצע פעולה זו..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "הגדרת שרת ה-FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "אשף זה אסף את הנתונים הבאים\n"
 "הנדרשים להגדרת שרת ה-FTP שלך"
@@ -724,11 +724,11 @@ msgstr ""
 "לשנותם."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "שרת FTP ברשת המקומית::"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "שרת FTP באינטרנט:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -752,7 +752,7 @@ msgid "Allow FXP"
 msgstr "אפשר FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-FTP שלך עבור האינטרנט/רשת מקומית"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -800,11 +800,11 @@ msgstr ""
 "שגיאה, ספריית המקור צריכה להיות ספרייה המכילה את כל קבצי ההתקנה של Mandrake"
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "ספריית המטרה כבר בשימוש, יש לבחור ספרייה אחרת."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "שרת ההתקנה יוגדר עם המאפיינים הבאים"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1009,7 +1009,7 @@ msgstr "ברוך בואך לאשף קבוצות הדיון"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "כתובות אינטרנט צריכות להיות בצורה \"host.domain.domaintype\"; לדוגמה, אם "
@@ -1017,10 +1017,6 @@ msgstr ""
 "provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "שרת קבוצות דיון"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1029,23 +1025,23 @@ msgstr ""
 "בדרך-כלל על-ידי ספק האינטרנט שלך."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "שם שרת קבוצות הדיון:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "כתלות בסוג החיבור שלך לאינטרנט, תקופת התשאול האפשרית הוא בין 6 ועד 24 שעות."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "תקופת תשאול"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1053,7 +1049,7 @@ msgstr ""
 "תקופת התשאול מגדיר את פרק הזמן בין שתי שאילתות רצופות."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "תקופת תשאול (שעות):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1070,29 +1066,27 @@ msgstr "הגדרת קבוצות דיון"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr "האשף אסף את הנתונים הבאים הנדרשים בכדי להגדיר את שרת קבוצות הדיון שלך:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"לאישור ערכים אלו, ולהגדרת השרת, נא לבחור 'המשך' או לבחור 'חזור' על-מנת "
+"לאישור ערכים אלו, ולהגדרת השרת, עליך לבחור 'המשך' או לבחור 'חזור' על-מנת "
 "לשנותם."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "שרת קבוצות דיון:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "מרווח שאילתה:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "אשף זה סיים בהצלחה את הגדרת שרות קבוצות הדיון בשרת שלך."
@@ -1102,7 +1096,6 @@ msgid "NFS Wizard"
 msgstr "אשף NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "הכל - ללא הגבלות גישה"
 
@@ -1115,25 +1108,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "אשף הגדרת שרת NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "אשף זה יעזור לך בהגדרת שרת NFS עבור הרשת שלך."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "שרת NFS:"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "ספריה:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "בקרת גישה"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "יש לבחור ברמה העונה על צרכייך. באם אין רמה מועדפת, רמת 'רשת מקומית' הנה הערך "
@@ -1181,7 +1171,7 @@ msgid "Netmask :"
 msgstr "מיסוך רשת (Netmask) :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "אשף זה סיים בהצלחה את הגדרת שרת ה-NFS שלך"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1190,25 +1180,22 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "שרת NIS עם מפת Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "לקוח NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "שרת NIS עם מפת Autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1224,18 +1211,19 @@ msgstr "הגדרת המחשב שלך כלקוח NIS"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "יש להגדיר nisdomain ו nisserver בלבד"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "שרת NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "מתחם NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1253,11 +1241,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "שרת NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "NIS הבית:"
@@ -1275,22 +1258,6 @@ msgstr "אשף זה יגדיר את שרת ה NIS עם מפת Autofs."
 msgid "NIS directory:"
 msgstr "ספריית NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "קובץ רשת:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "ייצוא NFS:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto home:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "שם מתחם NIS:"
@@ -1302,7 +1269,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1332,11 +1299,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "הגדרת המערכת שלך כשרת NIS עם מפת Autofs..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "שרת NIS עם מפת Autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "הגדרת המערכת שלך כלקוח NIS ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1418,7 +1385,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "כתובות אינטרנט צריכות להיות בצורה \"host.domain.domaintype\"; לדוגמה, אם "
@@ -1463,14 +1430,6 @@ msgid ""
 "external mail server:"
 msgstr "אשף זה אסף את הנתונים הבאים הנדרשים להגדרת שרת הדואר החיצוני:"
 
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"לאישור ערכים אלו, ולהגדרת השרת, עליך לבחור 'המשך' או לבחור 'חזור' על-מנת "
-"לשנותם."
-
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
 msgstr "מבנה הכתובת"
@@ -1598,6 +1557,19 @@ msgid "Disk space (MB):"
 msgstr "מקום בדיסק הקשיח (MB)"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "בקרת גישה"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"יש לבחור ברמה העונה על צרכייך. באם אין רמה מועדפת, רמת 'רשת מקומית' הנה הערך "
+"המתאים ביותר. אזהרה - רמת 'הכל' עלולה להיות לא בטוחה."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "יש באפשרותך להגדיר לשרת המתווך רמות בקרת גישה שונות."
 
@@ -1661,6 +1633,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "האשף אסף את הנתונים הבאים הדרושים להגדרת השרת המתווך שלך:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"לאישור ערכים אלו, ולהגדרת השרת, נא לבחור 'המשך' או לבחור 'חזור' על-מנת "
+"לשנותם."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "ממשק:"
@@ -2008,15 +1989,16 @@ msgstr "אשף Samba"
 msgid "%s does not exist."
 msgstr "%s לא קיים."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "הכל - ללא הגבלות גישה"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "החוקים שלי - התאמה אישית של תחנות מורשות ומוגבלות"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "אשף הגדרת Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2025,6 +2007,10 @@ msgstr ""
 "מערכות הפעלה שאינן לינוקס."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "אשף הגדרת Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "אשף זה יעזור לך להגדיר את שרותי ה-Samba עבור השרת שלך."
@@ -2046,7 +2032,7 @@ msgid "The Workgroup is wrong"
 msgstr "קבוצת העבודה שגויה"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "כרזת השרת."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2060,20 +2046,16 @@ msgid "Banner:"
 msgstr "כרזה:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "כרזת השרת אינה תקינה"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "בקרת גישה"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "רמת גישה:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* דוגמה 1: איפשור כל כתובות ה-IP ב 150.203.*.*; חוץ מאחת\n"
@@ -2120,7 +2102,7 @@ msgid "Deny hosts:"
 msgstr "הגבלת תחנות:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "שרותי Samba מאופשרים"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2137,7 +2119,7 @@ msgid "Enable file sharing area"
 msgstr "אפשור אזור שיתוף קבצים"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "אפשור שיתוף מדפסות בשרת"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2176,7 +2158,7 @@ msgstr ""
 "root, fred, @users, @wheel עבור כל סוג של הרשאה."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "רשימת קריאה:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2184,7 +2166,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "רשימת כתיבה:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2204,15 +2186,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "האשף אסף את הנתונים הבאים הנדרשים להגדרת Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "כרזת שרת:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "שיתוף קבצים:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "שרת הדפסה:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2270,15 +2252,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "נא לבחור שרת ראשי ושרת משני מתוך הרשימה."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "שרתי זמן"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "שרת זמן עיקרי:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "שרת זמן משני:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2350,15 +2332,15 @@ msgid "Web wizard"
 msgstr "אשף אחסון אתרים"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "אשף זה יעזור לך להגדיר שרת אחסון אתרים עבור הרשת שלך."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "אשף הגדרת שרת אחסון אתרים (Web Server)"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "אין לסמן אף תיבה באם אין ברצונך להפעיל את שרת אחסון האתרים שלך."
 
 #: ../web_wizard/Apache.pm:77
@@ -2366,23 +2348,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "יש לבחור את סוג שירות ה-Web שברצונך להפעיל:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "שרת אחסון אתרים"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "השרת שלך יכול לשמש כשרת אחסון אתרים עבור הרשת הפנימית שלך (Intranet) וכשרת "
 "אחסון אתרים עבור האינטרנט."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "אפשור שרת אחסון אתרים לגישה מהרשת המקומית"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "אפשור שרת אחסון אתרים לגישה מהאינטרנט"
 
 #: ../web_wizard/Apache.pm:90
@@ -2423,18 +2405,18 @@ msgstr "תת-ספריית http של המשתמש : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "יש להגדיר את המסלול לספריית אחסון אתרים עליונה (document root)."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "ספריית אחסון אתרים עליונה:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "הגדרת תצורת שרת אחסון האתרים"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "האשף אסף את הנתונים הבאים הנדרשים להגדיר את שרת אחסון האתרים שלך"
 
 #: ../web_wizard/Apache.pm:137
@@ -2445,16 +2427,12 @@ msgstr "שרת אחסון אתרים עבור הרשת המקומית:"
 msgid "Internet web server:"
 msgstr "שרת אחסון אתרים באינטרנט:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "ספריית אחסון אתרים עליונה:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "ספריית משתמש:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "האשף סיים בהצלחה את הגדרת שרת אחסון אתרי הרשת המקומית/אינטרנט שלך"
 
 #: ../web_wizard/Apache.pm:236
@@ -2464,3 +2442,46 @@ msgstr "שרת Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "הגדרת המערכת שלך כשרת Apache ..."
+
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr "אם ברצונך לאפשר PXE לשרת ה DHCP שלך יש לאשר בתיבת הסימון."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "אשף זה סיים בהצלחה את הגדרת שרותי DHCP של השרת שלך."
+
+#~ msgid "FTP Server"
+#~ msgstr "שרת FTP"
+
+#~ msgid "News Server"
+#~ msgstr "שרת קבוצות דיון"
+
+#~ msgid "NFS Server"
+#~ msgstr "שרת NFS:"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "שרת NIS עם מפת Autofs"
+
+#~ msgid "NIS Server:"
+#~ msgstr "שרת NIS:"
+
+#~ msgid "Network File:"
+#~ msgstr "קובץ רשת:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "ייצוא NFS:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto home:"
+
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "לאישור ערכים אלו, ולהגדרת השרת, עליך לבחור 'המשך' או לבחור 'חזור' על-מנת "
+#~ "לשנותם."
+
+#~ msgid "Document Root:"
+#~ msgstr "ספריית אחסון אתרים עליונה:"
diff --git a/po/hi.po b/po/hi.po
index 8d42c4eb..f02061a0 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-15 23:02+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma) <dysxhi@yahoo.co.in>\n"
 "Language-Team: हिन्दी, भारत (Hindi, India) <dysxhi@yahoo.co.in>\n"
@@ -40,7 +40,7 @@ msgstr "त्रुटि ।"
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -189,10 +189,11 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "यह जादूगरी, आपके सर्वर की डीएचसीपी सेवाओं को संरचित करने में सहायता करेगी ।"
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"यदि आप अपने डीएचसीपी सर्वर के लिए पीएक्सई को सक्रिय करना चाहते है, तो कृपया बॉक्स को "
-"चिह्नन्ति करें ।"
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -209,15 +210,15 @@ msgstr ""
 "(उदाहरण के लिए: १९२.१६८.१००.२० १९२.१६८.१००.४०)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "निम्नतम आई०पी० पता:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "उच्चतम आई०पी० पता:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "गेटवे आईपी पता:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -241,7 +242,7 @@ msgid "The IP of the server must not be in range."
 msgstr "सर्वर का आई०पी सीमा के अंदर नहीं होना चाहिए ।"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "डीएचसीपी सर्वर को संरचित किया जा रहा है"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -277,7 +278,8 @@ msgid "Interface:"
 msgstr "इन्टरफ़ेस:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "जादूगरी ने, आपके सर्वर की डीएचसीपी सेवाओं को सफ़लता-पूर्वक संरचित किया ।"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -563,11 +565,11 @@ msgstr "डीएचसीपी सर्वर"
 msgid "DNS server"
 msgstr "डीएनएस सर्वर"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "समाचार सर्वर"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "एनएफ़एस सर्वर"
 
@@ -575,7 +577,7 @@ msgstr "एनएफ़एस सर्वर"
 msgid "Mail server"
 msgstr "विपत्र सर्वर"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "एफ़टीपी सर्वर"
 
@@ -633,42 +635,38 @@ msgid "FTP wizard"
 msgstr "एफ़टीपी जादूगरी"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "एफ़टीपी सर्वर संरचना जादूगरी"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "यह जादूगरी आपके नेटवर्क के लिए एक एफ़टीपी सर्वर को संरचित करने में सहायता प्रदान करेगा।"
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "एफ़टीपी सर्वर"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "चयन करें जिस प्रकार की एफ़टीपी सेवा को आप सक्रिय करना चाहते है:"
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "आपका सर्वर, एक एफ़टीपी सर्वर की भांति आपके आंतरिक नेटवर्क (इन्ट्रानेट) की तरफ़ व्यवहार कर "
 "सकता हैऔर इन्टरनेट के लिए एक एफ़टीपी सर्वर की भांति।"
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "एफ़टीपी सर्वर को इन्ट्रानेट के लिए समर्थ बनाये"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "एफ़टीपी सर्वर को इन्टरनेट के लिए समर्थ बनाये"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "विपत्र प्रबंध: एफ़टीपी प्रबंधक का विपत्र पता ।"
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -684,7 +682,7 @@ msgstr "एफ़एक्सपी अनुमति: अन्य एफ़टी�
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "सीएचरूट गृह उपयोगकर्ता: उपयोगकर्ता सिर्फ़ उनकी गृह निर्देशिका को देख पायेगें ।"
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -700,11 +698,11 @@ msgid "Admin email:"
 msgstr "विपत्र प्रबंध:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "रूट संत्रारम्भ को आज्ञापत्र:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "सीएचरूट होम उपयोगकर्ता:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -731,8 +729,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:115
 #, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "मै कोशो की सूची में बास (bash) को नहीं खोज सका । कॄपया ठीक करें ।"
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -740,14 +738,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "क्षमा करें, यह करने के लिए आपको महा-उपयोगकर्ता होना चाहिए..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "एफ़टीपी सर्वर को संरचित किया जा रहा है"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "इस जादूगरी ने निम्नलिखित मानकों को एकत्रित कर लिया है\n"
 "जो कि आपके एफ़टीपी सर्वर को संरचित करने के लिए आवश्यक है"
@@ -762,11 +760,11 @@ msgstr ""
 "क्लिक करें या पिछ्ला बटन का उपयोग करके उन्हें शुद्ध करें"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "इन्ट्रानेट एफ़टीपी सर्वर:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "आंतरिक एफ़टीपी सर्वर:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -790,7 +788,7 @@ msgid "Allow FXP"
 msgstr "एफ़एक्सपी को अनुमति"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "इस जादूगरी ने आपका इन्ट्रानेट/इन्टरनेट एफ़टीपी सर्वर को सफ़लता-पूर्वक संरचित दिया है"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -846,11 +844,11 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "गंतव्य निर्देशिका पहिले से उपयोग में है, कॄपया किसी अन्य का चयन करें।"
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "मै आपके संसाधन सर्वर को इन पैरामीटरों के साथ संरचित करूगा"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1066,7 +1064,7 @@ msgstr "समाचार जादूगरी में स्वागत"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "इन्टर होस्टों के नाम \"होस्ट.डोमेन.डोमेनकाप्रकार\" की भांति होना चाहिए;उदाहरण के बतौर, "
@@ -1074,10 +1072,6 @@ msgstr ""
 "\"समाचार.प्रदानकर्ता.कॉम\" होगा।"
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "समाचार सर्वर"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1086,24 +1080,24 @@ msgstr ""
 "प्रदान करता है;यह नाम सामान्यता आपके प्रदानकर्ता द्वारा प्रदान किया जाता है।"
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "समाचार सर्वर का नाम:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "आपके इन्टरनेट संबध के प्रकार पर निर्धारित, एक उचित चयन अवधि ६ से २४ घंटों केमध्य "
 "परिवर्तित हो सकती है।"
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "चयन (पोलिंग) अवधि"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1111,7 +1105,7 @@ msgstr ""
 "(पोल) करेगा; चयन अवधि, दो लगातार चयनों के मध्य के अन्तराल कोस्थापित करती है।"
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "चयन अवधि (घंटे):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1128,31 +1122,30 @@ msgstr "इन्टरनेट समाचार को संरचित �
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "इस जादूगरी ने निम्नलिखित मानकों को एकत्रित कर लिया है \n"
 "जो कि आपके इन्टरनेट समाचार सेवा को संरचित करने के लिए आवश्यक है:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "इस मूल्यों को स्वीकार करने के लिए, और अपने सर्वर को संरचित करने के लिए, अगला बटन पर "
-"क्लिक करें या पिछ्ला बटन का उपयोग करके उन्हें शुद्ध करें।"
+"क्लिक करें या पिछ्ला बटन का उपयोग करके उन्हें शुद्ध करें"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "समाचार सर्वर:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "चयन (पोलिंग) अन्तराल:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1163,7 +1156,6 @@ msgid "NFS Wizard"
 msgstr "एनएफ़एस जादूगरी"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "सभी - कोई पहुँच का बंधन नहीं"
 
@@ -1176,25 +1168,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "एनएफ़एस सर्वर संरचना जादूगरी"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "यह जादूगरी आपके नेटवर्क के लिए एनएफ़एस सर्वर को संरचित करने के लिए सहायता करेगी।"
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "एनएफ़एस सर्वर"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "निर्देशिका:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "पहुँच नियंत्रण"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "पहूँच नियंत्रण"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "उस स्तर का चयन करें जो कि आपकी अवश्यकतानुसार हो । यदि आपको ज्ञात नहीं है, तोस्थानीय "
@@ -1243,7 +1232,7 @@ msgid "Netmask :"
 msgstr "नेटमास्क :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "जादूगरी ने आपके एनएफ़एस सर्वर को सफ़लता-पूर्वक संरचित कर दिया है"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1256,18 +1245,15 @@ msgstr ""
 "एक ठीक डोमेन के नाम जो कि स्थानीय डोमेन के समकक्ष नहीं होना चाहिए या कुछ भी नहींकी "
 "आवश्यकता है । ठीक करने के लिए ड्रैककनेक्ट को आरम्भ करें ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
-msgstr " आटोएफ़एस मानचित्र के साथ एनआईएस सर्वर"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
+msgstr "आटोएफ़एस मानचित्र के साथ एनआईएस सर्वर"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "एनआईएस ग्राहक"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "आटोएफ़एस मानचित्र के साथ एनआईएस सर्वर"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
@@ -1276,7 +1262,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "ग्राहक उनकी गॄह निर्देशिका को स्वंम ही स्वचालित रूप से आरोहित कर सकते है,जब उन्होंने एक "
@@ -1295,18 +1281,19 @@ msgstr "कम्प्य़ूटर को एक एनआईएस ग्र�
 msgid "You just have to put nisdomain and nisserver."
 msgstr "आपको सिर्फ़ एनआईएस डोमेन और एनआईएस सर्वर को रखना होगा"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "एनआईएस सर्वर:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "एनआईएस डोमेन:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1328,11 +1315,6 @@ msgstr "एनआईएस डोमेन: आपके एनआईएस स�
 msgid "NIS server: name of your computer."
 msgstr "एनआईएस सर्वर: आपके कम्प्य़ूटर का नाम ।"
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "एनआईएस सर्वर:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "एनआईएस का गॄह:"
@@ -1351,22 +1333,6 @@ msgstr "आपके एनआईएस सर्वर को आटोएफ़�
 msgid "NIS directory:"
 msgstr "एनआईएस निर्देशिका:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "नेटवर्क संचिका:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "एनएफ़एस के एक्सपोर्ट:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "आटो मास्टर:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "आटो गृह:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1380,7 +1346,7 @@ msgstr "एनआईएस सर्वर: एनआईएससर्वर �
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1418,11 +1384,11 @@ msgstr ""
 "रहा ..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr " आटोएफ़एस मानचित्र के साथ एनआईएस"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "आपके तंत्र को एक एनआईएस ग्राहक की भांति संरचित किया जा रहा है ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1513,7 +1479,7 @@ msgstr "त्रुटि, सेन्डमेल संसाधित ह�
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "इन्टर होस्टों के नाम \"होस्ट.डोमेन.डोमेनकाप्रकार\" की भांति होना चाहिए;उदाहरण के बतौर, "
@@ -1569,15 +1535,6 @@ msgstr ""
 "यह जादूगरी निम्नलिखित मानकों को एकत्रित करेगी जो कि आपकी इन्टरनेट विपत्र सेवा कोसंरचित "
 "करने में आवश्यक होगें:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"इस मूल्यों को स्वीकार करने के लिए, और अपने सर्वर को संरचित करने के लिए, अगला बटन पर "
-"क्लिक करें या पिछ्ला बटन का उपयोग करके उन्हें शुद्ध करें"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1713,6 +1670,20 @@ msgid "Disk space (MB):"
 msgstr "डिस्क स्थान (एम०बी०):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "पहुँच नियंत्रण"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"उस स्तर का चयन करें जो कि आपकी अवश्यकतानुसार हो । यदि आपको ज्ञात नहीं है, तोस्थानीय "
+"नेटवर्क स्तर, सामान्यता सबसे ज्यादा उचित होता है। सावधान रहें! सभी स्तरसुरक्षित नहीं होते "
+"है।"
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "प्रोक्सी को विभिन्न पहूँच नियंत्रण स्तरों का उपयोग करने के लिए संरचित किया जा सकता है"
@@ -1780,6 +1751,15 @@ msgstr ""
 "इस जादूगरी ने निम्नलिखित मानकों को एकत्रित कर लिया है जि कि आपकी प्रोक्सी को संरचित "
 "करने के लिए आवश्यक है।"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"इस मूल्यों को स्वीकार करने के लिए, और अपने सर्वर को संरचित करने के लिए, अगला बटन पर "
+"क्लिक करें या पिछ्ला बटन का उपयोग करके उन्हें शुद्ध करें।"
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "पोर्ट:"
@@ -2172,15 +2152,16 @@ msgstr "सॉबा जादूगरी"
 msgid "%s does not exist."
 msgstr "%s विद्यमान नहीं है।"
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "सभी - कोई पहुँच का बंधन नहीं"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "मेरे नियम - मेरे से अनुमति-प्राप्त और निषेध होस्टों पूछें"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "सॉबा संरचना जादूगरी"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2189,6 +2170,10 @@ msgstr ""
 "संचिका और प्रिन्ट सर्वर की भांति आचरण की अनुमति प्रदान करता है।"
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "सॉबा संरचना जादूगरी"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "यह जादूगरी आपके सर्वर की सॉबा सेवाओं को संरचित करने में सहायता करेगी।"
@@ -2210,7 +2195,7 @@ msgid "The Workgroup is wrong"
 msgstr "यह कार्यसमूह अनुचित है"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "सर्वर ध्वजा ।"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2225,20 +2210,16 @@ msgid "Banner:"
 msgstr "ध्वजा:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "सर्वर ध्वजा अमान्य है"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "पहूँच नियंत्रण"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "पहुँच स्तर :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* उदाहरण १: १५०.२०३.*.* में सभी आई०पी० पतों को अनुमति दें; सिवाय एक के\n"
@@ -2285,7 +2266,7 @@ msgid "Deny hosts:"
 msgstr "होस्टों के लिए निषेधाज्ञा:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "सॉबा सेवाओं को समर्थ करें"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2302,7 +2283,7 @@ msgid "Enable file sharing area"
 msgstr "संचिका सहभाजन क्षेत्र सक्रिय"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "सर्वर प्रिन्टर सहभाजन को समर्थ करें"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2342,7 +2323,7 @@ msgstr ""
 "प्रत्येक प्रकार की अनुमति के लिए रूट, फ़्रेड, @उपयोगकर्ताओं, @व्हील ।"
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "पाठन सूची:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2350,7 +2331,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "रूट, फ़्रेड, @उपयोगकर्ताओं, @व्हील"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "लेखन सूची:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2371,15 +2352,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "इस जादूगरी ने सॉबा को संरचित करने हेतु निम्नलिखित मानकों को एकत्रित कर लिया है"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "सर्वर ध्वजा:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "संचिका सहभाजन:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "प्रिन्ट सर्वर:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2439,15 +2420,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "एक प्राथमिक और द्वितीय सर्वर का सूची में से चयन करें।"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "अनेक समय सर्वर"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "प्राथमिक समय सर्वर:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "द्वितीय समय सर्वर:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2520,15 +2501,15 @@ msgid "Web wizard"
 msgstr "वेब जादूगरी"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "यह जादूगरी आपके नेटवर्क के लिए वेब सर्वर को संरचित करने में सहायता करेगी।"
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "वेब सर्वर संरचना जादूगरी"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "किसी भी बॉक्स को चिंहित ना करें यदि आप आपने वेब सर्वर को सक्रिय नहीं करना चाहते है।"
 
@@ -2537,23 +2518,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "उस प्रकार की वेब सेवा को चयन करें जिसे आप सक्रिय करना चाहते है:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "वेब सर्वर"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "आपका सर्वर आपके आंतरिक नेटवर्क (इन्ट्रानेट) की तरफ़ एक वेब सर्वर की भांति औरइन्टरनेट के "
 "लिए , एक वेब सर्वर की तरह व्यवहार कर सकता है।"
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "इन्ट्रानेट के लिए वेब सर्वर को सक्रिय करें"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "वेब सर्वर को इन्टरनेट के लिए सक्रिय करें"
 
 #: ../web_wizard/Apache.pm:90
@@ -2594,18 +2575,18 @@ msgstr "उपयोगकर्ता एचटीटीपी उप-निर
 msgid "Type the path of the directory you want being the document root."
 msgstr "उस निर्देशिका का पथ बतायें जिसे आप प्रलेख के मूलरूप में रखना चाहते है।"
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "प्रलेखन का मूल:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "प्रलेख का मूल:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "वेब सर्वर की संरचना की जा रही है"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "इस जादूगरी ने आपके वेब सर्वर को संरचित करने में आवश्यक निम्नलिखित मानकों कोएकत्रित कर "
 "लिया है।"
@@ -2618,16 +2599,12 @@ msgstr "इन्ट्रानेट वेब सर्वर:"
 msgid "Internet web server:"
 msgstr "इन्टरनेट वेब सर्वर:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "प्रलेख का मूल:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "उपयोगकर्ता निर्देशिका:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "इस जादूगरी ने आपका इन्ट्रानेट/इन्टरनेट वेब सर्वर को सफ़लता-पूर्वक संरचित कर दिया है"
 
 #: ../web_wizard/Apache.pm:236
@@ -2638,6 +2615,52 @@ msgstr "आपाचे सर्वर"
 msgid "Configuring your system as Apache server ..."
 msgstr "आपके तंत्र को एक आपाचे सर्वर की भांति संरचित किया जा रहा है ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "यदि आप अपने डीएचसीपी सर्वर के लिए पीएक्सई को सक्रिय करना चाहते है, तो कृपया बॉक्स "
+#~ "को चिह्नन्ति करें ।"
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "जादूगरी ने, आपके सर्वर की डीएचसीपी सेवाओं को सफ़लता-पूर्वक संरचित किया ।"
+
+#~ msgid "FTP Server"
+#~ msgstr "एफ़टीपी सर्वर"
+
+#~ msgid "News Server"
+#~ msgstr "समाचार सर्वर"
+
+#~ msgid "NFS Server"
+#~ msgstr "एनएफ़एस सर्वर"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr " आटोएफ़एस मानचित्र के साथ एनआईएस सर्वर"
+
+#~ msgid "NIS Server:"
+#~ msgstr "एनआईएस सर्वर:"
+
+#~ msgid "Network File:"
+#~ msgstr "नेटवर्क संचिका:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "एनएफ़एस के एक्सपोर्ट:"
+
+#~ msgid "Auto master:"
+#~ msgstr "आटो मास्टर:"
+
+#~ msgid "Auto home:"
+#~ msgstr "आटो गृह:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "इस मूल्यों को स्वीकार करने के लिए, और अपने सर्वर को संरचित करने के लिए, अगला बटन पर "
+#~ "क्लिक करें या पिछ्ला बटन का उपयोग करके उन्हें शुद्ध करें"
+
+#~ msgid "Document Root:"
+#~ msgstr "प्रलेखन का मूल:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "इन्टरनेट विपत्र की संरचना की जा रही है"
 
diff --git a/po/hu.po b/po/hu.po
index 080edf78..75a1b1f1 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -48,7 +48,7 @@ msgstr "Hiba."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -209,7 +209,10 @@ msgstr ""
 "be�ll�t�s�hoz."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -228,16 +231,16 @@ msgstr ""
 "elfogadhatja a felk�n�lt �rt�keket."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Legalacsonyabb IP-c�m:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Legmagasabb IP-c�m:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Az �tj�r� IP-c�me:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -264,7 +267,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "A DHCP-kiszolg�l� be�ll�t�sa"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -300,7 +303,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l� DHCP-szolg�ltat�sait."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -586,13 +590,12 @@ msgstr "NFS-kiszolg�l�"
 msgid "DNS server"
 msgstr "NFS-kiszolg�l�"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "H�rkiszolg�l�"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS-kiszolg�l�"
 
@@ -601,8 +604,7 @@ msgstr "NFS-kiszolg�l�"
 msgid "Mail server"
 msgstr "Levelez�kiszolg�l� neve:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP-kiszolg�l�"
 
@@ -668,42 +670,38 @@ msgid "FTP wizard"
 msgstr "FTP-var�zsl�"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP-kiszolg�l�-be�ll�t�svar�zsl�"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "FTP-kiszolg�l�"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Az FTP-kiszolg�l� bekapcsol�sa az intranet sz�m�ra"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Az FTP-kiszolg�l� bekapcsol�sa az internet sz�m�ra"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -715,7 +713,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -731,11 +729,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -762,8 +760,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -771,14 +769,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "A m�velethez rendszergazdai jogosults�g sz�ks�ges."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Az FTP-kiszolg�l� be�ll�t�sa"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 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:"
@@ -793,11 +791,11 @@ msgstr ""
 "\"K�vetkez�\" gombot; jav�t�shoz az \"El�z�\" gombot."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranetes FTP-kiszolg�l�:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internetes FTP-kiszolg�l�:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -821,7 +819,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+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."
 
@@ -870,11 +868,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1099,7 +1097,7 @@ msgstr "�dv�zli a H�rvar�zsl�"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Az internetes g�pneveknek a k�vetkez� form�j�nak kell lenni: \"g�pn�v."
@@ -1107,10 +1105,6 @@ msgstr ""
 "\", akkor az internetes h�rkiszolg�l�� �ltal�ban \"news.szolg�ltat�.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "H�rkiszolg�l�"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1120,24 +1114,24 @@ msgstr ""
 "internetszolg�ltat�t�l lehet megszerezni."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "H�rkiszolg�l�-n�v:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Att�l f�gg�en, hogy milyen az internetkapcsolata, a lek�rdez�si peri�dust "
 "�rdemes egy 6 �s 24 �ra k�zti �rt�kre felvenni."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Lek�rdez�si peri�dus"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1146,7 +1140,7 @@ msgstr ""
 "amelynek el kell telni k�t egym�st k�vet� lek�rdez�s k�zt."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Lek�rdez�si peri�dus (�r�ban):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1164,31 +1158,30 @@ msgstr "Az internetes h�rszolg�ltat�s be�ll�t�sa"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 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 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "H�rkiszolg�l�:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Lek�rdez�si intervallum:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1199,7 +1192,6 @@ msgid "NFS Wizard"
 msgstr "NFS-var�zsl�"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Minden - nincs el�r�si tilt�s"
 
@@ -1212,27 +1204,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS-kiszolg�l�-be�ll�t�svar�zsl�"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Ez a var�zsl� seg�ts�get ny�jt az NFS-kiszolg�l�nak a h�l�zathoz val� "
 "be�ll�t�s�hoz."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS-kiszolg�l�"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "K�nyvt�r:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Hozz�f�r�skezel�s"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "V�lassza ki az ig�nyeinek megfelel� szintet. Ha nem biztos abban, hogy mit "
@@ -1282,7 +1271,7 @@ msgid "Netmask :"
 msgstr "H�l�zati maszk:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "A var�zsl� sikeresen be�ll�totta az NFS-kiszolg�l�t."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1291,28 +1280,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "H�rkiszolg�l�"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "A kliens IP-c�me:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "H�rkiszolg�l�"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1328,19 +1313,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS-kiszolg�l�"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1358,12 +1344,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS-kiszolg�l�"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1386,23 +1366,6 @@ msgstr "A var�zsl� sikeresen be�ll�totta a Samba kiszolg�l�t."
 msgid "NIS directory:"
 msgstr "Felhaszn�l�i k�nyvt�r:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "H�l�zati eszk�z"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 # a kimen� emailekhez haszn�land� domainnevet kell megadni az ut�na lev� mez�ben
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
@@ -1416,7 +1379,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1451,12 +1414,12 @@ msgstr "A DNS-kiszolg�l� be�ll�t�sa"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "H�rkiszolg�l�"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "A DNS-kiszolg�l� be�ll�t�sa"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1545,7 +1508,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Az internetes g�pneveknek a k�vetkez� form�j�nak kell lenni: \"g�pn�v."
@@ -1599,15 +1562,6 @@ 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:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1748,6 +1702,21 @@ msgid "Disk space (MB):"
 msgstr "Lemezhely (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Hozz�f�r�skezel�s"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"V�lassza ki az ig�nyeinek megfelel� szintet. Ha nem biztos abban, hogy mit "
+"�rdemes v�lasztani, v�lassza a \"Helyi h�l�zat\" szintet - �ltal�ban az a "
+"legmegfelel�bb. Legyen �vatos: lehets�ges, hogy a \"Minden\" elnevez�s� "
+"szint nem el�gg� biztons�gos."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr "A proxyhoz t�bb k�l�nb�z� hozz�f�r�skezel�si szint �ll�that� be."
@@ -1816,6 +1785,15 @@ msgstr ""
 "A var�zsl� a k�vetkez�, a proxy be�ll�t�s�hoz sz�ks�ges param�tereket "
 "gy�jt�tte �ssze:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2181,15 +2159,16 @@ msgstr "Samba-var�zsl�"
 msgid "%s does not exist."
 msgstr "%s nem l�tezik."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Minden - nincs el�r�si tilt�s"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Az �n szab�lyaim - k�rdezzen r� az enged�lyezett/letiltott g�pekre"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba be�ll�t�svar�zsl�"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2199,6 +2178,10 @@ msgstr ""
 "futtat� munka�llom�sok fel�."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba be�ll�t�svar�zsl�"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2223,7 +2206,7 @@ msgid "The Workgroup is wrong"
 msgstr "A munkacsoport helytelen"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "A kiszolg�l� le�r�sa."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2239,13 +2222,9 @@ msgid "Banner:"
 msgstr "Le�r�s:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "A kiszolg�l� le�r�sa helytelen"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Hozz�f�r�skezel�s"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Hozz�f�r�si szint:"
@@ -2253,7 +2232,7 @@ msgstr "Hozz�f�r�si szint:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* 1. p�lda: a 150.203.*.* mint�nak megfelel� IP-c�mek enged�lyez�se egy "
@@ -2302,7 +2281,7 @@ msgid "Deny hosts:"
 msgstr "Letiltott g�pek:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Samba-szolg�ltat�sok bekapcsolva"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2320,7 +2299,7 @@ msgid "Enable file sharing area"
 msgstr "A f�jlmegoszt�si ter�let bekapcsol�sa"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "A kiszolg�l� nyomtat�megoszt�s�nak bekapcsol�sa"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2361,7 +2340,7 @@ msgstr ""
 "k�vetkez�k�ppen: \\nroot, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "olvas�si lista:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2369,7 +2348,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "�r�si lista:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2393,15 +2372,15 @@ msgstr ""
 "gy�jt�tte �ssze:"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "A kiszolg�l� le�r�sa:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "F�jlmegoszt�s:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Nyomtat�kiszolg�l�:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2462,15 +2441,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "V�lasszon egy els�dleges �s egy m�sodlagos kiszolg�l�t a list�b�l."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Id�kiszolg�l�k"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Az els�dleges id�kiszolg�l�:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "A m�sodlagos id�kiszolg�l�:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2548,15 +2527,15 @@ msgid "Web wizard"
 msgstr "Web-var�zsl�"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Ez a var�zsl� seg�ts�get ny�jt a webkiszolg�l� be�ll�t�s�hoz."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Webkiszolg�l�-be�ll�t�si var�zsl�"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Ha nem k�v�nja aktiv�lni a webkiszolg�l�t, ne jel�lje ki egyik opci�t sem."
 
@@ -2565,23 +2544,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "V�lassza ki, milyen fajta webes szolg�ltat�st szeretne aktiv�lni:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Webkiszolg�l�"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Az �n kiszolg�l�ja ny�jthat webes szolg�ltat�sokat a bels� h�l�zat "
 "(intranet) fel� �s az internet fel� is."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "A webkiszolg�l� intranetes el�r�s�nek lehet�v� t�tele"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "A webkiszolg�l� internetes el�r�s�nek lehet�v� t�tele"
 
 #: ../web_wizard/Apache.pm:90
@@ -2629,18 +2608,18 @@ msgstr ""
 "Adja meg azon k�nyvt�r �tvonal�t, amelyik k�nyvt�rt dokumentumgy�k�rk�nt "
 "szeretn� haszn�lni."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Dokumentumgy�k�r:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "A webkiszolg�l� be�ll�t�sa"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "A var�zsl� a k�vetkez�, a webkiszolg�l� be�ll�t�s�hoz sz�ks�ges "
 "param�tereket gy�jt�tte �ssze:"
@@ -2653,16 +2632,12 @@ msgstr "Intranetes webkiszolg�l�:"
 msgid "Internet web server:"
 msgstr "Internetes webkiszolg�l�:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Dokumentumgy�k�r:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Felhaszn�l�i k�nyvt�r:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "A var�zsl� sikeresen be�ll�totta az intranetes/internetes webkiszolg�l�t."
 
@@ -2676,6 +2651,41 @@ msgstr "Intranetes webkiszolg�l�:"
 msgid "Configuring your system as Apache server ..."
 msgstr "A DNS-kiszolg�l� be�ll�t�sa"
 
+#~ 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."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP-kiszolg�l�"
+
+#~ msgid "News Server"
+#~ msgstr "H�rkiszolg�l�"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS-kiszolg�l�"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "H�rkiszolg�l�"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS-kiszolg�l�"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "H�l�zati eszk�z"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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."
+
+#~ msgid "Document Root:"
+#~ msgstr "Dokumentumgy�k�r:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Az internetes levelez�s be�ll�t�sa"
 
diff --git a/po/id.po b/po/id.po
index 0e02321a..7e2cef5b 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -41,7 +41,7 @@ msgstr "Error Wizard."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -190,7 +190,10 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -208,16 +211,16 @@ msgstr ""
 "terimalah nilai yg disarankan."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Alamat IP Terendah:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Alamat IP Tertinggi:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP Gateway:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -244,7 +247,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP server tak boleh berupa kisaran"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Konfigurasi Server DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -278,7 +281,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Layanan DHCP server sukses dikonfigurasikan."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -563,13 +567,12 @@ msgstr "Server NFS"
 msgid "DNS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "Server Berita"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Server NFS"
 
@@ -578,8 +581,7 @@ msgstr "Server NFS"
 msgid "Mail server"
 msgstr "Nama Server Mail:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Server FTP"
 
@@ -644,40 +646,36 @@ msgid "FTP wizard"
 msgstr "Konfigurator FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Dukun Konfigurasi Server FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Alat ini membantu konfigurasi Server FTP jaringan Anda."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Server FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Server Anda dapat berperan sbg Server FTP terhadap jaringan internal "
 "(intranet) dan Internet."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Aktifkan Server FTP utk Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Aktifkan Server FTP Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -689,7 +687,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -705,11 +703,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -735,8 +733,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -744,14 +742,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Maaf, Anda harus jadi root..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Konfigurasi Server FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "Parameter konfigurasi Server FTP telah terkumpul"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -764,11 +762,11 @@ msgstr ""
 "membetulkannya."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Server FTP Intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Server FTP Internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -792,7 +790,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Server FTP Intranet/Internet sukses dikonfigurasikan"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -840,11 +838,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1067,7 +1065,7 @@ msgstr "Selamat Datang di Dukun Berita"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Nama host Internet harus dalam bentuk \"host.domain.tipedomain\"; misalnya "
@@ -1075,10 +1073,6 @@ msgstr ""
 "provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Server Berita"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1087,24 +1081,24 @@ msgstr ""
 "biasanya nama ini disediakan oleh provider Anda."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nama Server Berita:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Jangka waktu polling yg tepat adalah antara 6 dan 24 jam, tergantung jenis "
 "koneksi internet Anda."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Jangka Waktu Polling"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1113,7 +1107,7 @@ msgstr ""
 "polling berurutan."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Jangka Waktu Polling (Jam):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1131,29 +1125,28 @@ msgstr "Konfigurasi Berita Internet"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr "Parameter konfigurasi Layanan Berita Internet telah terkumpul:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Klik Maju utk menerima nilai dan mengkonfigurasikan server, atau Kembali utk "
 "membetulkannya."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Server Berita:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Interval Polling:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Layanan Berita Internet server Anda sukses dikonfigurasikan."
@@ -1163,7 +1156,6 @@ msgid "NFS Wizard"
 msgstr "Dukun NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Semua - Tanpa batasan akses"
 
@@ -1176,25 +1168,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Konfigurator Server NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Alat ini membantu konfigurasi Server NFS jaringan Anda."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Server NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Direktori:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Kontrol Akses"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Kontrol akses"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Pilih tingkat sesuai kebutuhan. Jika tak tahu, tingkat Jaringan Lokal "
@@ -1242,7 +1231,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Server NFS sukses dikonfigurasikan"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1251,28 +1240,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Server Berita"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "IP Klien:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Server Berita"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1288,19 +1273,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Server NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1318,12 +1304,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Server NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1345,23 +1325,6 @@ msgstr "Server Samba sukses dikonfigurasikan."
 msgid "NIS directory:"
 msgstr "Direktori pengguna:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Perangkat Jaringan"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1374,7 +1337,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1409,12 +1372,12 @@ msgstr "Konfigurasi Server DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Server Berita"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurasi Server DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1500,7 +1463,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Nama host internet harus dalam bentuk \"host.domain.tipedomain\"; misalnya "
@@ -1551,15 +1514,6 @@ msgid ""
 "external mail server:"
 msgstr "Parameter konfigurasi Layanan Mail Internet telah terkumpul:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Klik Maju utk menerima nilai dan mengkonfigurasikan server, atau Kembali utk "
-"membetulkannya."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1695,6 +1649,19 @@ msgid "Disk space (MB):"
 msgstr "Ruang disk (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Kontrol Akses"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Pilih tingkat sesuai kebutuhan. Jika tak tahu, tingkat Jaringan Lokal "
+"biasanya paling cocok. Awas, SEMUA TINGKAT MUNGKIN TAK AMAN."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1762,6 +1729,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "Parameter konfigurasi proksi telah terkumpul:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Klik Maju utk menerima nilai dan mengkonfigurasikan server, atau Kembali utk "
+"membetulkannya."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2125,15 +2101,16 @@ msgstr "Konfigurator Samba"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Semua - Tanpa batasan akses"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Aturan saya - Tanyalah saya ttg host yg diizinkan/ditolak"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Konfigurator Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2142,6 +2119,10 @@ msgstr ""
 "stasiunkerja sistem non-Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Konfigurator Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Alat ini membantu konfigurasi layanan Samba server Anda."
@@ -2163,7 +2144,7 @@ msgid "The Workgroup is wrong"
 msgstr "Grupkerja salah"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Banner Server."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2177,13 +2158,9 @@ msgid "Banner:"
 msgstr "Banner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Banner Server tak benar"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Kontrol akses"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Tingkat Akses:"
@@ -2191,7 +2168,7 @@ msgstr "Tingkat Akses:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Contoh 1: izinkan semua IP di 150.203.*.*; kecuali satu\\nhosts allow = "
@@ -2237,7 +2214,7 @@ msgid "Deny hosts:"
 msgstr "Tolak host:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Layanan Samba Diaktifkan"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2255,7 +2232,7 @@ msgid "Enable file sharing area"
 msgstr "Aktifkan area sharing file"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Aktifkan Guna Bersama Printer Server"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2294,7 +2271,7 @@ msgstr ""
 "\\') seperti :\\nroot, fred, @users, @wheel utk tiap jenis izin."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "daftar baca:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2302,7 +2279,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "daftar tulis:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2323,15 +2300,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Parameter konfigurasi Samba telah terkumpul."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Banner Server:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Pemakaian Bersama File:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Server Cetak:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2389,15 +2366,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Pilih server primer dan sekunder dari daftar."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Server Waktu"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Server Waktu Primer:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Server Waktu Sekunder:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2473,15 +2450,15 @@ msgid "Web wizard"
 msgstr "Konfigurator web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Alat ini membantu konfigurasi Server Web jaringan Anda."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Konfigurator Server Web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Jangan tandai kotak jika tak ingin mengaktifkan Server Web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2489,23 +2466,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Pilih jenis layanan Web yg ingin diaktifkan:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Server Web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Server Anda dapat berperan sbg Server Web terhadap jaringan internal "
 "(intranet) dan Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Aktifkan Server Web utk Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Aktifkan Server Web utk Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2548,18 +2525,18 @@ msgstr "Sub-direktori http pengguna : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Ketikkan path direktori yg ingin dijadikan root dokumen."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Root Dokumen:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Root dokumen:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Konfigurasi Server Web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "Parameter konfigurasi Server Web telah terkumpul"
 
 #: ../web_wizard/Apache.pm:137
@@ -2570,16 +2547,12 @@ msgstr "Server web intranet:"
 msgid "Internet web server:"
 msgstr "Server web Internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Root dokumen:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Direktori pengguna:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Server Web Intranet/Internet sukses dikonfigurasikan"
 
 #: ../web_wizard/Apache.pm:236
@@ -2592,6 +2565,41 @@ msgstr "Server web intranet:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurasi Server DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Layanan DHCP server sukses dikonfigurasikan."
+
+#~ msgid "FTP Server"
+#~ msgstr "Server FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Server Berita"
+
+#~ msgid "NFS Server"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Server Berita"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Perangkat Jaringan"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Klik Maju utk menerima nilai dan mengkonfigurasikan server, atau Kembali "
+#~ "utk membetulkannya."
+
+#~ msgid "Document Root:"
+#~ msgstr "Root Dokumen:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Konfigurasi Mail Internet"
 
diff --git a/po/is.po b/po/is.po
index ba632223..7398d4de 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -43,7 +43,7 @@ msgstr "Villa."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -178,7 +178,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -193,16 +196,16 @@ msgid ""
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Notandanafn:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -226,7 +229,7 @@ msgid "The IP of the server must not be in range."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -260,8 +263,9 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
-msgstr ""
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
+msgstr "Vefmiðlari"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
@@ -526,12 +530,12 @@ msgstr "Vefmiðlari"
 msgid "DNS server"
 msgstr "Vefmiðlari"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "Vefmiðlari"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 #, fuzzy
 msgid "NFS server"
 msgstr "Vefmiðlari"
@@ -541,7 +545,7 @@ msgstr "Vefmiðlari"
 msgid "Mail server"
 msgstr "Vefmiðlari"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 #, fuzzy
 msgid "FTP server"
 msgstr "Vefmiðlari"
@@ -605,15 +609,11 @@ msgid "FTP wizard"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
-msgstr ""
-
-#: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:79
@@ -622,20 +622,20 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -647,7 +647,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -663,11 +663,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -690,8 +690,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -699,13 +699,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -715,11 +715,11 @@ msgid ""
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -743,7 +743,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -791,11 +791,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1013,43 +1013,39 @@ msgstr ""
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr ""
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:76
@@ -1066,27 +1062,25 @@ msgstr ""
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1096,7 +1090,6 @@ msgid "NFS Wizard"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr ""
 
@@ -1109,25 +1102,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr ""
-
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Mappa:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 
@@ -1171,7 +1161,7 @@ msgid "Netmask :"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1180,27 +1170,23 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Vefmiðlari"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Vefmiðlari"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1216,19 +1202,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Vefmiðlari"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1246,12 +1233,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Vefmiðlari"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr ""
@@ -1271,22 +1252,6 @@ msgstr "Vefmiðlari"
 msgid "NIS directory:"
 msgstr "Mappa:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
@@ -1298,7 +1263,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1329,12 +1294,12 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Vefmiðlari"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Vefmiðlari"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1413,7 +1378,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
@@ -1457,12 +1422,6 @@ msgid ""
 "external mail server:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1588,6 +1547,17 @@ msgid "Disk space (MB):"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 
@@ -1642,6 +1612,13 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Gátt:"
@@ -1994,12 +1971,12 @@ msgstr ""
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+#: ../samba_wizard/Samba.pm:65
+msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
+#: ../samba_wizard/Samba.pm:66
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
@@ -2009,6 +1986,10 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2030,7 +2011,7 @@ msgid "The Workgroup is wrong"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
@@ -2044,11 +2025,7 @@ msgid "Banner:"
 msgstr "Borði:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
-msgstr ""
-
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
+msgid "The server banner is incorrect"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:114
@@ -2057,7 +2034,7 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2094,7 +2071,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
@@ -2109,7 +2086,7 @@ msgid "Enable file sharing area"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:142
@@ -2143,7 +2120,7 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2151,7 +2128,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:182
@@ -2172,16 +2149,16 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:219
 #, fuzzy
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Vefmiðlari"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2237,15 +2214,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr ""
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2313,15 +2290,15 @@ msgid "Web wizard"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
@@ -2329,21 +2306,21 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Vefmiðlari"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:90
@@ -2377,18 +2354,18 @@ msgstr ""
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:137
@@ -2399,16 +2376,12 @@ msgstr ""
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr ""
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:236
@@ -2421,6 +2394,14 @@ msgstr "Vefmiðlari"
 msgid "Configuring your system as Apache server ..."
 msgstr "Vefmiðlari"
 
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Vefmiðlari"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Vefmiðlari"
+
 #~ msgid "Cancel"
 #~ msgstr "Hætta við"
 
diff --git a/po/it.po b/po/it.po
index 2396c5a4..ebb00d4f 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -44,7 +44,7 @@ msgstr "Errore."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -202,7 +202,10 @@ msgstr ""
 "Questo assistente ti aiuter� a configurare il servizio DHCP sul server."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -221,16 +224,16 @@ msgstr ""
 "tranquillamente accettare i valori proposti."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Indirizzo minimo:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Indirizzo massimo:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP gateway:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -256,7 +259,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Configurazione del server DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -292,7 +295,8 @@ msgid "Interface:"
 msgstr "Interfaccia:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 "L'assistente ha completato con successo la configurazione del servizio DHCP."
 
@@ -579,11 +583,11 @@ msgstr "Server FTP"
 msgid "DNS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Server news"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Server NFS"
 
@@ -591,8 +595,7 @@ msgstr "Server NFS"
 msgid "Mail server"
 msgstr "Server di posta"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Server FTP"
 
@@ -654,40 +657,36 @@ msgid "FTP wizard"
 msgstr "Configurazione FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Assistente di configurazione del server FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Questo assistente ti aiuter� a configurare un server FTP per la rete."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Server FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Il server pu� agire come server FTP sia verso la rete locale (Intranet) che "
 "verso Internet."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Attiva il server FTP per l'Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Attiva il server FTP per Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -699,7 +698,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -715,11 +714,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -746,8 +745,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -755,14 +754,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Devi essere root per poter usare questo assistente..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Configurazione del server FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "L'assistente ha ricavato i seguenti parametri\n"
 "per la configurazione del server FTP."
@@ -777,11 +776,11 @@ msgstr ""
 "altrimenti, se vuoi modificarli, premi \"Indietro\"."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Server FTP per Intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Server FTP per Internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -805,7 +804,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server FTP per "
 "Internet e Intranet."
@@ -855,11 +854,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1085,7 +1084,7 @@ msgstr "Benvenuto nell'assistente di configurazione delle news."
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Il nome del server su Internet deve essere nella forma \"host.domino."
@@ -1093,10 +1092,6 @@ msgstr ""
 "per le news in genere � \"news.provider.it\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Server news"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1105,24 +1100,24 @@ msgstr ""
 "le news; in genere viene fornito dal provider Internet."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nome del server news:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "A seconda del tipo di connessione Internet, un intervallo di interrogazione "
 "appropriato pu� variare dalle 6 alle 24 ore."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Intervallo di interrogazione"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1131,7 +1126,7 @@ msgstr ""
 "il tempo che intercorre tra due consultazioni successive."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Intervallo di interrogazione (ore):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1148,31 +1143,30 @@ msgstr "Configurazione delle news da Internet"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "servizio di news."
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Per confermare questi valori e configurare il server premi \"Avanti\"; "
 "altrimenti, se vuoi modificarli, premi \"Indietro\"."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Server di news:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Intervallo fra le interrogazioni:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1184,7 +1178,6 @@ msgid "NFS Wizard"
 msgstr "Configurazione NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Tutti - nessuna restrizione di accesso"
 
@@ -1197,26 +1190,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Assistente di configurazione del server NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Questo assistente ti aiuter� a configurare un server NFS per la rete locale."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Server NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Controllo dell'accesso"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Scegli il livello che risponde alle tue esigenze. Se sei in dubbio, di "
@@ -1265,7 +1255,7 @@ msgid "Netmask :"
 msgstr "Netmask:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server NFS"
 
@@ -1275,28 +1265,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Server news"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Indirizzo del client:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Server news"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1312,19 +1298,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Server NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1342,12 +1329,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Server NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1370,23 +1351,6 @@ msgstr ""
 msgid "NIS directory:"
 msgstr "Directory utente:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Periferica di rete"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1399,7 +1363,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1436,12 +1400,12 @@ msgstr "Configurazione del server DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Server news"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Configurazione del server DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1531,7 +1495,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Il nome del server su Internet deve essere nella forma \"host.domino."
@@ -1584,15 +1548,6 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "servizio di posta elettronica."
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Per confermare questi valori e configurare il server premi \"Avanti\"; "
-"altrimenti, se vuoi modificarli, premi \"Indietro\"."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1733,6 +1688,20 @@ msgid "Disk space (MB):"
 msgstr "Spazio su disco (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Controllo dell'accesso"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Scegli il livello che risponde alle tue esigenze. Se sei in dubbio, di "
+"solito il livello \"Rete locale\" � il pi� appropriato. Attenzione: il "
+"livello \"Tutti\" potrebbe non essere sicuro."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Il proxy pu� essere configurato per utilizzare diversi livelli di controllo "
@@ -1802,6 +1771,15 @@ msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "proxy."
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Per confermare questi valori e configurare il server premi \"Avanti\"; "
+"altrimenti, se vuoi modificarli, premi \"Indietro\"."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Porta:"
@@ -2169,15 +2147,16 @@ msgstr "Configurazione Samba"
 msgid "%s does not exist."
 msgstr "%s non esiste."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Tutti - nessuna restrizione di accesso"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Personalizzato - seleziona host autorizzati e rifiutati"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Assistente di configurazione di Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2186,6 +2165,10 @@ msgstr ""
 "macchine che non utilizzano un sistema Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Assistente di configurazione di Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Questo assistente ti aiuter� a configurare i servizi Samba sul server."
@@ -2209,7 +2192,7 @@ msgid "The Workgroup is wrong"
 msgstr "Il gruppo di lavoro non � corretto"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Descrizione del server"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2225,20 +2208,16 @@ msgid "Banner:"
 msgstr "Descrizione:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "La descrizione del server non � corretta"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Controllo dell'accesso"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Livello di accesso:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Esempio 1 - permetti l'accesso a tutti gli indirizzi IP del tipo 150.203.*."
@@ -2287,7 +2266,7 @@ msgid "Deny hosts:"
 msgstr "hosts deny:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Servizi Samba attivati"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2305,7 +2284,7 @@ msgid "Enable file sharing area"
 msgstr "Attiva l'area di condivisione dei file"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Attiva condivisione delle stampanti"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2344,7 +2323,7 @@ msgstr ""
 "root, mario, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "Lista di lettura:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2352,7 +2331,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, mario, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "Lista di scrittura:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2375,15 +2354,15 @@ msgstr ""
 "per la configurazione di Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Descrizione server:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Condivisione dei file:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Server di stampa:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2447,15 +2426,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Scegli dall'elenco un server primario e uno secondario."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Time server"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Time server primario:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Time server secondario:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2528,15 +2507,15 @@ msgid "Web wizard"
 msgstr "Configurazione server web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Questo assistente ti aiuter� a configurare un server web per la rete."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Assistente di configurazione del server web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Non attivare alcuna opzione se non desideri attivare il server web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2544,23 +2523,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Indica il tipo di servizio web che vuoi attivare."
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Server web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Il tuo server pu� funzionare da server web sia per la rete locale che per "
 "Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Attiva il server web per Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Attiva il server web per Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2605,18 +2584,18 @@ msgstr ""
 "Inserisci il percorso della directory che vuoi usare come radice per i "
 "documenti."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Directory radice dei documenti:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Configurazione del server web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "L'assistente ha ricavato i seguenti parametri per la configurazione del "
 "server web."
@@ -2629,16 +2608,12 @@ msgstr "Server web per Intranet:"
 msgid "Internet web server:"
 msgstr "Server web per Internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Directory radice dei documenti:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Directory utente:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "L'assistente ha completato con successo la configurazione del server web"
 
@@ -2652,6 +2627,43 @@ msgstr "Server web Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurazione del server DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr ""
+#~ "L'assistente ha completato con successo la configurazione del servizio "
+#~ "DHCP."
+
+#~ msgid "FTP Server"
+#~ msgstr "Server FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Server news"
+
+#~ msgid "NFS Server"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Server news"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Periferica di rete"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Per confermare questi valori e configurare il server premi \"Avanti\"; "
+#~ "altrimenti, se vuoi modificarli, premi \"Indietro\"."
+
+#~ msgid "Document Root:"
+#~ msgstr "Directory radice dei documenti:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Configurazione della posta elettronica"
 
diff --git a/po/ja.po b/po/ja.po
index 310c35bb..64a73f3f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-24 00:31-0500\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -40,7 +40,7 @@ msgstr "エラー"
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -183,8 +183,11 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "このウィザードでサーバのDHCPサービスを設定します。"
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "DHCPサーバのPXEを有効にする場合はこのボックスにチェック"
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -201,15 +204,15 @@ msgstr ""
 "192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "下限のIPアドレス:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "上限のIPアドレス:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IPアドレス:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -233,7 +236,7 @@ msgid "The IP of the server must not be in range."
 msgstr "このサーバのIPはこの範囲にあってはいけない"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCPサーバを設定"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -267,7 +270,8 @@ msgid "Interface:"
 msgstr "インタフェース:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "サーバのDHCPサービスの設定が終わりました。"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -535,11 +539,11 @@ msgstr "DHCPサーバ"
 msgid "DNS server"
 msgstr "DNSサーバ"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "ニュースサーバ"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFSサーバ"
 
@@ -547,7 +551,7 @@ msgstr "NFSサーバ"
 msgid "Mail server"
 msgstr "メールサーバ"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTPサーバ"
 
@@ -605,39 +609,35 @@ msgid "FTP wizard"
 msgstr "FTPウィザード"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTPサーバの設定ウィザード"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "このウィザードではFTPサーバを設定します。"
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTPサーバ"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "動作させるFTPサービスを選んでください:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "サーバは内部ネットワーク(イントラネット)用のFTPサーバと\n"
 "インターネット用のFTPサーバとして動作します。"
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "イントラネット用のFTPサーバ"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "インターネット用のFTPサーバ"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "管理者のEmail: FTP管理者のEmailアドレス"
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -649,7 +649,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "FXPを許可: 他のFTP経由のファイル転送を許可"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "Chrootホームユーザ: 自分のホームディレクトリだけを見ることができる"
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -665,11 +665,11 @@ msgid "Admin email:"
 msgstr "管理者のEmail:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "rootログインを許可:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chrootホームユーザ:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -695,8 +695,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "シェルのリストにbashがありません。修正してください"
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -704,13 +704,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr "rootで行ってください.."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTPサーバを設定"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "このウィザードでFTPサーバの設定に必要な以下の情報を集めました:"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -722,11 +722,11 @@ msgstr ""
 "ださい。"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "イントラネットFTPサーバ:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "インターネットFTPサーバ:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -750,7 +750,7 @@ msgid "Allow FXP"
 msgstr "FXPを許可"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "イントラネット/インターネットFTPサーバの設定が終わりました。"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -802,11 +802,11 @@ msgstr ""
 "リにしてください"
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "対象ディレクトリは使用中です。別のものを選んでください"
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "インストールするサーバをこの内容で設定します"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1025,7 +1025,7 @@ msgstr "ニュースウィザードへようこそ"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "インターネットホスト名は\"host.domain.domaintype\"の\n"
@@ -1034,10 +1034,6 @@ msgstr ""
 "\"news.provider.com\"のようになります。"
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "ニュースサーバ"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1047,24 +1043,24 @@ msgstr ""
 "指定しています。"
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "ニュースサーバ名:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "お使いのインターネット接続にもよりますが、適当な調査間隔は\n"
 "6〜24時間の間です。"
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "調査間隔"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1073,7 +1069,7 @@ msgstr ""
 "指定します。"
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "調査間隔(時間単位で):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1090,27 +1086,28 @@ msgstr "インターネットニュースを設定"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr "このウィザードで以下の情報を集めました:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
-msgstr "これで良ければ'次へ'を、修正する場合は'戻る'をクリック"
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
+msgstr ""
+"これで良ければ'次へ'をクリックしてください。もしくは'戻る'で内容を修正してく"
+"ださい。"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "ニュースサーバ:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "調査間隔:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "サーバのインターネットニュースサービスを設定しました。"
@@ -1120,7 +1117,6 @@ msgid "NFS Wizard"
 msgstr "NFSウィザード"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "全て - アクセス制限なし"
 
@@ -1133,25 +1129,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFSサーバの設定ウィザード"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "このウィザードではNFSサーバを設定します。"
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFSサーバ"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "ディレクトリ:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "アクセス制限"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "必要にあったものを選んでください。分からない場合はローカル\n"
@@ -1199,7 +1192,7 @@ msgid "Netmask :"
 msgstr "ネットマスク: "
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "NFSサーバの設定が終わりました。"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1210,25 +1203,22 @@ msgstr ""
 "NISドメイン名を修正する必要があります。For a NIS server you need a correct "
 "NIS domainname, not equal to localdomain or none."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "autofs mapのNISサーバ"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NISクライアント"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "autofs mapのNISサーバ"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "NISサーバをautofs map, auto.home, auto.masterファイルで設定"
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "ユーザはサーバからホームディレクトリを自動的にマウントします(NISクライアント"
@@ -1246,18 +1236,19 @@ msgstr "コンピュータをNISクライアントとして設定"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "NISドメインとNISサーバを入れてください"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NFSサーバ:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NISドメイン:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 "NISサーバはユーザ/ホスト名/データベースを作成するのに有用です。The wizard "
@@ -1280,11 +1271,6 @@ msgstr "NISドメイン: 使用するNISドメイン(一般的にはDNSドメイ
 msgid "NIS server: name of your computer."
 msgstr "NFSサーバ: コンピュータの名前"
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NFSサーバ:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "ホームNIS:"
@@ -1302,22 +1288,6 @@ msgstr "autofs mapのNISサーバを設定"
 msgid "NIS directory:"
 msgstr "NISディレクトリ:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "ネットワークファイル:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "NFS exports:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto home:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "NISドメイン名: NISドメインの名前"
@@ -1329,7 +1299,7 @@ msgstr "NISサーバ: NISサーバのホスト名"
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1359,11 +1329,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "システムをautofs mapのNISサーバとして設定.."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "autofs mapのNIS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "システムをNISクライアントとして設定.."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1451,7 +1421,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "インターネットホスト名は\"host.domain.domaintype\"の\n"
@@ -1501,15 +1471,6 @@ msgid ""
 "external mail server:"
 msgstr "このウィザードで以下の情報を集めました:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"これで良ければ'次へ'をクリックしてください。もしくは'戻る'で内容を修正してく"
-"ださい。"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1642,6 +1603,19 @@ msgid "Disk space (MB):"
 msgstr "ディスク容量(MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "アクセス制限"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"必要にあったものを選んでください。分からない場合はローカル\n"
+"ネットワークを選んでください。'全て'は安全ではありません。"
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "このプロクシは別のアクセス制限用に設定することができます"
 
@@ -1703,6 +1677,13 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "このウィザードで以下の情報を集めました:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr "これで良ければ'次へ'を、修正する場合は'戻る'をクリック"
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "ポート:"
@@ -2091,15 +2072,16 @@ msgstr "Sambaウィザード"
 msgid "%s does not exist."
 msgstr "%s はありません"
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "全て - アクセス制限なし"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "手動指定 - 許可/拒否するホストを尋ねる"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Sambaの設定ウィザード"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2108,6 +2090,10 @@ msgstr ""
 "印刷サーバとして働くサーバです。"
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Sambaの設定ウィザード"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "このウィザードではサーバのSambaサービスを設定します。"
@@ -2131,7 +2117,7 @@ msgid "The Workgroup is wrong"
 msgstr "ワークグループが不正です。"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "サーバのバナー"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2147,20 +2133,16 @@ msgid "Banner:"
 msgstr "バナー:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "サーバのバナーが不正です"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "アクセス制限"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "アクセスレベル: "
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* 例１: 150.203.*.* の全IPを許可するが１つだけ除外\n"
@@ -2207,7 +2189,7 @@ msgid "Deny hosts:"
 msgstr "拒否ホスト:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Sambaサービスを有効にする"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2225,7 +2207,7 @@ msgid "Enable file sharing area"
 msgstr "ファイル共有エリアを有効にする"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "サーバのプリンタを共有する"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2265,7 +2247,7 @@ msgstr ""
 "例えば権限ごとに root, hiroshi, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "読み取り:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2273,7 +2255,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, hiroshi, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "書き込み:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2293,15 +2275,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "このウィザードではSambaの設定に必要な情報を集めます。"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "サーバのバナー:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "ファイル共有:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "印刷サーバ:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2363,15 +2345,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "プライマリ/セカンダリサーバをリストから選んでください。"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "タイムサーバ"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "プライマリタイムサーバ:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "セカンダリタイムサーバ:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2443,15 +2425,15 @@ msgid "Web wizard"
 msgstr "ウェブウィザード"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "このウィザードではウェブサーバを設定します。"
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "ウェブサーバの設定ウィザード"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "ウェブサーバを有効にしない場合は全てのチェックを外す"
 
 #: ../web_wizard/Apache.pm:77
@@ -2459,23 +2441,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "有効にするウェブサービスの種類を選んでください:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "ウェブサーバ"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "サーバは内部ネットワーク(イントラネット)用のウェブサーバと\n"
 "インターネット用のウェブサーバとして動作します。"
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "イントラネット用のウェブサーバ"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "インターネット用のウェブサーバ"
 
 #: ../web_wizard/Apache.pm:90
@@ -2516,18 +2498,18 @@ msgstr "ユーザ用のhttpサブディレクトリ: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Document Rootにするディレクトリのパスを入力"
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Document root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "ウェブサーバを設定"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "このウィザードで以下の情報を集めました:"
 
 #: ../web_wizard/Apache.pm:137
@@ -2538,16 +2520,12 @@ msgstr "イントラネットウェブサーバ:"
 msgid "Internet web server:"
 msgstr "インターネットウェブサーバ:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Document root:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "ユーザのディレクトリ:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "イントラネット/インターネットウェブサーバを設定しました"
 
 #: ../web_wizard/Apache.pm:236
@@ -2558,6 +2536,50 @@ msgstr "Apacheサーバ"
 msgid "Configuring your system as Apache server ..."
 msgstr "システムをApacheサーバとして設定.."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr "DHCPサーバのPXEを有効にする場合はこのボックスにチェック"
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "サーバのDHCPサービスの設定が終わりました。"
+
+#~ msgid "FTP Server"
+#~ msgstr "FTPサーバ"
+
+#~ msgid "News Server"
+#~ msgstr "ニュースサーバ"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFSサーバ"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "autofs mapのNISサーバ"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NFSサーバ:"
+
+#~ msgid "Network File:"
+#~ msgstr "ネットワークファイル:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "NFS exports:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto home:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "これで良ければ'次へ'をクリックしてください。もしくは'戻る'で内容を修正して"
+#~ "ください。"
+
+#~ msgid "Document Root:"
+#~ msgstr "Document Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "インターネットメールを設定"
 
diff --git a/po/ko.po b/po/ko.po
index cb339f25..12c8db87 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -46,7 +46,7 @@ msgstr "������ ����."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -198,7 +198,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "�� ������� DHCP ���� ������ ���� ���Դϴ�."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -216,16 +219,16 @@ msgstr ""
 "�� ������ ���� ����� �� �ֽ��ϴ�."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "���� IP �ּ�:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "�ְ� IP �ּ�:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "����Ʈ���� IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -251,7 +254,7 @@ msgid "The IP of the server must not be in range."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP ���� ���� ��"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -285,7 +288,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "�����簡 ���������� DHCP ������ �����Ͽ����ϴ�."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -569,13 +573,12 @@ msgstr "NFS ����"
 msgid "DNS server"
 msgstr "NFS ����"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "���� ����"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS ����"
 
@@ -584,8 +587,7 @@ msgstr "NFS ����"
 msgid "Mail server"
 msgstr "���� ���� �̸�:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP ����"
 
@@ -650,40 +652,36 @@ msgid "FTP wizard"
 msgstr "FTP ������"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP ���� ���� ������"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "�� ������� FTP ���� ������ ���� ���Դϴ�."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP ����"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Ȱ��ȭ�� FTP ������ ������ �����ϼ���:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "�� ������ ���� ��Ʈ��(��Ʈ���)�� ���ͳ��� ���� FTP ������ �۵��� �� �ֽ���"
 "��."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "��Ʈ����� ���� FTP ���� ���"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "���ͳݿ� ���� FTP���� ���"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -695,7 +693,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -711,11 +709,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -741,8 +739,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -750,14 +748,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "�����ڸ��� �� �۾��� �� �� �ֽ��ϴ�..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP ���� ���� ��"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "�����簡 FTP ���� ������ ���� ����� ���� ������ �����ϴ�."
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -770,11 +768,11 @@ msgstr ""
 "�� ��������."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "��Ʈ��� FTP ����:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "���ͳ� FTP ����:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -798,7 +796,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "�����簡 ���������� ��Ʈ���/���ͳ� FTP ������ �����Ͽ����ϴ�."
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -846,11 +844,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1073,7 +1071,7 @@ msgstr "���� �����翡 �� ���̽��ϴ�."
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "���ͳ� ȣ��Ʈ���� \"ȣ��Ʈ.������.����������\"�� ���¿��� �մϴ�; ���� ����"
@@ -1081,10 +1079,6 @@ msgstr ""
 "com\"���� �մϴ�."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "���� ����"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1093,24 +1087,24 @@ msgstr ""
 "�̸��� �Ϲ������� ���� ��ü�� �����մϴ�."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "���� ���� �̸�:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "���ͳ� ���� ������ ����, ������ ���� �Ⱓ�� 6���� 24�ð� ���̷� ������ �� ��"
 "���ϴ�."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "���� �Ⱓ"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1118,7 +1112,7 @@ msgstr ""
 "�Ⱓ�� �������� �� �Ƿ� ������ �ð������Դϴ�."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "���� �Ⱓ (�ð�):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1136,29 +1130,28 @@ msgstr "���ͳ� ���� ���� ��"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr "�����簡 ���ͳ� ���� ���� ������ ���� ����� ���� ������ �����ϴ�:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "�� ���� ����ϰ� ������ �����Ϸ���, [Ȯ��]�� ������, �ٽ� �����Ϸ���, [�ڷ�]"
 "�� ��������."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "���� ����:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "���� ����:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "�����簡 ���������� ���ͳ� ���� ������ �����Ͽ����ϴ�."
@@ -1168,7 +1161,6 @@ msgid "NFS Wizard"
 msgstr "NFS ������"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "��� - �׼��� ���� ����"
 
@@ -1182,25 +1174,23 @@ msgstr "NFS ���� ���� ������"
 
 #: ../nfs_wizard/NFS.pm:51
 #, fuzzy
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "�� ������� NFS ���� ������ ���� ���Դϴ�."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS ����"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "���丮:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+#, fuzzy
+msgid "Access control"
 msgstr "�׼��� ����"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "���ϴ� ����� �����ϼ���. �� �𸥴ٸ�, ���� ��Ʈ�� ����� ������ ���Դϴ�. ��"
@@ -1250,7 +1240,7 @@ msgid "Netmask :"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "�����簡 ���������� NFS ������ �����Ͽ����ϴ�."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1259,28 +1249,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "���� ����"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Ŭ���̾�Ʈ IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "���� ����"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1296,19 +1282,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS ����"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1326,12 +1313,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS ����"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1353,23 +1334,6 @@ msgstr "�����簡 ���������� ��� ������ �����Ͽ����ϴ�."
 msgid "NIS directory:"
 msgstr "���丮:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "��Ʈ�� ��ġ"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1382,7 +1346,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1416,12 +1380,12 @@ msgstr "DNS ���� ���� ��"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "���� ����"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "DNS ���� ���� ��"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1503,7 +1467,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "���ͳ� ȣ��Ʈ���� \"ȣ��Ʈ.������.����������\"�� ���¿��� �մϴ�; ���� ����"
@@ -1554,15 +1518,6 @@ msgid ""
 "external mail server:"
 msgstr "�����簡 ���ͳ� ���� ���� ������ ���� ����� ���� ������ �����ϴ�:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"�� ���� ����ϰ� ������ �����Ϸ���, [Ȯ��]�� ������, �ٽ� �����Ϸ���, [�ڷ�]"
-"�� ��������."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1695,6 +1650,19 @@ msgid "Disk space (MB):"
 msgstr "��ũ ���� (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "�׼��� ����"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"���ϴ� ����� �����ϼ���. �� �𸥴ٸ�, ���� ��Ʈ�� ����� ������ ���Դϴ�. ��"
+"�� ����� �� ���������� ������ ���� �ƴմϴ� ."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr "�����ô� ���� �ٸ� �׼��� ���� ������ ����ϵ��� ������ �� �ֽ��ϴ�."
@@ -1761,6 +1729,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "�����簡 ������ ���� ������ ���� ����� ���� ������ �����ϴ�:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"�� ���� ����ϰ� ������ �����Ϸ���, [Ȯ��]�� ������, �ٽ� �����Ϸ���, [�ڷ�]"
+"�� ��������."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "��Ʈ:"
@@ -2124,15 +2101,16 @@ msgstr "��� ������"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "��� - �׼��� ���� ����"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "��� ���� ������"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2141,6 +2119,10 @@ msgstr ""
 "���ϰ� �մϴ�."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "��� ���� ������"
+
+#: ../samba_wizard/Samba.pm:71
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
@@ -2163,7 +2145,7 @@ msgid "The Workgroup is wrong"
 msgstr "�߸��� ��ũ�׷��Դϴ�."
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "���� ���."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2177,14 +2159,9 @@ msgid "Banner:"
 msgstr "���:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "���� ��ʰ� �ùٸ��� �ʽ��ϴ�."
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-#, fuzzy
-msgid "Access control"
-msgstr "�׼��� ����"
-
 #: ../samba_wizard/Samba.pm:114
 #, fuzzy
 msgid "Access level :"
@@ -2192,7 +2169,7 @@ msgstr "�׼��� ����:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2229,7 +2206,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "��� ���� ���"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2245,7 +2222,7 @@ msgid "Enable file sharing area"
 msgstr "[/home/samba/public] ���� ���� ���"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "���� ������ ���� ���"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2280,7 +2257,7 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2288,7 +2265,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:182
@@ -2310,15 +2287,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "�����簡 ��� ���� ������ ���� ����� ���� ������ �����ϴ�."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "���� ���:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "���� ����:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "����Ʈ ����:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2380,15 +2357,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "��Ͽ��� �� �׸��� ���� ������ �����ϰų�, ���� ������ �ּ���:"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "�ð� ����"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "�� �ð� ����:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "���� �ð� ����:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2465,15 +2442,15 @@ msgstr "�� ������"
 
 #: ../web_wizard/Apache.pm:71
 #, fuzzy
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "�� ������� ��Ʈ���� �� ���� ������ ���� ���Դϴ�."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "�� ���� ���� ������"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "�� ���񽺸� Ȱ��ȭ���� ��������, �ƹ��͵� üũ���� ������."
 
 #: ../web_wizard/Apache.pm:77
@@ -2481,23 +2458,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Ȱ��ȭ�� �� ������ ������ �����ϼ���."
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "�� ������"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "�� ������ ���� ��Ʈ��(��Ʈ���)�� ���ͳ��� ���� �� ������ �۵��� �� �ֽ��ϴ�."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "��Ʈ��ݿ� ���� ������ ���"
 
 #: ../web_wizard/Apache.pm:80
 #, fuzzy
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "��Ʈ��ݿ� ���� ������ ���"
 
 #: ../web_wizard/Apache.pm:90
@@ -2531,18 +2508,18 @@ msgstr ""
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "�� ���� ���� ��"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "�����簡 �� ���� ������ ���� ����� ���� ������ �����ϴ�."
 
 #: ../web_wizard/Apache.pm:137
@@ -2555,17 +2532,13 @@ msgstr "��Ʈ��� �� ����:"
 msgid "Internet web server:"
 msgstr "���ͳ� �� ����:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr ""
-
 #: ../web_wizard/Apache.pm:140
 #, fuzzy
 msgid "User directory:"
 msgstr "���丮:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "�����簡 ���������� ��Ʈ���/���ͳ� �� ������ �����Ͽ����ϴ�."
 
 #: ../web_wizard/Apache.pm:236
@@ -2578,6 +2551,38 @@ msgstr "��Ʈ��� �� ����:"
 msgid "Configuring your system as Apache server ..."
 msgstr "DNS ���� ���� ��"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "�����簡 ���������� DHCP ������ �����Ͽ����ϴ�."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP ����"
+
+#~ msgid "News Server"
+#~ msgstr "���� ����"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS ����"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "���� ����"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS ����"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "��Ʈ�� ��ġ"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "�� ���� ����ϰ� ������ �����Ϸ���, [Ȯ��]�� ������, �ٽ� �����Ϸ���, [��"
+#~ "��]�� ��������."
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "���ͳ� ���� ���� ��"
 
diff --git a/po/lv.po b/po/lv.po
index 8c0bebbd..bc7ea0a6 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -41,7 +41,7 @@ msgstr "Meistara k��da."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -196,7 +196,10 @@ msgstr ""
 "�is meistars pal�dz�s Jums nokonfigur�t DHCP servisu priek� J�su servera."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -214,16 +217,16 @@ msgstr ""
 "Jums nav speci�las vajadz�bas, varat dro�i apstiprin�t pied�v�t�s v�rt�bas"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Zem�k� IP adrese:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Augst�k� IP adrese:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "V�rtejas IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -249,7 +252,7 @@ msgid "The IP of the server must not be in range."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Tiek konfigur�ts DHCP serveris"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -283,7 +286,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Meistars veiksm�gi nokonfigur�ja DHCP servisu priek� J�su servera."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -557,13 +561,11 @@ msgstr "NFS serveris"
 msgid "DNS server"
 msgstr "NFS serveris"
 
-#: ../drakwizard.pl:43
-#, fuzzy
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "News serveris"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS serveris"
 
@@ -572,8 +574,7 @@ msgstr "NFS serveris"
 msgid "Mail server"
 msgstr "Pasta servera nosaukums:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP serveris"
 
@@ -638,38 +639,34 @@ msgid "FTP wizard"
 msgstr "FTP meistars"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP servera konfigur��nas meistars"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "FTP serveris"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "At�aut FTP serveri Intranetam"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "At�aut �o FTP serveri priek� Interneta"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -681,7 +678,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -697,11 +694,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -726,8 +723,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -736,14 +733,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Atvainojiet, Jums j�b�t root lai veiktu �o ..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Tiek konfigur�ts FTP serveris"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "Meistars apkopoja sekojo�us parametrus, lai konfigur�tu FTP serveri"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -756,11 +753,11 @@ msgstr ""
 "N�kamais, vai ar� lietojiet pogu Iepriek��jais lai izlabotu t�s."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intraneta FTP serveris:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Interneta FTP serveris:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -784,7 +781,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Meistars veiksm�gi nokonfigur�ja Intraneta/Interneta FTP serveri"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -832,11 +829,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1060,43 +1057,39 @@ msgstr ""
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "News serveris"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "News servera nosaukums:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:76
@@ -1114,31 +1107,30 @@ msgstr ""
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Meistars sav�ca sekojo�u inform�ciju, lai konfigur�tu J�su Interneta pasta "
 "servisu:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "News serveris:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1148,7 +1140,6 @@ msgid "NFS Wizard"
 msgstr "NFS meistars"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr ""
 
@@ -1162,25 +1153,23 @@ msgstr "NFS servera konfigur��nas meistars"
 
 #: ../nfs_wizard/NFS.pm:51
 #, fuzzy
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "�is meistars pal�dz�s Jums konfigur�t NFS serveri priek� J�su t�kla"
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS serveris"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Direktorijs:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+#, fuzzy
+msgid "Access control"
 msgstr "Pieejas kontrole"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 
@@ -1226,7 +1215,7 @@ msgid "Netmask :"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Meistars veiksm�gi nokonfigur�ja NFS serveri"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1235,28 +1224,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "News serveris"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Klienta IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "News serveris"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1272,19 +1257,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS serveris"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1302,12 +1288,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS serveris"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr ""
@@ -1327,23 +1307,6 @@ msgstr "Meistars veiksm�gi nokonfigur�ja Samba serveri"
 msgid "NIS directory:"
 msgstr "Direktorijs:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "T�kla ier�ce"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
@@ -1355,7 +1318,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1389,12 +1352,12 @@ msgstr "Tiek konfigur�ts DNS serveris"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "News serveris"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Tiek konfigur�ts DNS serveris"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1477,7 +1440,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
@@ -1525,15 +1488,6 @@ msgstr ""
 "Meistars sav�ca sekojo�u inform�ciju, lai konfigur�tu J�su Interneta pasta "
 "servisu:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1670,6 +1624,17 @@ msgid "Disk space (MB):"
 msgstr "Diska vieta (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Pieejas kontrole"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Proxy var tikt konfigur�ts, lai izmantotu da��dus piek�uves l�me�us."
@@ -1732,6 +1697,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "Meistars apkopoja sekojo�us parametrus, lai konfigur�tu Proxy"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Ports:"
@@ -2095,13 +2069,13 @@ msgstr "Samba meistars"
 msgid "%s does not exist."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+#: ../samba_wizard/Samba.pm:65
+msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba konfigur��anas meistars"
+#: ../samba_wizard/Samba.pm:66
+msgid "My rules - ask me allowed and denied hosts"
+msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
 msgid ""
@@ -2110,6 +2084,10 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba konfigur��anas meistars"
+
+#: ../samba_wizard/Samba.pm:71
 #, fuzzy
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
@@ -2132,7 +2110,7 @@ msgid "The Workgroup is wrong"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
@@ -2146,14 +2124,9 @@ msgid "Banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-#, fuzzy
-msgid "Access control"
-msgstr "Pieejas kontrole"
-
 #: ../samba_wizard/Samba.pm:114
 #, fuzzy
 msgid "Access level :"
@@ -2161,7 +2134,7 @@ msgstr "Piek�uves kontrole:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2198,7 +2171,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "At�aut Samba servisus"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2215,7 +2188,7 @@ msgstr "At�aut /home/samba/public dal��an�s apgabalu"
 
 #: ../samba_wizard/Samba.pm:141
 #, fuzzy
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "At�aut /home/samba/public dal��an�s apgabalu"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2249,7 +2222,7 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2257,7 +2230,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:182
@@ -2279,16 +2252,16 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Meistars apkopoja sekojo�us parametrus, lai konfigur�tu Samba:"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:219
 #, fuzzy
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "News serveris:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2351,15 +2324,15 @@ msgstr ""
 "k�du:"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Laika serveri"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Prim�rais laika serveris:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekund�rais laika serveris:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2437,15 +2410,15 @@ msgstr "Web meistars"
 
 #: ../web_wizard/Apache.pm:71
 #, fuzzy
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "�is meistars pal�dz�s Jums konfigur�t Web serveri priek� J�su t�kla."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Web servera konfigur��anas meistars"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
@@ -2453,24 +2426,24 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Izv�lieties Web servisa veidu, k�du v�laties aktiviz�t:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web serveris"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "J�su serveris var darboties k� Web serveris priek� J�su iek��j� t�kla "
 "(Intraneta) un k� Web serveris priek� Interneta"
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "At�aut Web serveri Internetam"
 
 #: ../web_wizard/Apache.pm:80
 #, fuzzy
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "At�aut Web serveri Internetam"
 
 #: ../web_wizard/Apache.pm:90
@@ -2504,18 +2477,18 @@ msgstr ""
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Tiek konfigur�ts Web serveris"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "Meistars apkopoja sekojo�us parametrus, lai konfigur�tu Web serveri"
 
 #: ../web_wizard/Apache.pm:137
@@ -2528,17 +2501,13 @@ msgstr "Intraneta Web serveris"
 msgid "Internet web server:"
 msgstr "Interneta Web serveris:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr ""
-
 #: ../web_wizard/Apache.pm:140
 #, fuzzy
 msgid "User directory:"
 msgstr "Direktorijs:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Meistars veiksm�gi nokonfigur�ja Intraneta/Interneta Web serveri"
 
 #: ../web_wizard/Apache.pm:236
@@ -2551,6 +2520,38 @@ msgstr "Intraneta Web serveris"
 msgid "Configuring your system as Apache server ..."
 msgstr "Tiek konfigur�ts DNS serveris"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Meistars veiksm�gi nokonfigur�ja DHCP servisu priek� J�su servera."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP serveris"
+
+#~ msgid "News Server"
+#~ msgstr "News serveris"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS serveris"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "News serveris"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS serveris"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "T�kla ier�ce"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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."
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Tiek konfigur�ts Interneta pasts"
 
diff --git a/po/mk.po b/po/mk.po
index 9307719f..def6be1f 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2002-12-07 12:44+0100\n"
 "Last-Translator: Danko Ilik <danko@mindless.com>\n"
 "Language-Team: Macedonian\n"
@@ -42,7 +42,7 @@ msgstr "Самовилска грешка."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -203,7 +203,10 @@ msgstr ""
 "Сервер."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -222,16 +225,16 @@ msgstr ""
 "посебни потреби."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Најмала IP адреса:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Најголема IP адреса:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -258,7 +261,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Внесете го патот на директориумот што сакате да го споделите."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Конфигурирање на DHCP серверот"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -294,7 +297,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Самовилата успешно ги конфигурираше DHCP сервисите на Вашиот сервер."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -579,12 +583,12 @@ msgstr "NFS сервер"
 msgid "DNS server"
 msgstr "NFS сервер"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "News сервер"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 #, fuzzy
 msgid "NFS server"
 msgstr "NFS сервер"
@@ -594,8 +598,7 @@ msgstr "NFS сервер"
 msgid "Mail server"
 msgstr "Име на мејл сервер:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP сервер"
 
@@ -658,41 +661,37 @@ msgid "FTP wizard"
 msgstr "FTP самовила"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP сервер конфигурациска самовила"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Оваа самовила ќе Ви помогне во конфигурирање на FTP сервер за Вашата мрежа."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP сервер"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Изберете го типот на FTP сервис што сакате да го активирате:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Вашиот сервер може да биде FTP сервер и кон Вашата внатрешна мрежа "
 "(интранет) и кон Интернет."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Овозможи го FTP серверот за Интернет"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Овозможи го FTP серверот за Интернет"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -704,7 +703,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -720,11 +719,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -751,8 +750,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -760,14 +759,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Жалам, но мора да сте root за ова..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Конфигурирање на FTP серверот"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "FTP сервер"
@@ -783,11 +782,11 @@ msgstr ""
 "ги поправите."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Интранет FTP сервер:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Интернет FTP сервер:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -811,7 +810,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Самовилата успешно го конфигуирање Вашиот интранет/Интернет FTP сервер"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -859,11 +858,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1087,7 +1086,7 @@ msgstr "Добредојдовте во News самовилата"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Имињата мора да бидат од облик \"host.domain.domaintype\"; на пример, ако "
@@ -1095,10 +1094,6 @@ msgstr ""
 "com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "News сервер"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1107,24 +1102,24 @@ msgstr ""
 "оваа информација обично ја знае Вашиот провајдер."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Име на News сервер:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Во зависност од тоа каква интернет врска имате, соодветен период на "
 "контактирање може да биде помеѓу 6 и 24 часа."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Период на контактирање"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1133,7 +1128,7 @@ msgstr ""
 "последователни контактирања."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Период на контактирање (саати):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1151,32 +1146,31 @@ msgstr "Конфигурирање на Internet News"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "News сервис:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "За да ги прифатите овие вредности, и да го конфигурирате Вашиот сервер, "
 "притиснете на копчето „следно“; или притиснете на „претходно“, ако сакате да "
 "ги поправите."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "News сервер:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Интервал за контактирање:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1187,7 +1181,6 @@ msgid "NFS Wizard"
 msgstr "NFS самовила"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Сите - Без ограничување на пристап"
 
@@ -1200,26 +1193,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS сервер конфигурациска самовила"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Оваа самовила ќе ви помогне во конфигурирањето на NFS сервер за Вашата мрежа."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS сервер"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Директориум:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Контрола на пристап"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Изберете ниво според потребите. Ако не сте сигурни, нивото „Локална мрежа“ "
@@ -1268,7 +1258,7 @@ msgid "Netmask :"
 msgstr "Нетмаска :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Самовилата успешно го конфигурираше Вашиот NFS сервер"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1277,28 +1267,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "News сервер"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Клиентско IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "News сервер"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1314,19 +1300,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS сервер"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1344,12 +1331,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS сервер"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1371,23 +1352,6 @@ msgstr "Самовилата успешно го конфигурираше Ва
 msgid "NIS directory:"
 msgstr "Споделен директориум:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Мрежен уред"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1400,7 +1364,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1435,12 +1399,12 @@ msgstr "Конфигурирање на DNS серверот"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "News сервер"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Конфигурирање на DNS серверот"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1531,7 +1495,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Интернет хост-имињата мора да бидат од форма \"host.domain.domaintype\"; на "
@@ -1584,16 +1548,6 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Вашиот "
 "Интернет мејл сервис:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"За да ги прифатите овие вредности, и да го конфигурирате Вашиот сервер, "
-"притиснете на копчето „следно“; или притиснете на „претходно“, ако сакате да "
-"ги поправите."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1733,6 +1687,19 @@ msgid "Disk space (MB):"
 msgstr "Диск простор (МБ):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Контрола на пристап"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Изберете ниво според потребите. Ако не сте сигурни, нивото „Локална мрежа“ "
+"обично е соодветно. Внимание: нивото „Сите“ може да не е безбедно."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1803,6 +1770,16 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурација на Вашето "
 "прокси:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"За да ги прифатите овие вредности, и да го конфигурирате Вашиот сервер, "
+"притиснете на копчето „следно“; или притиснете на „претходно“, ако сакате да "
+"ги поправите."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Порта:"
@@ -2166,15 +2143,16 @@ msgstr "Samba самовила"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Сите - Без ограничување на пристап"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Мои правила - Прашај ме за допуштени и недопуштени компјутери"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba конфигурациска самовила"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2183,6 +2161,10 @@ msgstr ""
 "принтерски сервер за компјутери што не оперираат под линукс системи."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba конфигурациска самовила"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2206,7 +2188,7 @@ msgid "The Workgroup is wrong"
 msgstr "Workgroup-от е грешен"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Серверски банер."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2220,13 +2202,9 @@ msgid "Banner:"
 msgstr "Банер:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Серверскиот банер е неточен"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Контрола на пристап"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Ниво на пристап :"
@@ -2234,7 +2212,7 @@ msgstr "Ниво на пристап :"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Пример 1: пушти ги сите IP адреси во 150.203.*.*; освен една\\nhosts allow "
@@ -2282,7 +2260,7 @@ msgid "Deny hosts:"
 msgstr "Недопуштени:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Овозможени Самба сервиси"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2300,7 +2278,7 @@ msgid "Enable file sharing area"
 msgstr "Овозможи споделување датотеки"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Овозможи серверско споделување на принтер"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2339,7 +2317,7 @@ msgstr ""
 "префикс \\'@\\') како :\\nroot, fred, @users, @wheel за секој вид пермисии."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "read листа:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2347,7 +2325,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "write листа:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2369,15 +2347,15 @@ msgstr ""
 "Самовилата ги прибра следниве параметри потребни за конфигурирање на Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Серверски банер:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Споделување датотеки:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Принтер сервер:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2436,15 +2414,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Изберете примарен и секундарен сервер од листата."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Временски сервери"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Примарен временски сервер:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Секундарен временски сервер:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2521,16 +2499,16 @@ msgid "Web wizard"
 msgstr "Веб самовила"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Оваа самовила ќе Ви помогне во конфигурирање на веб сервер за Вашата мрежа."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Веб сервер конфигурациска самовила"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Не штиклирајте ништо, ако не сакате да го активирате Вашиот веб сервер."
 
@@ -2539,23 +2517,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Изберете го видот на веб сервис што сакате да го активирате:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Веб сервер"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Вашиот сервер може да биде веб сервер за Вашата локална мрежа, и може да "
 "биде веб сервер за Интернет."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Овозможи го веб серверот за Интернет"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Овозможи го бев серверот за Интернет"
 
 #: ../web_wizard/Apache.pm:90
@@ -2603,18 +2581,19 @@ msgstr ""
 "Внесете го патот на директориумот што сакате да биде главен содржател "
 "(document root)."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+#, fuzzy
+msgid "Document root:"
+msgstr "document root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Конфигурирање на веб серверот"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Самовилата ги прибра следниве параметри, потребни за конфигурирање на Вашиот "
 "веб сервер"
@@ -2627,18 +2606,13 @@ msgstr "Внатрешен веб сервер:"
 msgid "Internet web server:"
 msgstr "Интернет веб сервер:"
 
-#: ../web_wizard/Apache.pm:139
-#, fuzzy
-msgid "Document root:"
-msgstr "document root:"
-
 #: ../web_wizard/Apache.pm:140
 #, fuzzy
 msgid "User directory:"
 msgstr "Споделен директориум:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Самовилата успешно го конфигурираше Вашиот интранет/Интернет веб сервер"
 
@@ -2652,6 +2626,43 @@ msgstr "Внатрешен веб сервер:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Конфигурирање на DNS серверот"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr ""
+#~ "Самовилата успешно ги конфигурираше DHCP сервисите на Вашиот сервер."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP сервер"
+
+#~ msgid "News Server"
+#~ msgstr "News сервер"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS сервер"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "News сервер"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS сервер"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Мрежен уред"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "За да ги прифатите овие вредности, и да го конфигурирате Вашиот сервер, "
+#~ "притиснете на копчето „следно“; или притиснете на „претходно“, ако сакате "
+#~ "да ги поправите."
+
+#~ msgid "Document Root:"
+#~ msgstr "Document Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Конфигурирање на Интернет пошта"
 
diff --git a/po/ms.po b/po/ms.po
index 79639532..fcffcb84 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-24 20:45+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -40,7 +40,7 @@ msgstr "Ralat."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -193,7 +193,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -210,17 +213,17 @@ msgstr "DHCP terima."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
 #, fuzzy
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Alamat IP DCC:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
 #, fuzzy
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Alamat IP DCC:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Alamat IP DCC:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -249,7 +252,7 @@ msgstr "IP dalam"
 
 #: ../dhcp_wizard/Dhcp.pm:109
 #, fuzzy
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Terima Notis Pelayan"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -286,7 +289,7 @@ msgstr "Antaramuka"
 
 #: ../dhcp_wizard/Dhcp.pm:124
 #, fuzzy
-msgid "The wizard successfully configured the DHCP services of your server."
+msgid "The wizard successfully configured the DHCP services."
 msgstr "DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -560,19 +563,19 @@ msgstr "Terima Notis Pelayan"
 #: ../drakwizard.pl:41
 #, fuzzy
 msgid "DHCP server"
-msgstr "(%ld)PELAYAN >>> %s"
+msgstr "Pelayan FTP"
 
 #: ../drakwizard.pl:42
 #, fuzzy
 msgid "DNS server"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 #, fuzzy
 msgid "NFS server"
 msgstr "(%ld)PELAYAN >>> %s"
@@ -580,27 +583,26 @@ msgstr "(%ld)PELAYAN >>> %s"
 #: ../drakwizard.pl:45
 #, fuzzy
 msgid "Mail server"
-msgstr "(%ld)PELAYAN >>> %s"
+msgstr "%s: ralat pelayan nama tidak dapat dipulihkan berlaku."
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
-msgstr "(%ld)PELAYAN >>> %s"
+msgstr "Pelayan FTP"
 
 #: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:473
 #, fuzzy
 msgid "Samba server"
-msgstr "(%ld)PELAYAN >>> %s"
+msgstr "Pelayan Web"
 
 #: ../drakwizard.pl:48
 #, fuzzy
 msgid "Proxy"
-msgstr "Proksi SOCKS: %s"
+msgstr "Liang proksi:"
 
 #: ../drakwizard.pl:49
 #, fuzzy
 msgid "Time server"
-msgstr "(%ld)PELAYAN >>> %s"
+msgstr "Masa Universal"
 
 #: ../drakwizard.pl:50
 #, fuzzy
@@ -615,22 +617,20 @@ msgstr "Pelayan Berita"
 #: ../drakwizard.pl:52
 #, fuzzy
 msgid "Mandrake Install server"
-msgstr "Terima Notis Pelayan"
+msgstr "(%ld)PELAYAN >>> %s"
 
 #: ../drakwizard.pl:53 ../pxe_wizard/Pxe.pm:624
 #, fuzzy
 msgid "PXE server"
-msgstr "(%ld)PELAYAN >>> %s"
+msgstr "Terima Notis Pelayan"
 
 #: ../drakwizard.pl:59
-#, fuzzy
 msgid "Drakwizard wizard selection"
-msgstr "pemilihan gaya automatik dibatalkan"
+msgstr ""
 
 #: ../drakwizard.pl:60
-#, fuzzy
 msgid "Please select a wizard"
-msgstr "Sila Pilih Masukan Desktop "
+msgstr ""
 
 #: ../drakwizard.pl:140
 #, perl-format
@@ -651,19 +651,15 @@ msgstr "FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP Pelayan Konfigurasikan"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "FTP Pelayan."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Pelayan FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 #, fuzzy
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "FTP:"
@@ -671,22 +667,22 @@ msgstr "FTP:"
 #: ../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."
+"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:81
 #, fuzzy
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "FTP Pelayan"
 
 #: ../ftp_wizard/Proftpd.pm:82
 #, fuzzy
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "FTP Pelayan"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -698,7 +694,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -715,12 +711,12 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
 #, fuzzy
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "%s: tiada nama logmasuk\n"
 
 #: ../ftp_wizard/Proftpd.pm:98
 #, fuzzy
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "pilihan pengguna tidak diketahui `%s'"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -746,8 +742,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -756,14 +752,14 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Terima Notis Pelayan"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -775,12 +771,12 @@ msgstr "Kepada terima dan Seterusnya Undur."
 
 #: ../ftp_wizard/Proftpd.pm:136
 #, fuzzy
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Terima Notis Pelayan"
 
 #: ../ftp_wizard/Proftpd.pm:137
 #, fuzzy
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Terima Notis Pelayan"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -809,7 +805,7 @@ msgstr "Izinkan Pembesaran"
 
 #: ../ftp_wizard/Proftpd.pm:148
 #, fuzzy
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Internet FTP"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -857,11 +853,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1095,15 +1091,11 @@ msgstr "Selamat Datang Berita"
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr "Internet dalam."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Pelayan Berita"
-
-#: ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
@@ -1112,31 +1104,31 @@ msgstr "Internet."
 
 #: ../news_wizard/Inn.pm:54
 #, fuzzy
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "%s: ralat pelayan nama tidak dapat dipulihkan berlaku."
 
 #: ../news_wizard/Inn.pm:60
 #, fuzzy
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr "on dan jam."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 #, fuzzy
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr "Berita Pelayan Internet Berita."
 
 #: ../news_wizard/Inn.pm:65
 #, fuzzy
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "24 jam terakhir"
 
 #: ../news_wizard/Inn.pm:76
@@ -1155,30 +1147,28 @@ msgstr "Internet"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr "Internet Berita:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 #, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"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."
 
-#: ../news_wizard/Inn.pm:89
+#: ../news_wizard/Inn.pm:88
 #, fuzzy
-msgid "News Server:"
+msgid "News server:"
 msgstr "(%ld)PELAYAN >>> %s"
 
-#: ../news_wizard/Inn.pm:90
+#: ../news_wizard/Inn.pm:89
 #, fuzzy
-msgid "Polling Interval:"
+msgid "Polling interval:"
 msgstr "jarakmasa `%s' tidak sah"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 #, fuzzy
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
@@ -1189,7 +1179,6 @@ msgid "NFS Wizard"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 #, fuzzy
 msgid "All - No access restriction"
 msgstr "Semua Tidak"
@@ -1206,28 +1195,24 @@ msgstr "Pelayan Konfigurasikan"
 
 #: ../nfs_wizard/NFS.pm:51
 #, fuzzy
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Pelayan."
 
-#: ../nfs_wizard/NFS.pm:56
-#, fuzzy
-msgid "NFS Server"
-msgstr "(%ld)PELAYAN >>> %s"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Direktori:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
 #, fuzzy
-msgid "Access Control"
+msgid "Access control"
 msgstr "Tak dapat mengakses %s"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 #, fuzzy
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr "Rangkaian Semua."
 
@@ -1276,7 +1261,7 @@ msgid "Netmask :"
 msgstr "Netmask:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1285,28 +1270,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Pelayan Berita"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "(%ld)PELANGGAN >>> %s"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Pelayan Berita"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1323,19 +1304,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "(%ld)PELAYAN >>> %s"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1353,12 +1335,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "(%ld)PELAYAN >>> %s"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1379,25 +1355,6 @@ msgstr "Internet Berita."
 msgid "NIS directory:"
 msgstr "jendela-direktori"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Pemilih-fail"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-#, fuzzy
-msgid "Auto master:"
-msgstr "Auto indent"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-#, fuzzy
-msgid "Auto home:"
-msgstr "Auto indent"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
@@ -1410,7 +1367,7 @@ msgstr "tak dapat menentukan namahos"
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1446,12 +1403,12 @@ msgstr "FTP"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Pelayan Berita"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "FTP"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1539,7 +1496,7 @@ msgstr ""
 #, fuzzy
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr "Internet dalam."
 
@@ -1586,13 +1543,6 @@ msgid ""
 "external mail server:"
 msgstr "Internet Mel:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, 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."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1735,6 +1685,19 @@ msgid "Disk space (MB):"
 msgstr "Jumlah ruang di antara anak"
 
 #: ../proxy_wizard/Squid.pm:104
+#, fuzzy
+msgid "Access Control"
+msgstr "Tak dapat mengakses %s"
+
+#: ../proxy_wizard/Squid.pm:104
+#, fuzzy
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr "Rangkaian Semua."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 
@@ -1792,6 +1755,14 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+#, 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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2171,15 +2142,15 @@ msgstr "Masa"
 msgid "%s does not exist."
 msgstr "pengguna %s tidak wujud"
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:65
 #, fuzzy
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr "dan"
+msgid "All - no access restriction"
+msgstr "Semua Tidak"
 
-#: ../samba_wizard/Samba.pm:71
+#: ../samba_wizard/Samba.pm:66
 #, fuzzy
-msgid "Samba Configuration Wizard"
-msgstr "Membaca fail konfigurasi sistem %s..."
+msgid "My rules - ask me allowed and denied hosts"
+msgstr "dan"
 
 #: ../samba_wizard/Samba.pm:71
 #, fuzzy
@@ -2189,6 +2160,11 @@ msgid ""
 msgstr "fail dan."
 
 #: ../samba_wizard/Samba.pm:71
+#, fuzzy
+msgid "Samba configuration wizard"
+msgstr "Membaca fail konfigurasi sistem %s..."
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2213,7 +2189,7 @@ msgstr "%s adalah salah saiz (%s != %s + %s)"
 
 #: ../samba_wizard/Samba.pm:92
 #, fuzzy
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "(%ld)PELAYAN >>> %s"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2229,14 +2205,9 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:103
 #, fuzzy
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Jawapan pelayan tidak sah."
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-#, fuzzy
-msgid "Access control"
-msgstr "Tak dapat mengakses %s"
-
 #: ../samba_wizard/Samba.pm:114
 #, fuzzy
 msgid "Access level :"
@@ -2245,7 +2216,7 @@ msgstr "Tak dapat mengakses %s"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr "dalam"
 
@@ -2288,7 +2259,7 @@ msgid "Deny hosts:"
 msgstr "Hos unik:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
@@ -2306,7 +2277,7 @@ msgstr "Benarkan beberapa buffer fail"
 
 #: ../samba_wizard/Samba.pm:141
 #, fuzzy
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Pelayan"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2346,7 +2317,7 @@ msgstr "Jenis."
 
 #: ../samba_wizard/Samba.pm:176
 #, fuzzy
-msgid "read list:"
+msgid "Read list:"
 msgstr "item-senarai"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2355,7 +2326,7 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
 #, fuzzy
-msgid "write list:"
+msgid "Write list:"
 msgstr "item-senarai"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2378,17 +2349,17 @@ msgstr "FTP"
 
 #: ../samba_wizard/Samba.pm:216
 #, fuzzy
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "(%ld)PELAYAN >>> %s"
 
 #: ../samba_wizard/Samba.pm:217
 #, fuzzy
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Pemilih-fail"
 
 #: ../samba_wizard/Samba.pm:219
 #, fuzzy
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "(%ld)PELAYAN >>> %s"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2452,17 +2423,17 @@ msgstr "dan."
 
 #: ../time_wizard/Ntp.pm:87
 #, fuzzy
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Masa Universal"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
 #, fuzzy
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Terima Notis Pelayan"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
 #, fuzzy
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Terima Notis Pelayan"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2538,17 +2509,17 @@ msgstr "&Dalam pelayar web"
 
 #: ../web_wizard/Apache.pm:71
 #, fuzzy
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Pelayan."
 
 #: ../web_wizard/Apache.pm:71
 #, fuzzy
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Pelayan Konfigurasikan"
 
 #: ../web_wizard/Apache.pm:77
 #, fuzzy
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Pelayan."
 
 #: ../web_wizard/Apache.pm:77
@@ -2556,24 +2527,24 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Pelayan Web"
 
 #: ../web_wizard/Apache.pm:77
 #, fuzzy
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr "Pelayan dan Pelayan Internet."
 
 #: ../web_wizard/Apache.pm:79
 #, fuzzy
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Pelayan"
 
 #: ../web_wizard/Apache.pm:80
 #, fuzzy
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Pelayan"
 
 #: ../web_wizard/Apache.pm:90
@@ -2612,20 +2583,20 @@ msgstr "pengguna direktori"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Jenis direktori."
 
-#: ../web_wizard/Apache.pm:111
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
 #, fuzzy
-msgid "Document Root:"
+msgid "Document root:"
 msgstr "jendela-root"
 
 #: ../web_wizard/Apache.pm:131
 #, fuzzy
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Terima Notis Pelayan"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:137
@@ -2638,11 +2609,6 @@ msgstr "Terima Notis Pelayan"
 msgid "Internet web server:"
 msgstr "Terima Notis Pelayan"
 
-#: ../web_wizard/Apache.pm:139
-#, fuzzy
-msgid "Document root:"
-msgstr "jendela-root"
-
 #: ../web_wizard/Apache.pm:140
 #, fuzzy
 msgid "User directory:"
@@ -2650,7 +2616,7 @@ msgstr "jendela-direktori"
 
 #: ../web_wizard/Apache.pm:147
 #, fuzzy
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Internet"
 
 #: ../web_wizard/Apache.pm:236
@@ -2664,5 +2630,45 @@ msgid "Configuring your system as Apache server ..."
 msgstr "FTP"
 
 #, fuzzy
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "DHCP."
+
+#~ msgid "FTP Server"
+#~ msgstr "Pelayan FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Pelayan Berita"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Pelayan Berita"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "(%ld)PELAYAN >>> %s"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Pemilih-fail"
+
+#, fuzzy
+#~ msgid "Auto master:"
+#~ msgstr "Auto indent"
+
+#, fuzzy
+#~ msgid "Auto home:"
+#~ msgstr "Auto indent"
+
+#, 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."
+
+#, fuzzy
+#~ msgid "Document Root:"
+#~ msgstr "jendela-root"
+
+#, fuzzy
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Internet"
diff --git a/po/mt.po b/po/mt.po
index b0a4c7b3..37849564 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -1,4 +1,3 @@
-# translation of drakwizard-mt.po to 
 # translation of drakwizard-mt.po to
 # translation of drakwizard-mt.po to Maltese
 # Drakwizard wizard's Portable Object Template file
@@ -14,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -49,7 +48,7 @@ msgstr "Problema."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -205,7 +204,10 @@ msgstr ""
 "Dan is-saħħar jgħinek tikkonfigura s-servizzi DHCP għas-server tiegħek."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -223,16 +225,16 @@ msgstr ""
 "m'għandekx bżonnijiet speċifiċi, tista' żżomm il-valuri proposti."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Indirizz IP minimu:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Indirizz IP massimu:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP tal-\"gateway\":"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -261,7 +263,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Qed jiġi kkonfigurat is-server DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -297,7 +299,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Is-saħħar ikkonfiguralek is-servizzi DHCP tas-server."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -582,13 +585,11 @@ msgstr "Server NFS"
 msgid "DNS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:43
-#, fuzzy
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Server \"news\":"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Server NFS"
 
@@ -597,8 +598,7 @@ msgstr "Server NFS"
 msgid "Mail server"
 msgstr "Isem is-server tal-imejl:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Server FTP"
 
@@ -664,40 +664,36 @@ msgid "FTP wizard"
 msgstr "Saħħar FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Saħħar tal-konfigurazzjoni ta' server FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Dan is-saħħar jgħinek tissettja server FTP għan-network tiegħek."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Server FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Attiva s-server FTP għall-intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Attiva s-server FTP għall-internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -709,7 +705,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -725,11 +721,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -756,8 +752,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -765,14 +761,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Jiddispjaċini, trid tkun root biex tagħmel dan..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Qed jiġi kkonfigurat is-server FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi kkonfigurat is-server "
 "FTP"
@@ -787,11 +783,11 @@ msgstr ""
 "inkella agħfas Lura biex tikkoreġihom."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Server FTP tal-intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Server FTP tal-internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -815,7 +811,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Is-saħħar ikkonfiguralek is-server FTP għall-intranet/internet"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -863,11 +859,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1092,7 +1088,7 @@ msgstr "Merħba għas-saħħar \"news\""
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Ismijiet tal-kompjuters fuq l-internet iridu jkollhom il-forma \"kompjuter."
@@ -1100,10 +1096,6 @@ msgstr ""
 "imejl aktarx jkun \"news.ditta.net.mt\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Server \"news\":"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1112,24 +1104,24 @@ msgstr ""
 "news lin-network tiegħek. Dan l-isem normalment jingħata mill-ISP tiegħek."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Isem is-server \"news\":"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Skond it-tip ta' konnessjoni li għandek, valur adegwat jista' jvarja bejn 6 "
 "siegħat u 24 siegħa."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Intervall tat-talbiet"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1137,7 +1129,7 @@ msgstr ""
 "talbiet jissettja l-ħin bejn żewġ talbiet konsekuttivi."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Intervall ta' talbiet (siegħat):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1155,31 +1147,30 @@ msgstr "Konfigurazzjoni tal-Internet News"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi konfigurat is-servizz "
 "\"news\":"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Biex taċċetta dawn il-valuri u tikkonfigura s-server, klikkja \"Li jmiss\", "
 "inkella agħfas Lura biex tikkoreġihom."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Server \"news\":"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Intervall tat-talbiet:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Is-saħħar ikkonfigura s-servizz \"news\" għas-server."
@@ -1189,7 +1180,6 @@ msgid "NFS Wizard"
 msgstr "Saħħar NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Kollox - ebda restrizzjoni lill-aċċess"
 
@@ -1202,25 +1192,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Saħħar tal-konfigurazzjoni ta' server NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Dan is-saħħar jgħinek tissettja s-server NFS għan-network tiegħek."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Server NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Direttorju:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Kontroll tal-aċċess"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Agħżel livell li jaqdi l-ħtiġijiet tiegħek. Jekk ma tafx, il-livell "
@@ -1269,7 +1256,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Is-saħħar ikkonfiguralek is-server NFS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1278,28 +1265,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Server \"news\":"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "IP tal-klijent:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Server \"news\":"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1315,19 +1298,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Server NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1345,12 +1329,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Server NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1372,23 +1350,6 @@ msgstr "Is-saħħar ikkonfiguralek is-server Samba."
 msgid "NIS directory:"
 msgstr "Direttorju tal-users:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Apparat tan-network"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1401,7 +1362,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1436,12 +1397,12 @@ msgstr "Qed jiġi kkonfigurat is-server DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Server \"news\":"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Qed jiġi kkonfigurat is-server DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1530,7 +1491,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Ismijiet tal-kompjuters fuq l-internet iridu jkollhom il-forma \"kompjuter."
@@ -1583,15 +1544,6 @@ msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex tikkonfigura s-servizz tal-"
 "imejl tal-internet:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Biex taċċetta dawn il-valuri u tikkonfigura s-server, klikkja \"Li jmiss\", "
-"inkella agħfas Lura biex tikkoreġihom."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1732,6 +1684,20 @@ msgid "Disk space (MB):"
 msgstr "Spazju fuq id-diska (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Kontroll tal-aċċess"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Agħżel livell li jaqdi l-ħtiġijiet tiegħek. Jekk ma tafx, il-livell "
+"\"Network lokali\" normalment huwa l-iżjed tajjeb. Attent li l-livell "
+"\"Kollox\" jista ma jkunx sikur."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1800,6 +1766,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "Is-saħħar ġabar dawn il-parametri meħtieġa biex tikkonfigura l-proxy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Biex taċċetta dawn il-valuri u tikkonfigura s-server, klikkja \"Li jmiss\", "
+"inkella agħfas Lura biex tikkoreġihom."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2165,15 +2140,16 @@ msgstr "Saħħar tas-Samba"
 msgid "%s does not exist."
 msgstr "%s ma jeżistix."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Kollox - ebda restrizzjoni lill-aċċess"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Regoli tiegħi - Staqsini għal kompjuters aċċettati jew miċħuda"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Saħħar ta' konfigurazzjoni tas-Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2182,6 +2158,10 @@ msgstr ""
 "għal kompjuters li jħaddmu sistema tal-Windows."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Saħħar ta' konfigurazzjoni tas-Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2204,7 +2184,7 @@ msgid "The Workgroup is wrong"
 msgstr "Il-workgroup huwa ħażin"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Deskrizzjoni tas-server."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2220,13 +2200,9 @@ msgid "Banner:"
 msgstr "Deskrizzjoni:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Id-deskrizzjoni tas-server hija ħażina"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Kontroll tal-aċċess"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Livell ta’ aċċess:"
@@ -2234,7 +2210,7 @@ msgstr "Livell ta’ aċċess:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Eżempju 1: ħalli l-IPs kollha taħt 150.203.*.* minbarra wieħed\\nhosts "
@@ -2281,7 +2257,7 @@ msgid "Deny hosts:"
 msgstr "Iċħad kompjuters:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Servizzi Samba attivati"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2298,7 +2274,7 @@ msgid "Enable file sharing area"
 msgstr "Attiva l-post għall-qsim ta' fajls"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Ippermetti l-qsim tal-printer"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2339,7 +2315,7 @@ msgstr ""
 "@wheel"
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "lista ta' qari:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2347,7 +2323,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "lista ta' ktib:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2368,15 +2344,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi konfigurat Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Deskrizzjoni tas-server:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Offerti ta' fajls:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Server tal-ipprintjar:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2436,15 +2412,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Agħżel server ewlieni u sekondarju mil-lista."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Servers tal-ħin"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Server tal-ħin ewlieni:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Server tal-ħin sekondarju:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2521,15 +2497,15 @@ msgid "Web wizard"
 msgstr "Saħħar web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Dan is-saħħar għenek tissettja web server għan-network tiegħek."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Saħħar ta' konfigurazzjoni tal-web server"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Tittikkja ebda kaxxa jekk ma tridx tattiva l-web server"
 
 #: ../web_wizard/Apache.pm:77
@@ -2537,23 +2513,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Agħżel liema tip ta' servizz web trid tattiva:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web server"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Is-server jista' jaġixxi bħala web server għan-network interna (intranet), "
 "kif ukoll web server għall-internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Issettja web server għall-intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Issettja web server għall-internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2597,18 +2573,18 @@ msgstr "Sottodirettorju http tal-users : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Ittajpja d-direttorju li trid bħala għerq għad-dokumenti."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Direttorju ewlieni tad-dokumenti:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Qed jiġi kkonfigurat il-web server"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Is-saħħar ġabar dawn il-parametri meħtieġa biex jiġi kkonfigurat il-web "
 "server"
@@ -2621,16 +2597,12 @@ msgstr "Web server għall-intranet:"
 msgid "Internet web server:"
 msgstr "Web server tal-internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Direttorju ewlieni tad-dokumenti:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Direttorju tal-users:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Is-saħħar ikkonfiguralek il-web server tal-internet/intranet"
 
 #: ../web_wizard/Apache.pm:236
@@ -2643,6 +2615,41 @@ msgstr "Web server għall-intranet:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Qed jiġi kkonfigurat is-server DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Is-saħħar ikkonfiguralek is-servizzi DHCP tas-server."
+
+#~ msgid "FTP Server"
+#~ msgstr "Server FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Server \"news\":"
+
+#~ msgid "NFS Server"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Server \"news\":"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Apparat tan-network"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Biex taċċetta dawn il-valuri u tikkonfigura s-server, klikkja \"Li jmiss"
+#~ "\", inkella agħfas Lura biex tikkoreġihom."
+
+#~ msgid "Document Root:"
+#~ msgstr "Direttorju ewlieni tad-dokumenti:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Qed jiġi kkonfigurat l-imejl tal-internet"
 
diff --git a/po/nb.po b/po/nb.po
index 55816143..fb7de5e8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-18 12:00+0100\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -46,7 +46,7 @@ msgstr "Feil."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -196,10 +196,11 @@ msgstr ""
 "Denne hjelperen vil hjelpe deg å konfigurere DHCP tjenestene på tjeneren din."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Hvis du ønsker å aktivere PXE for din dhcp-tjener vennligst kryss av i "
-"boksen."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -216,15 +217,15 @@ msgstr ""
 "192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Laveste IP adresse:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Høyeste IP adresse:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IP-adresse:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -248,7 +249,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Konfigurerer DHCP tjeneren"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -284,7 +285,8 @@ msgid "Interface:"
 msgstr "Grensesnitt:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Veiviseren konfigurerte vellykket DHCP-tjenester på tjeneren din."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -575,11 +577,11 @@ msgstr "DHCP-tjener"
 msgid "DNS server"
 msgstr "DNS-tjener"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Nyhetstjener"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS-tjener"
 
@@ -587,7 +589,7 @@ msgstr "NFS-tjener"
 msgid "Mail server"
 msgstr "Eposttjener"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP-tjener"
 
@@ -645,43 +647,39 @@ msgid "FTP wizard"
 msgstr "FTP hjelper"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP-tjener konfigureringshjelper"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Denne hjelperen vil hjelpe deg å konfigurere FTP-tjeneren for nettverket "
 "ditt."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP tjener"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Slå på FTP-tjener for Intranett"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Slå på FTP-tjener for Internett"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Admin-epost: epostadresse til FTP-vedlikeholder."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -697,7 +695,7 @@ msgstr "Tillat FXP: tillat filoverføring via andre ftp-er."
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "|Chroot Hjemmebruker: Lås brukere i deres hjemmekatalog."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -713,11 +711,11 @@ msgid "Admin email:"
 msgstr "Adminepost:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Tillat root-innlogging:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot Hjemmebruker:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -744,8 +742,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:115
 #, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "Jeg kan ikke finne 'bash' i listen av skaller. Rett venligst."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -753,14 +751,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Beklager, du må være root for å gjøre dette..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Konfigurerer FTP-tjeneren"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Veiviseren samlet følgende parametere\n"
 "som trengs for å konfigurere FTP-tjeneren din"
@@ -775,11 +773,11 @@ msgstr ""
 "knappen eller bruk Tilbake-knappen for å rette dem"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranett FTP-tjener:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internett FTP-tjener:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -803,7 +801,7 @@ msgid "Allow FXP"
 msgstr "Tillat FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Veiviseren konfigurerte vellykket din Intranett/Internett FTP-tjener"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -860,11 +858,11 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Mål-katalog er allerede i bruk, velg vennligst et annet."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Din installeringstjener vil bli konfigurert med følgende parametre"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1081,7 +1079,7 @@ msgstr "Velkommen til News hjelperen"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internett vertsnavn må være i formen \"host.domain.domaintype\"; f.eks., "
@@ -1089,10 +1087,6 @@ msgstr ""
 "vanligvis \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "News tjener"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1101,24 +1095,24 @@ msgstr ""
 "nettverket ditt; navnet er vanligvis oppgitt av tilbyderen din."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "News tjener navn:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Avhengig av hvilken type internett-tilkobling du har, en passende sjekke- "
 "periode kan være mellom 6 til 24 timer."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Sjekketidsrom"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1127,7 +1121,7 @@ msgstr ""
 "etterfølgende sjekk."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Sjekkeperiode (Timer):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1144,31 +1138,30 @@ msgstr "Konfigurer Internett news"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Veiviseren samlet følgende parametere\n"
 "som trengs for å konfigurere Internett nyhets-tjeneren din:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"For å godta disse verdiene og konfigurere tjeneren din, klikk på Neste "
-"knappen eller bruk Tilbake knappen for å endre disse."
+"For å godta disse verdiene og konfigurere tjeneren din, klikk på Neste-"
+"knappen eller bruk Tilbake-knappen for å rette dem"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "News tjener:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Sjekkeintervall:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1180,7 +1173,6 @@ msgid "NFS Wizard"
 msgstr "NFS helper"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Alle - Ingen tilgangsrestriksjoner"
 
@@ -1193,27 +1185,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS-tjener konfigureringshjelper"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Denne hjelperen vil hjelpe deg å konfigurere NFS-tjeneren for nettverket "
 "ditt."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFSs tjener"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Område:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Tilgangskontroll"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Velg nivået som passer dine behov. Hvis du ikke er sikker, Lokalt nettverk "
@@ -1262,7 +1251,7 @@ msgid "Netmask :"
 msgstr "Nettmaske :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Veiviseren konfigurerte vellykket NFS tjeneren din."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1275,18 +1264,15 @@ msgstr ""
 "korrektdomenenavn, ikke likt localdomain eller inget. Kjør drakconnect for å "
 "juster edet."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
-msgstr "NFS-tjener med Autofs-kort"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
+msgstr "NFS-tjener med autofs-kort"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NFS-klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "NFS-tjener med autofs-kort"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
@@ -1295,7 +1281,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Klienter kan automatisk montere deres hjemmeområde når de logger på et NIS "
@@ -1314,18 +1300,19 @@ msgstr "Konfigurerer ditt system som en NIS-klient"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Du må taste inn nis-domene og nis-tjener"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS-tjener:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS-domene:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1347,11 +1334,6 @@ msgstr "NIS-domene: NIS-domene for din NIS-tjener."
 msgid "NIS server: name of your computer."
 msgstr "NIS-tjener: navn på din maskin."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS-tjener:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Hjem-NIS:"
@@ -1370,22 +1352,6 @@ msgstr "Vil sette din NIS-tjener med autofs-kort"
 msgid "NIS directory:"
 msgstr "NIS-brukerområde:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Nettverksfil:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "NIS-eksporter:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto-master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto-hjem:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1399,7 +1365,7 @@ msgstr "NIS-tjener: vertsnavn på NIS-tjeneren."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1433,11 +1399,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurerer ditt system som en NIS-tjener med autofs-kort..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS med autofs-kort"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurerer ditt system som NIS-klient ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1528,7 +1494,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internett vertsnavn må være i formen \"host.domain.domaintype\"; f.eks., "
@@ -1584,15 +1550,6 @@ msgstr ""
 "Veiviseren samlet følgende parametere som trengs for å konfigurere din "
 "Internett epost tjeneste:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"For å godta disse verdiene og konfigurere tjeneren din, klikk på Neste-"
-"knappen eller bruk Tilbake-knappen for å rette dem"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1729,6 +1686,20 @@ msgid "Disk space (MB):"
 msgstr "Diskplass (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Tilgangskontroll"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Velg nivået som passer dine behov. Hvis du ikke er sikker, Lokalt nettverk "
+"nivå er vanligvis det mest passende. Være klar over at Alle nivået ikke er "
+"sikkert."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Proxyen kan konfigureres til å bruke forskjellige tilgangkontrollnivåer"
@@ -1796,6 +1767,15 @@ msgstr ""
 "Veiviseren samlet følgende parametere som trengs for å konfigurere proyen "
 "din:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"For å godta disse verdiene og konfigurere tjeneren din, klikk på Neste "
+"knappen eller bruk Tilbake knappen for å endre disse."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2190,15 +2170,16 @@ msgstr "Samba hjelper"
 msgid "%s does not exist."
 msgstr "%s eksisterer ikke."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Alle - Ingen tilgangsrestriksjoner"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mine regler - Spør meg om tillatte og nektede verter"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba konfigureringshjelper"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2207,6 +2188,10 @@ msgstr ""
 "arbeidstasjoner som kjøre ikke-Linux systemer."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba konfigureringshjelper"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2230,7 +2215,7 @@ msgid "The Workgroup is wrong"
 msgstr "Arbeidsgruppen er feil"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Tjener-banner."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2245,20 +2230,16 @@ msgid "Banner:"
 msgstr "Banner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Tjener-banneret er feil"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Tilgangskontroll"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Tilgangsnivå :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Eksempel 1: tillat alle IPer i 150.203.*.*; foruten en\n"
@@ -2305,7 +2286,7 @@ msgid "Deny hosts:"
 msgstr "Nekt verter:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Slått på Samba tjenester"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2322,7 +2303,7 @@ msgid "Enable file sharing area"
 msgstr "Slå på fildelingsområde"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Slå på tjener skriverdeling"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2361,7 +2342,7 @@ msgstr ""
 "root, fred, @users, @wheel for hver type av tillatelse."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "les liste:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2369,7 +2350,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "skriv liste:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2390,15 +2371,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Veiviseren samlet følgende parametere for å konfigurere Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Tjener-banner:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Fildeling:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Skrivertjener:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2459,15 +2440,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Velg en primær eller sekundær tjener fra listen."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Tid-tjenere"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primær tid-tjener:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekundær tid-tjener:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2540,17 +2521,17 @@ msgid "Web wizard"
 msgstr "Web-hjelper"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Denne hjelperen vil hjelpe deg å konfigurere web-tjeneren for nettverket "
 "ditt."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Konfigureringshjelper for web-tjener"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Ikke merk av noen bokser hvis du ikke ønsker å aktivere web-tjeneren din."
 
@@ -2559,23 +2540,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Velg hvilken type web-service du ønsker å aktivere:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web-tjener"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Din tjener kan opptre som en web-tjener mot ditt interne nettverk "
 "(intranett) og som en web-tjener for Internett."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Slå på web-tjeneren for Intranettet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Slå på web-tjeneren for Internett"
 
 #: ../web_wizard/Apache.pm:90
@@ -2616,18 +2597,18 @@ msgstr "bruker http underområde : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Skriv stien til området du ønsker skal være dokument root."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Dokument root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Konfigurerer web-tjeneren"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Veiviseren samlet følgende parametere som trengs for å konfigurere web-"
 "tjeneren din"
@@ -2640,16 +2621,12 @@ msgstr "Intranett web-tjener:"
 msgid "Internet web server:"
 msgstr "Internett web-tjener:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Dokument root:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Brukerområde:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Veiviseren konfigurerte vellykket din Intranett/Internett web-tjener "
 
 #: ../web_wizard/Apache.pm:236
@@ -2660,6 +2637,52 @@ msgstr "Apache-tjener"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerer ditt system som en Apache-tjener ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Hvis du ønsker å aktivere PXE for din dhcp-tjener vennligst kryss av i "
+#~ "boksen."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Veiviseren konfigurerte vellykket DHCP-tjenester på tjeneren din."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP tjener"
+
+#~ msgid "News Server"
+#~ msgstr "News tjener"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFSs tjener"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "NFS-tjener med Autofs-kort"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS-tjener:"
+
+#~ msgid "Network File:"
+#~ msgstr "Nettverksfil:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "NIS-eksporter:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto-master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto-hjem:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "For å godta disse verdiene og konfigurere tjeneren din, klikk på Neste-"
+#~ "knappen eller bruk Tilbake-knappen for å rette dem"
+
+#~ msgid "Document Root:"
+#~ msgstr "Dokument root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Konfigurere Internett epost"
 
diff --git a/po/nl.po b/po/nl.po
index b28e164c..3c1fbae2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-20 20:17+0100\n"
 "Last-Translator: Peter van Zaanen <petrvz@gmx.net>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -42,7 +42,7 @@ msgstr "Fout opgetreden."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -199,8 +199,11 @@ msgstr ""
 "Deze wizard helpt u bij het configureren van de DHCP services op uw server."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "Als u PXE wilt inschakelen voor uw DHCP server vink dan het vakje aan."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -217,15 +220,15 @@ msgstr ""
 "waardes accepteren. (bijv. 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Laagste IP adres:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Hoogste IP adres:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IP adres:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -251,7 +254,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Het IP-adres van de server mag niet binnen het bereik liggen."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "De DHCP server wordt geconfigureerd"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -287,7 +290,8 @@ msgid "Interface:"
 msgstr "Interface:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "De wizard heeft de DHCP service op uw server succesvol ingesteld."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -578,11 +582,11 @@ msgstr "DHCP server"
 msgid "DNS server"
 msgstr "DNS server"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Newsserver"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS server"
 
@@ -590,7 +594,7 @@ msgstr "NFS server"
 msgid "Mail server"
 msgstr "Mail server"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP server"
 
@@ -648,42 +652,38 @@ msgid "FTP wizard"
 msgstr "FTP wizard"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP-server configuratiewizard"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Deze wizard helpt u met het instellen van de FTP server voor uw netwerk."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP server"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Activeer de FTP server voor het intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Activeer de FTP server voor het internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Beheerder email: email adres van de FTP beheerder."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -699,7 +699,7 @@ msgstr "FXP toestaan: sta een bestandsoverdracht via een andere FTP toe."
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Chroot Home gebruiker: de gebruikers kunnen alleen hun eigen persoonlijke "
 "map zien."
@@ -719,11 +719,11 @@ msgid "Admin email:"
 msgstr "Systeembeheerder email:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Sta aanmelden van systeembeheerder toe:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot-persoonlijke map gebruiker:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -752,8 +752,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:115
 #, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "Bash komt niet voor in de lijst van shells. Corrigeer dit."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -761,14 +761,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Helaas, u moet root zijn om dit te kunnen uitvoeren..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "De FTP server instellen"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "De wizard heeft de volgende instellingen\n"
 "verzameld om uw FTP server in te stellen"
@@ -783,11 +783,11 @@ msgstr ""
 "Volgende. Klik op Vorige om de waarden te corrigeren."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -811,7 +811,7 @@ msgid "Allow FXP"
 msgstr "Sta FXP toe"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "De wizard heeft uw intranet/internet FTP server succesvol geconfigureerd"
 
@@ -869,11 +869,11 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "De bestemmingsmap is al in gebruik, kies een andere map."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Uw installatie server wordt met de volgende gegevens geconfigureerd"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1093,7 +1093,7 @@ msgstr "Welkom bij de newswizard"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internet computernamen moeten de vorm van bijvoorbeeld \"server.domein."
@@ -1101,10 +1101,6 @@ msgstr ""
 "is de nieuws server waarschijnlijk \"news.provider.nl\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Newsserver"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1113,24 +1109,24 @@ msgstr ""
 "netwerk levert; de naam wordt meestal aangeleverd door uw provider."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Newsservernaam:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Afhankelijk van het soort internet verbinding dat u heeft, kan een opvraag "
 "periode variëren tussen de 6 en 24 uur."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Opvraagperiode:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1138,7 +1134,7 @@ msgstr ""
 "de opvraag periode is de interval tussen twee achtereenvolgende opvragen."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Opvraagperiode (in uren):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1155,31 +1151,30 @@ msgstr "Het internetnieuws configureren"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "De wizard heeft de volgende gegevens\n"
 "verzameld om uw internet nieuws service mee te configureren:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Newsserver:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Opvraaginterval:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1190,7 +1185,6 @@ msgid "NFS Wizard"
 msgstr "NFS wizard"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Allen - Geen restricties op de toegangsrechten"
 
@@ -1203,26 +1197,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS server configuratiewizard"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Deze wizard helpt u met het instellen van de NFS server voor uw netwerk."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS server"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Directory:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Toegangscontrole"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Kies een niveau dat voldoet aan u eisen. Als u niet weet wat te kiezen, "
@@ -1272,7 +1263,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "De wizard heeft uw NFS server succesvol ingesteld."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1285,18 +1276,15 @@ msgstr ""
 "correcte domeinnaam nodig, die niet gelijk is aan localdomain of none "
 "(geen). Start drakconnect om de domeinnaam aan te passen."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
-msgstr "Nis server met autofs folder"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
+msgstr "NIS server met autofs folder"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS client"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "NIS server met autofs folder"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
@@ -1307,7 +1295,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "De client kan automatisch in zijn persoonlijke map aankoppelen als hij op "
@@ -1326,18 +1314,19 @@ msgstr "Configureer uw computer als een NIS client"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "U hoeft alleen nisdoein en nisserver in te vullen"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS server:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS domein:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1359,11 +1348,6 @@ msgstr "NIS domein: Het NIS domein voor uw NIS server."
 msgid "NIS server: name of your computer."
 msgstr "NIS server: de naam van uw computer."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS server:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Home NIS:"
@@ -1383,23 +1367,6 @@ msgstr "Uw NIS server wordt met een autofs map geconfgureerd"
 msgid "NIS directory:"
 msgstr "NIS map:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Netwerk bestand:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-#, fuzzy
-msgid "NFS exports:"
-msgstr "NFS geëxporteerde mappen:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto persoonlijke map:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1413,7 +1380,7 @@ msgstr "NIS server: naam van de NIS server."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1450,12 +1417,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Uw computer wordt geconfigureerd als NIS server met autofs map..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS met autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Uw computer wordt als Nis client geconfigureerd ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1549,7 +1516,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internet computernamen moeten in de vorm \"server.domein.domeintype\" worden "
@@ -1605,15 +1572,6 @@ msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw internet mail service "
 "te configureren:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1753,6 +1711,20 @@ msgid "Disk space (MB):"
 msgstr "Schijfruimte (in MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Toegangscontrole"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Kies een niveau dat voldoet aan u eisen. Als u niet weet wat te kiezen, "
+"voldoet het lokale netwerk niveau in de meeste gevallen. Pas op: het 'Allen "
+"niveau' is waarschijnlijk niet veilig."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "De proxy kan worden ingesteld om verschillende toegangs niveaus te gebruiken."
@@ -1819,6 +1791,15 @@ msgid ""
 msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw proxy te configureren:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Poort:"
@@ -2216,16 +2197,17 @@ msgstr "Samba wizard"
 msgid "%s does not exist."
 msgstr "%s bestaat niet."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Allen - Geen restricties op de toegangsrechten"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 "Mijn regels - Vraag mij welke computers worden toegelaten en welke niet"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba configuratiewizard"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2234,6 +2216,10 @@ msgstr ""
 "werkstations die geen Linux draaien."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba configuratiewizard"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2256,7 +2242,7 @@ msgid "The Workgroup is wrong"
 msgstr "De Werkgroep is niet juist"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Server Banner."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2271,20 +2257,16 @@ msgid "Banner:"
 msgstr "Banner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "De server banner is niet correct"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Toegangscontrole"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Toegangs niveau :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Voorbeeld 1: laat alle IPs in 150.203.*.* toe, behalve één\n"
@@ -2333,7 +2315,7 @@ msgid "Deny hosts:"
 msgstr "Computers niet toelaten:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Samba services geactiveerd"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2351,7 +2333,7 @@ msgid "Enable file sharing area"
 msgstr "Bestandsdelingsruimte inschakelen"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Printerdeling op server inschakelen"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2391,7 +2373,7 @@ msgstr ""
 "root, fred, @users, @wheel voor elke soort van toegangsrechten."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "lees lijst:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2399,7 +2381,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "schrijf lijst:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2422,15 +2404,15 @@ msgstr ""
 " verzameld om Samba te configureren."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Server banner:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Bestanden delen:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Print server:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2491,15 +2473,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Kies een primaire en secundaire server uit de lijst."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Tijdservers"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primaire tijdserver:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Secundaire tijdserver:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2571,16 +2553,16 @@ msgid "Web wizard"
 msgstr "Web wizard"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Deze wizard helpt u bij het configureren van de web server voor uw netwerk."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Web server configuratiewizard"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Kruis geen enkel vak aan als u geen web server wilt activeren."
 
 #: ../web_wizard/Apache.pm:77
@@ -2588,23 +2570,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Kies het soort webservice dat u wilt activeren:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web server"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Uw server kan dienen als web server voor uw interne netwerk (intranet) en "
 "als een web server voor internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Activeer de web server voor het Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Activeer de webserver voor het internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2646,18 +2628,18 @@ msgstr "http sub-directory gebruiker: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Voer het pad van de map in dat u als document hoofdmap wilt instellen."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Document hoofdmap:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "De webserver configureren"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "De wizard heeft de volgende gegevens verzameld om uw web server te "
 "configureren"
@@ -2670,16 +2652,12 @@ msgstr "Intranet webserver:"
 msgid "Internet web server:"
 msgstr "Internet webserver:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Document hoofdmap:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Gebruikersmap:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "De wizard heeft uw intranet/internet web server succesvol geconfigureerd"
 
@@ -2691,6 +2669,52 @@ msgstr "Apache webserver:"
 msgid "Configuring your system as Apache server ..."
 msgstr "De computer wordt als Apache webserver geconfigureerd ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Als u PXE wilt inschakelen voor uw DHCP server vink dan het vakje aan."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "De wizard heeft de DHCP service op uw server succesvol ingesteld."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP server"
+
+#~ msgid "News Server"
+#~ msgstr "Newsserver"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS server"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Nis server met autofs folder"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS server:"
+
+#~ msgid "Network File:"
+#~ msgstr "Netwerk bestand:"
+
+#, fuzzy
+#~ msgid "NFS exports:"
+#~ msgstr "NFS geëxporteerde mappen:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto persoonlijke map:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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."
+
+#~ msgid "Document Root:"
+#~ msgstr "Document hoofdmap:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Internet mail configureren"
 
diff --git a/po/pl.po b/po/pl.po
index 2120dca5..65634131 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-20 20:21+0100\n"
 "Last-Translator: Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -42,7 +42,7 @@ msgstr "B��d."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -189,8 +189,11 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "Je�li chcesz w��czy� PXE dla twojego serwera dhcp zaznacz pole."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -207,15 +210,15 @@ msgstr ""
 "zaproponowane warto�ci. (np. 192.168.100.20 192.169.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Najni�szy adres IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Najwy�szy adres IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Adres IP bramy:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -239,7 +242,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Konfigurowanie serwera DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -274,7 +277,8 @@ msgid "Interface:"
 msgstr "Interfejs:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Druid z powodzeniem skonfigurowa� us�ugi DHCP serwera."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -562,11 +566,11 @@ msgstr "Serwer DHCP"
 msgid "DNS server"
 msgstr "Serwer DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Serwer grup dyskusyjnych"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Serwer NFS"
 
@@ -574,7 +578,7 @@ msgstr "Serwer NFS"
 msgid "Mail server"
 msgstr "Serwer poczty"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Serwer FTP"
 
@@ -632,39 +636,35 @@ msgid "FTP wizard"
 msgstr "Druid FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Druid konfiguracji serwera FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Ten druid pomo�e ci skonfigurowa� serwer FTP dla twojej sieci."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Serwer FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Serwer mo�e pracowa� jako serwer FTP dla twojej wewn�trznej sieci (intranet) "
 "lub jako serwer FTP dla Internetu."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "W��cz serwer FTP dla Intranetu"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "W��cz serwer FTP dla Intranetu"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "E-mail administratora: adres administratora serwera FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -676,7 +676,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "Zezwolenie na FXP: zezwala na transfer plik�w przez inne serwery FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Funkcja chroot katalogu domowego: u�ytkownicy b�d� widzieli tylko sw�j "
 "katalog domowy."
@@ -695,11 +695,11 @@ msgid "Admin email:"
 msgstr "E-mail administratora:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Zezwalanie na logowanie roota:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Funkcja chroot katalogu domowego:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -724,25 +724,27 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
-msgstr "Nie mo�na znale�� basha na li�cie pow�ok. Wygl�da na to, �e "
-"nale�y poprawi� to r�cznie! Zr�b to."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
+msgstr ""
+"Nie mo�na znale�� basha na li�cie pow�ok. Wygl�da na to, �e nale�y poprawi� "
+"to r�cznie! Zr�b to."
 
 #: ../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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Konfigurowanie serwera FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
-"Druid zebra� poni�sze parametry wymagane do skonfigurowania twojego serwera FTP."
+"Druid zebra� poni�sze parametry wymagane do skonfigurowania twojego serwera "
+"FTP."
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
@@ -753,11 +755,11 @@ msgstr ""
 "lub u�yj przycisku Wstecz aby je poprawi�."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranetowy serwer FTP:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internetowy serwer FTP:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -781,7 +783,7 @@ msgid "Allow FXP"
 msgstr "Zezwalanie na FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Druid pomy�lnie skonfigurowa� tw�j serwera FTP dla Intranetu/Internetu"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -834,11 +836,11 @@ msgstr ""
 "Mandrake."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Katalog docelowy jest ju� w u�yciu, wybierz inny katalog."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Tw�j serwer instalacyjny zostanie skonfigurowany z tymi parametrami"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1057,7 +1059,7 @@ msgstr "Witaj w druidzie konfiguracji grup dyskusyjnych"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internetowe nazwy komputer�w musz� mie� posta� \"komputer.domena.typdomeny"
@@ -1065,10 +1067,6 @@ msgstr ""
 "dyskusyjnych to zazwyczaj \"news.dostawca.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Serwer grup dyskusyjnych"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1078,24 +1076,24 @@ msgstr ""
 "dostawc�."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nazwa serwera grup dysk.:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "W zale�no�ci od posiadanego po��czenia internetowego, odpowiedni okres "
 "odpytywania powinien zawiera� si� mi�dzy 6 a 24 godzin."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Czas odpytywania"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1104,7 +1102,7 @@ msgstr ""
 "zapytanie do serwera."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Okres odpytywania (Godziny):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1121,31 +1119,29 @@ msgstr "Konfigurowanie internetowych grup dyskusyjnych"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Druid zebra� poni�sze parametry wymagane\n"
 "do skonfigurowania us�ugi internetowych grup dyskusyjnych:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Aby zaakceptowa� te warto�ci i skonfigurowa� serwer, kliknij przycisk Dalej "
 "lub u�yj przycisku Wstecz aby je poprawi�."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Serwer grup dysk.:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Okres odpytywania:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Druid pomy�lnie skonfigurowa� us�ug� grup dyskusyjnych serwera."
@@ -1155,7 +1151,6 @@ msgid "NFS Wizard"
 msgstr "Druid NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Wszystko - brak limit�w dost�pu"
 
@@ -1168,25 +1163,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Druid konfiguracji serwera NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Ten druid pomo�e ci skonfigurowa� serwer NFS dla twojej sieci."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Serwer NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Kontrola dost�pu"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Wybierz poziom spe�niaj�cy twoje potrzeby. Je�li nie wiesz co wybra� poziom "
@@ -1236,7 +1228,7 @@ msgid "Netmask :"
 msgstr "Maska sieci :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Druid pomy�lnie skonfigurowa� serwer NFS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1247,25 +1239,22 @@ msgstr ""
 "Nale�y ponownie wprowadzi� nazw� domeny. Dla serwera DNS nale�y poda� "
 "poprawn� nazw� domeny, inn� ni� localdomain i none. "
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
-msgstr "Serwer NIS z Autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
+msgstr "Serwer NIS z autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Klient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Serwer NIS z autofs map"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Skonfiguruj serwer NIS z autofs map, pliki auto.home i auto.master."
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Klient mo�e automatycznie montowa� swoje katalogi domowe podczas logowania "
@@ -1283,24 +1272,25 @@ msgstr "Konfigurowanie komputera jako serwera NIS"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Po prostu nale�y poda� domen� i serwer nis."
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
-msgstr "Serwer NFS:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
+msgstr "Serwer NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Domena NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
-"Serwer NIS jest u�yteczny do tworzenia bazy danych u�ytkownik�w oraz "
-"nazwy komputer�w. Druid tak�e zbuduje map� autofs, tak wi�c dostarcza "
-"funkcji dla serwera NIS do automatycznego montowania katalogu domowego "
-"na komputerze klienta NIS."
+"Serwer NIS jest u�yteczny do tworzenia bazy danych u�ytkownik�w oraz nazwy "
+"komputer�w. Druid tak�e zbuduje map� autofs, tak wi�c dostarcza funkcji dla "
+"serwera NIS do automatycznego montowania katalogu domowego na komputerze "
+"klienta NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
@@ -1318,11 +1308,6 @@ msgstr "Domena NIS: domena NIS dla twojego serwera NIS."
 msgid "NIS server: name of your computer."
 msgstr "Serwer NIS: nazwa twojego komputera."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Serwer NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Katalog domowy NIS:"
@@ -1340,22 +1325,6 @@ msgstr "Zostanie ustawiony serwer NIS z autofs map"
 msgid "NIS directory:"
 msgstr "Katalog NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Plik sieciowy:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "Eksporty NIS:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto home:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "Nazwa domeny NIS: nazwa domeny NIS."
@@ -1367,7 +1336,7 @@ msgstr "Serwer NIS: nazwa komputera z serwerem nis."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 "Demon YPBIND wyszukuje serwer z domenami NIS oraz opiekuje si� demonem "
 "informacji o dowi�zaniach NIS."
@@ -1399,11 +1368,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurowanie systemu jako serwer Nis z Autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Serwer z autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurowanie systemu jako klient NIS ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1491,7 +1460,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internetowe nazwy komputera musz� mie� posta� \"komputer.domena.typdomeny\"; "
@@ -1543,14 +1512,6 @@ msgstr ""
 "Druid zebra� poni�sze parametry wymagane do skonfigurowania zewn�trznego "
 "serwera poczty:"
 
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Aby zaakceptowa� te warto�ci i skonfigurowa� serwer, kliknij przycisk Dalej "
-"lub u�yj przycisku Wstecz aby je poprawi�."
-
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
 msgstr "Posta� adresu"
@@ -1685,6 +1646,20 @@ msgid "Disk space (MB):"
 msgstr "Miejsce na dysku (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Kontrola dost�pu"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Wybierz poziom spe�niaj�cy twoje potrzeby. Je�li nie wiesz co wybra� poziom "
+"sieci lokalnej jest zazwyczaj najodpowiedniejszy. Nale�y uwa�a�, gdy� "
+"wszystkie poziomy mog� nie by� bezpieczne."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Po�rednik mo�e by� skonfigurowany w taki spos�b, aby u�ywa� r�nych poziom�w "
@@ -1754,6 +1729,15 @@ msgstr ""
 "Druid zebra� poni�sze parametry wymagane do skonfigurowania twojego "
 "po�rednika:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Aby zaakceptowa� te warto�ci i skonfigurowa� serwer, kliknij przycisk Dalej "
+"lub u�yj przycisku Wstecz aby je poprawi�."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -1783,8 +1767,8 @@ msgid ""
 "You need to readjust your domainname, not equal to localdomain or none. "
 "Please launch drakconnect to adjust it."
 msgstr ""
-"Nale�y ponownie wprowadzi� nazw� domeny inn� ni� localdomain i none. "
-"Uruchom polecenie drakconnect aby j� ustawi�."
+"Nale�y ponownie wprowadzi� nazw� domeny inn� ni� localdomain i none. Uruchom "
+"polecenie drakconnect aby j� ustawi�."
 
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:193
 msgid "Set PXE server"
@@ -1847,13 +1831,11 @@ msgstr ""
 msgid ""
 "PXE name: the name displayed in PXE menu (please provide a word or a  "
 "number, with no space)"
-msgstr ""
-"Nazwa PXE: nazwa w menu PXE (jedno s�owo/liczba, bez spacji)"
+msgstr "Nazwa PXE: nazwa w menu PXE (jedno s�owo/liczba, bez spacji)"
 
 #: ../pxe_wizard/Pxe.pm:135
 msgid "Path to image: provide the full path to the network boot image"
-msgstr ""
-"�cie�ka do obrazu: pe�na �cie�ka do obrazu uruchamialnego z sieci"
+msgstr "�cie�ka do obrazu: pe�na �cie�ka do obrazu uruchamialnego z sieci"
 
 #: ../pxe_wizard/Pxe.pm:135
 msgid ""
@@ -1877,8 +1859,8 @@ msgid ""
 "all drivers needed (in our case all.rdz)."
 msgstr ""
 "Z technicznego powodu, w przypadku wielu obraz�w rozruchowych jest �atwiej "
-"uruchomi� komputer sieciowy przez j�dro (vmlinuz) i dostarczy� jeden plik "
-"ze wszystkimi wymaganymi sterownikami (w naszym przypadku all.rdz)."
+"uruchomi� komputer sieciowy przez j�dro (vmlinuz) i dostarczy� jeden plik ze "
+"wszystkimi wymaganymi sterownikami (w naszym przypadku all.rdz)."
 
 #: ../pxe_wizard/Pxe.pm:145
 msgid ""
@@ -1897,8 +1879,8 @@ msgid ""
 "user can choose wich image he wants to boot through PXE."
 msgstr ""
 "Aby uruchomi� si� z sieci, komputer wymaga obrazu rozruchowego. Co wi�cej "
-"potrzebna jest nazwa tego obrazu tak wi�c obraz jest zwi�zany z nazw� w "
-"menu PXE. U�ytkownik mo�e wybra� ��dany obraz do uruchamiania z PXE."
+"potrzebna jest nazwa tego obrazu tak wi�c obraz jest zwi�zany z nazw� w menu "
+"PXE. U�ytkownik mo�e wybra� ��dany obraz do uruchamiania z PXE."
 
 #: ../pxe_wizard/Pxe.pm:156
 msgid "Please choose the PXE boot image you want to remove from PXE server."
@@ -1926,8 +1908,8 @@ msgid ""
 "provides an easy way to custom boot image with common parameters."
 msgstr ""
 "W niekt�rych przypadkach nale�y doda� pewn� opcj� do obrazu rozruchowego "
-"PXE. Ten druid dostarcza �atw� metod� do w�asnego obrazu rozruchowego "
-"ze wsp�lnymi parametrami."
+"PXE. Ten druid dostarcza �atw� metod� do w�asnego obrazu rozruchowego ze "
+"wsp�lnymi parametrami."
 
 #: ../pxe_wizard/Pxe.pm:163
 msgid ""
@@ -1980,8 +1962,8 @@ msgid ""
 "Network client interface: the network interface used for the installation "
 "process."
 msgstr ""
-"Interfejs klienta sieciowego: przez kt�ry interfejs powinien by� u�ywany "
-"do procedu instalacji."
+"Interfejs klienta sieciowego: przez kt�ry interfejs powinien by� u�ywany do "
+"procedu instalacji."
 
 #: ../pxe_wizard/Pxe.pm:181
 msgid "Ramsize: adjust the ramsize parameter on boot disk."
@@ -2029,18 +2011,17 @@ msgid ""
 "a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you "
 "don't do that, PXE query will not be answered by this server."
 msgstr ""
-"Nale�y u�y� specjalnego pliku dhcpd.conf z parametrem PXE. Aby ustawi� "
-"taki serwer DHCP, uruchom druida DHCP i zaznacz pole \"W��czenie PXE\". "
-"Je�li tego nie uczynisz, zapytanie PXE nie b�dzie obs�ugiwane przez ten "
-"serwer."
+"Nale�y u�y� specjalnego pliku dhcpd.conf z parametrem PXE. Aby ustawi� taki "
+"serwer DHCP, uruchom druida DHCP i zaznacz pole \"W��czenie PXE\". Je�li "
+"tego nie uczynisz, zapytanie PXE nie b�dzie obs�ugiwane przez ten serwer."
 
 #: ../pxe_wizard/Pxe.pm:197
 msgid ""
 "Please provide a bootable image. To boot through network, network computer "
 "need a boot image."
 msgstr ""
-"Podaj obraz rozruchowy. Aby uruchomi� komputer z sieci, wymagany jest "
-"obraz rozruchowy."
+"Podaj obraz rozruchowy. Aby uruchomi� komputer z sieci, wymagany jest obraz "
+"rozruchowy."
 
 #: ../pxe_wizard/Pxe.pm:201
 msgid "We need an image. Please add one."
@@ -2051,8 +2032,8 @@ msgid ""
 "Please provide an all.rdz image, wich contain all drivers. You can find one "
 "in first CD of Mandrakesoft product, in /isolinux/alt0/ directory."
 msgstr ""
-"Podaj obraz all.rdz, kt�ry zawiera wszystkie sterowniki. Mo�na znale�� "
-"jeden na pierwszej p�ycie CD produktu MandrakeSoft w katalogu /isolinux/alt0/."
+"Podaj obraz all.rdz, kt�ry zawiera wszystkie sterowniki. Mo�na znale�� jeden "
+"na pierwszej p�ycie CD produktu MandrakeSoft w katalogu /isolinux/alt0/."
 
 #: ../pxe_wizard/Pxe.pm:213 ../pxe_wizard/Pxe.pm:217
 #, perl-format
@@ -2144,15 +2125,16 @@ msgstr "Druid Samby"
 msgid "%s does not exist."
 msgstr "%s nie istnieje."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Wszystko - brak limit�w dost�pu"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "W�asne zasady - Pytanie o dozwolone lub zabronione komputery"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Druid konfiguracji Samby"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2161,6 +2143,10 @@ msgstr ""
 "roboczy� pracuj�cych pod kontrol� system�w operacyjnych innych ni� Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Druid konfiguracji Samby"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Ten druid pomo�e ci w konfiguracji us�ug Samba twojego serwera."
@@ -2182,7 +2168,7 @@ msgid "The Workgroup is wrong"
 msgstr "Grupa robocza jest niepoprawna"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Baner serwera."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2198,20 +2184,16 @@ msgid "Banner:"
 msgstr "Baner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Baner serwera jest niepoprawny"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Kontrola dost�pu"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Poziom dost�pu :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Przyk�ad 1: dozwolone wszystkie IP w 150.203.*.*; z wyj�tkiem jednego\n"
@@ -2259,7 +2241,7 @@ msgid "Deny hosts:"
 msgstr "Zabronione komputery:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "W��czone us�ugi Samba"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2276,7 +2258,7 @@ msgid "Enable file sharing area"
 msgstr "W��cz obszar wsp�dzielenia plik�w"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "W��cz wsp�dzielenie drukarek serwera"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2316,7 +2298,7 @@ msgstr ""
 "root, fred, @users, @wheel dla ka�dego rodzaju uprawnie�."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "lista odczytu:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2324,7 +2306,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "lista zapisu:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2344,15 +2326,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Druid zebra� poni�sze parametry wymagane do skonfigurowania Samby."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Baner serwera:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Wsp�dzielenie plik�w:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Serwer wydruku:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2412,15 +2394,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Wybierz podstawowy i zapasowy serwer z listy."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Serwery czasu"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Podstawowy serwer czasu:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Zapasowy serwer czasu:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2493,15 +2475,15 @@ msgid "Web wizard"
 msgstr "Druid WWW"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Ten druid pomo�e ci skonfigurowa� serwer webowy dla twojej sieci."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Druid konfiguracji serwera webowego"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Nie zaznaczaj �adnego pola je�li nie chcesz aktywowa� serwera web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2509,23 +2491,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Wybierz rodzaj us�ug webowych, kt�re chcesz aktywowa�:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Serwer WWW"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Tw�j serwer mo�e pracowa� jako serwer WWW dla twojej sieci wewn�trzej "
 "(intranet) lub jako serwer WWW dla Internetu."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "W��cz serwer WWW dla Intranetu"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "W��cz serwer WWW dla Internetu"
 
 #: ../web_wizard/Apache.pm:90
@@ -2567,18 +2549,18 @@ msgstr "podkatalog http u�ytkownika : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Podaj �cie�k� do katalogu, kt�ry ma by� katalogiem g��wnym dokument�w."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Katalog g��wny:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "G��wny katalog dokument�w:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Konfiguracja serwera webowego"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Druid zebra� poni�sze parametry wymagane do konfiguracji twojego serwera WWW"
 
@@ -2590,16 +2572,12 @@ msgstr "Intranetowy serwer www:"
 msgid "Internet web server:"
 msgstr "Internetowy serwer www:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "G��wny katalog dokument�w:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Katalog u�ytkownika:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Druid pomy�lnie skonfigurowa� tw�j serwer WWW Intranetowy/Internetowy"
 
 #: ../web_wizard/Apache.pm:236
@@ -2609,3 +2587,46 @@ msgstr "Serwer Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurowanie systemu jako serwera Apache ..."
+
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr "Je�li chcesz w��czy� PXE dla twojego serwera dhcp zaznacz pole."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Druid z powodzeniem skonfigurowa� us�ugi DHCP serwera."
+
+#~ msgid "FTP Server"
+#~ msgstr "Serwer FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Serwer grup dyskusyjnych"
+
+#~ msgid "NFS Server"
+#~ msgstr "Serwer NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Serwer NIS z Autofs map"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Serwer NFS:"
+
+#~ msgid "Network File:"
+#~ msgstr "Plik sieciowy:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "Eksporty NIS:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto home:"
+
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Aby zaakceptowa� te warto�ci i skonfigurowa� serwer, kliknij przycisk "
+#~ "Dalej lub u�yj przycisku Wstecz aby je poprawi�."
+
+#~ msgid "Document Root:"
+#~ msgstr "Katalog g��wny:"
diff --git a/po/pt.po b/po/pt.po
index 8eacccf0..c49e068c 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -45,7 +45,7 @@ msgstr "Erro."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -199,7 +199,10 @@ msgstr ""
 "Este assistente vai ajudar-lo a configurar os serviços DHCP do seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -218,16 +221,16 @@ msgstr ""
 "propostos."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "O mais baixo endereço IP :"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "O mais alto endereço IP :"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP do Portao :"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -251,7 +254,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "A configurar o Servidor DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -287,7 +290,8 @@ msgid "Interface:"
 msgstr "Interface:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "O assistente conseguiu configurar os serviços DHCP do seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -571,11 +575,11 @@ msgstr "Servidor Ftp"
 msgid "DNS server"
 msgstr "Servidor NFS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Servidor de News"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Servidor NFS"
 
@@ -583,8 +587,7 @@ msgstr "Servidor NFS"
 msgid "Mail server"
 msgstr "Servidor de correio"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Servidor FTP"
 
@@ -646,41 +649,37 @@ msgid "FTP wizard"
 msgstr "Assistente FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Assistente de Configuração de Servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Este assistente vai ajudar-lo a configurar o servidor FTP para a sua rede."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "O seu servidor pode agir como um servidor FTP para a sua rede interna "
 "(intranet) e para o Internet"
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Autoriza o servidor FTP para o Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Autoriza o servidor FTP para o Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -692,7 +691,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -708,11 +707,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -737,8 +736,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -746,14 +745,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Desculpe, deve ser root para fazer isto..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "A configurar o Servidor FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "O assistente recuperou os seguintes parâmetros necessários para configurar o "
 "seu servidor FTP"
@@ -768,11 +767,11 @@ msgstr ""
 "Seguinte ou utilize o botão Voltar para mudá-los"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Servidor FTP Intranet :"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Servidor Internet FTP :"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -796,7 +795,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "O assistente conseguiu configurar o seu servidor FTP Intranet/Internet"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -844,11 +843,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1073,7 +1072,7 @@ msgstr "Bemvindo ao Assistente de Forums"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Os nomes de anfitrião Internet devem ser na forma \"anfitrião.domínio."
@@ -1081,10 +1080,6 @@ msgstr ""
 "servidor de forums é habitualmente \"news.fornecedor.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Servidor de Forums"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1093,24 +1088,24 @@ msgstr ""
 "Internet à sua rede, é indicado habitualmente pelo seu fornecedor de ligação."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nome do Servidor de Forums :"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Segundo a ligação ao Internet que tem, o periodo de verificação apropriado "
 "varia entre 6 e 24 horas."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Periodo de verificação"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1119,7 +1114,7 @@ msgstr ""
 "verificações consecutivas."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Periodo de verificação (Horas) :"
 
 #: ../news_wizard/Inn.pm:76
@@ -1136,31 +1131,30 @@ msgstr "A configurar os Forums Internet"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 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 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Para aceitar estes valores, e configurar o seu servidor, carregue em "
-"Seguinte ou utilize o botão Voltar para os mudar."
+"Seguinte ou utilize o botão Voltar para mudá-los"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Servidor de Forums :"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Periodo de verificação :"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1172,7 +1166,6 @@ msgid "NFS Wizard"
 msgstr "Assistente NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Todos - Nenhuma restrição no acesso"
 
@@ -1185,26 +1178,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Assistente de Configuração de Servidor NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Este assistente vai ajudar-lo a configurar o servidor NFS para a sua rede."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Servidor NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Pasta :"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Controlo de Acesso"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Controlo de acesso"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Escolha o nível que corresponde ao que necessita. Se não sabe, o nível rede "
@@ -1253,7 +1243,7 @@ msgid "Netmask :"
 msgstr "Máscara de rede :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "O assistente conseguiu configurar o seu servidor NFS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1262,28 +1252,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Servidor de News"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "IP Cliente :"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Servidor de News"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1299,19 +1285,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Servidor NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1329,12 +1316,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Servidor NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1356,23 +1337,6 @@ msgstr "O assistente conseguiu configurar o seu servidor Samba."
 msgid "NIS directory:"
 msgstr "Directoria do utilizador :"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Dispositivo de rede"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1385,7 +1349,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1420,12 +1384,12 @@ msgstr "A configurar o Servidor DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Servidor de News"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "A configurar o Servidor DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1515,7 +1479,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Os nomes de anfitrião Internet devem ser na forma \"anfitriao.dominio."
@@ -1568,15 +1532,6 @@ msgstr ""
 "O assistente recuperou os parametros seguintes necessários para configurar o "
 "seu serviço de Correio Internet :"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Para aceitar estes valores, e configurar o seu servidor, carregue em "
-"Seguinte ou utilize o botão Voltar para mudá-los"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1716,6 +1671,20 @@ msgid "Disk space (MB):"
 msgstr "Espaço no Disco (MB) :"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Controlo de Acesso"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Escolha o nível que corresponde ao que necessita. Se não sabe, o nível rede "
+"Local é habitualmente o mais apropriado. Faça atenção ao nível Todos que "
+"pode não ser seguro."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "O proxy pode ser configurado para utilizar diferentes níveis de controlo de "
@@ -1784,6 +1753,15 @@ msgstr ""
 "O assistente recuperou os parametros seguintes necessários para configurar o "
 "seu proxy :"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Para aceitar estes valores, e configurar o seu servidor, carregue em "
+"Seguinte ou utilize o botão Voltar para os mudar."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Porta :"
@@ -2149,15 +2127,16 @@ msgstr "Assistente Samba"
 msgid "%s does not exist."
 msgstr "%s não existe."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Todos - Nenhuma restrição no acesso"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "As minhas regras - pedir-me os anfitriões autorizados e recusados"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Assistente de Configuração do Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2166,6 +2145,10 @@ msgstr ""
 "e de impressão para as maquinas que utilizam sistemas operativos não-Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Assistente de Configuração do Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2188,7 +2171,7 @@ msgid "The Workgroup is wrong"
 msgstr "O grupo de trabalho é errado"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Bandeira do Servidor."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2203,20 +2186,16 @@ msgid "Banner:"
 msgstr "Bandeira :"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "A Bandeira do Servidor não é correcta"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Controlo de acesso"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Nível de acesso :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Exemplo 1 : autoriza todos os IPs em 150.203.*.*; exceptuado um\n"
@@ -2263,7 +2242,7 @@ msgid "Deny hosts:"
 msgstr "Recusar os anfitriões :"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Serviços Samba autorizados"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2280,7 +2259,7 @@ msgid "Enable file sharing area"
 msgstr "Autoriza uma zona de partilha"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Autoriza a Partilha de Impressoras pelo Servidor"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2319,7 +2298,7 @@ msgstr ""
 "root, fred, @users, @wheel para cada tipo de autorização."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "Lista de leitura :"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2327,7 +2306,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "Lista de escritura :"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2351,15 +2330,15 @@ msgstr ""
 "necessários para configurar o Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Bandeira do Servidor :"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Partilha de Ficheiros :"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Servidor de Impressão :"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2423,15 +2402,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Escolha um servidor principal e segundario a partir da lista."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Servidores de Tempo"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Servidor de Tempo Principal :"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Servidor de Tempo segundario :"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2505,16 +2484,16 @@ msgid "Web wizard"
 msgstr "Assistente Web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Este assistente vai ajudar-lo a configurar o servidor Web para a sua rede."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Assistente de Configuração do Servidor Web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Não coche nenhuma caixa se não deseja activar o seu Servidor Web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2522,23 +2501,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Escolha o tipo de serviço Web que deseja activar :"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "servidor Web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "O seu servidor pode agir como um servidor Web para a sua rede interna "
 "(intranet) e para o Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Activa o Servidor Web para o Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Activa o Servidor Web para o Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2582,18 +2561,18 @@ msgstr "sub-directoria http dos utilizadores : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Escreva o caminho da pasta que deseja como raiz dos documentos."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Raíz dos Documentos :"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Raíz dos documentos :"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "A configurar o Servidor Web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "O assistente recuperou os parametros seguintes precisos para configurar ao "
 "servidor Web"
@@ -2606,16 +2585,12 @@ msgstr "Servidor web intranet :"
 msgid "Internet web server:"
 msgstr "Servidor web internet :"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Raíz dos documentos :"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Directoria do utilizador :"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "O assistente conseguiu configurar o seu servidor Web Intranet/Internet"
 
 #: ../web_wizard/Apache.pm:236
@@ -2628,6 +2603,41 @@ msgstr "Servidor web Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "A configurar o Servidor DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "O assistente conseguiu configurar os serviços DHCP do seu servidor."
+
+#~ msgid "FTP Server"
+#~ msgstr "Servidor FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Servidor de Forums"
+
+#~ msgid "NFS Server"
+#~ msgstr "Servidor NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Servidor de News"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Servidor NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Dispositivo de rede"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Para aceitar estes valores, e configurar o seu servidor, carregue em "
+#~ "Seguinte ou utilize o botão Voltar para mudá-los"
+
+#~ msgid "Document Root:"
+#~ msgstr "Raíz dos Documentos :"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "A configurar o Correio Internet"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 91e7c003..d787c54c 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-06 16:37-0200\n"
 "Last-Translator: Tiago Cruz <tiagocruz@linuxdicas.com.br>\n"
 "Language-Team: Português do Brasil <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -45,7 +45,7 @@ msgstr "Erro."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -196,10 +196,11 @@ msgstr ""
 "Este assistente ajudará você a configurar o serviço DHCP de seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Se você desejar habilitar o PXE para seu servidor dhcp, favor marque esta "
-"opção."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -217,15 +218,15 @@ msgstr ""
 "192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Menor endereço IP"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Maior endereço IP"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Endereço IP do Gateway:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -251,7 +252,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Configurando o servidor DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -287,7 +288,8 @@ msgid "Interface:"
 msgstr "Interface:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "O assistente configurou com sucesso o serviço DHCP de seu servidor."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -571,11 +573,11 @@ msgstr "Servidor DHCP"
 msgid "DNS server"
 msgstr "Servidor DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Servidor de Notícias"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Servidor NFS"
 
@@ -583,7 +585,7 @@ msgstr "Servidor NFS"
 msgid "Mail server"
 msgstr "Servidor de Mail"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Servidor de FTP"
 
@@ -641,42 +643,38 @@ msgid "FTP wizard"
 msgstr "Assistente de FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Assistente de configuração para o servidor de FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "O assistente ajudará você a configurar o servidor de FTP para sua rede."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Servidor de FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Habilita o servidor FTP para a Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Habilita o servidor de FTP para a Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "E-mail do Admin: endereço de e-mail do administrador do FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -692,7 +690,7 @@ msgstr "Permitir FXP: permite a transferência de aquivos via outro FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Diretório de usuário 'chroot': Os usuários irão apenas ver seu diretório "
 "home."
@@ -711,11 +709,11 @@ msgid "Admin email:"
 msgstr "E-mail do administrador:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Permitir login do root:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Diretório de usuário 'chroot':"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -742,8 +740,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:115
 #, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "Não consigo encontrar 'bash' na lista de shells. Favor corrigir."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -751,14 +749,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Desculpe, você precisa ser root para esta operação..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Configurando o servidor de FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "O assistente coletou os seguintes parâmetros\n"
 "necessários para configurar seu servidor de FTP"
@@ -773,11 +771,11 @@ msgstr ""
 "ou então use o botão voltar para corrigir."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Servidor de FTP para intranet"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Servidor Internet de FTP:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -801,7 +799,7 @@ msgid "Allow FXP"
 msgstr "Permitir FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "O assistente configurou com sucesso sua servidor de FTP para internet/"
 "intranet"
@@ -860,11 +858,11 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Destination directory already in use, please choose another one."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Seu servidor de instalação será configurado com aqueles parâmetros"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1072,7 +1070,7 @@ msgstr "Bem-vindo ao Assistente de Notícias"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Os nomes dos hosts da Internet devem estar no formato \"host.dominio."
@@ -1080,10 +1078,6 @@ msgstr ""
 "de notícias da internet será \"news.provedor.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Servidor de Notícias"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1092,24 +1086,24 @@ msgstr ""
 "Internet para sua rede; este nome geralmente é fornecido pelo seu provedor."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nome do Servidor de Notícias:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Dependendo do tipo de conexão de internet que você tem, um período de "
 "checagem apropriado pode variar entre 6 e 24 horas."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Período de checagem"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1118,7 +1112,7 @@ msgstr ""
 "intervalo entre duas verificações consecutivas"
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Intervalo de Verificação (horas):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1135,31 +1129,30 @@ msgstr "Configurando as Notícias da Internet"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 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 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Servidor de Notícias:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Intervalo de checagem:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1171,7 +1164,6 @@ msgid "NFS Wizard"
 msgstr "Assistente NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Todas - Sem restrição de acesso"
 
@@ -1184,26 +1176,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Assistente de configuração do servidor NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "O assistente ajudará você a configurar o servidor de NFS para sua rede."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Servidor NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Diretório:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Controle de acesso"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Escolha o nível que atenda suas necessidades. Se você não souber, o nível "
@@ -1252,7 +1241,7 @@ msgid "Netmask :"
 msgstr "Máscara de rede:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "O assistente configurou com sucesso seu servidor NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1265,18 +1254,15 @@ msgstr ""
 "um nome de domínio correto, não igual ao domínio local ou em branco. Execute "
 "o drakconnect para ajustar isso."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
-msgstr "Servidor de NIS com mapa de autofs"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
+msgstr "Servidor de NIS com mapa autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Cliente NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Servidor de NIS com mapa autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
@@ -1286,7 +1272,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Clientes podem automaticamente montar seus diretórios home quando eles fazem "
@@ -1304,18 +1290,19 @@ msgstr "Configura o computador para ser um cliente NIS"
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Servidor NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Domínio NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1337,11 +1324,6 @@ msgstr "Domímio NIS: domínio NIS para seu servidor NIS."
 msgid "NIS server: name of your computer."
 msgstr "Servidor NIS: nome do seu computador."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Servidor NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Home NIS:"
@@ -1360,22 +1342,6 @@ msgstr "Definirá seu servidor NIS com mapa autofs"
 msgid "NIS directory:"
 msgstr "Diretório NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Arquivo da Rede:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1389,7 +1355,7 @@ msgstr "Servidor NIS: nome da máquina do nisserver"
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1423,11 +1389,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Configurando seu sistema como um servidor NIS com mapa Autofs..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS com para autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Configurando seu sistema como um Cliente DNS ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1519,7 +1485,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Nomes de hosts da internet devem estar no formato \"host.domínio."
@@ -1572,15 +1538,6 @@ msgstr ""
 "O assistente coletou os parâmetros necessários para configurar seu Serviço "
 "de Correio na Internet:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1718,6 +1675,20 @@ msgid "Disk space (MB):"
 msgstr "Espaço em disco (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Controle de acesso"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Escolha o nível que atenda suas necessidades. Se você não souber, o nível "
+"Rede Local geralmente é o mais apropriado. Somente o nível Todas pode não "
+"ser seguro."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "O proxy pode ser configurado para diferentes níveis de controle de acesso."
@@ -1785,6 +1756,15 @@ msgstr ""
 "O assistente coletou os seguintes parâmetros necessários para configurar seu "
 "servidor proxy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Para aceitar estes valores e configurar seu servidor clique no botão próximo "
+"ou então use o botão voltar para corrigir."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Porta:"
@@ -2182,15 +2162,16 @@ msgstr "Assistente do samba"
 msgid "%s does not exist."
 msgstr "%s não existe"
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Todas - Sem restrição de acesso"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Minhas regras - Pergunte-me os hosts permitidos e proibidos"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Assistente de Configuração do Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2199,6 +2180,10 @@ msgstr ""
 "impressão para estações de trabalho que rodam sistemas não-Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Assistente de Configuração do Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2222,7 +2207,7 @@ msgid "The Workgroup is wrong"
 msgstr "O grupo de trabalho está incorreto"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Logotipo do Servidor"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2237,20 +2222,16 @@ msgid "Banner:"
 msgstr "Logo:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Esse logotipo do Servidor está incorreto"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Controle de acesso"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Nível de Acesso:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Exemplo 1: permitir todos os IPs em 150.203.*.*; exceto um\n"
@@ -2298,7 +2279,7 @@ msgid "Deny hosts:"
 msgstr "Bloquear hosts:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Habilita o serviço Samba."
 
 #: ../samba_wizard/Samba.pm:132
@@ -2316,7 +2297,7 @@ msgid "Enable file sharing area"
 msgstr "Habilita a área de compartilhamento de arquivos"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Habilita o Servidor de Compartilhamento de Impressoras"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2356,7 +2337,7 @@ msgstr ""
 "root, fred, \\@users, \\@wheel para cada tipo da permissão."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "Lista de leitura:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2364,7 +2345,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, \\@users, \\@wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "Lista de escrita:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2386,15 +2367,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "O assistente coletou os seguintes parâmetros para configurar o Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Logotipo do Servidor:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Compartilhar arquivo:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Servidor de impressão"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2455,15 +2436,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Selecione um servidor primário e secundário da lista"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Servidores de Hora"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Servidor de Hora primário:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Servidor de hora secundário:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2537,15 +2518,15 @@ msgid "Web wizard"
 msgstr "Assistente de Web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "O assistente ajudará você a configurar o Servidor de Web de sua rede."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Assistente de configuração do Servidor Web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Não escolha nenhuma opção caso não queira ativar seu servidor de Web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2553,23 +2534,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Selecione o tipo de serviço Web que você quer ativar:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Servidor Web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Seu servidor pode agir como um Servidor de Web para a sua rede interna "
 "(intranet) e como um Servidor de Web para a Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Habilita o Servidor Web para a Internet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Habilita o servidor Web para a Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2614,18 +2595,18 @@ msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Digite o caminho do diretório que você quer que seja a raiz de documentos:"
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Documentos Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Documento do administrador"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Configurando o Servidor de Web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "O assistente coletou os seguintes parâmetros necessários para configurar seu "
 "servidor de Web"
@@ -2638,16 +2619,12 @@ msgstr "Servidor Web da Intranet:"
 msgid "Internet web server:"
 msgstr "Servidor Web da Internet"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Documento do administrador"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Diretório de usuário:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "O assistente configurou com sucesso seu servidor de Internet/Intranet"
 
 #: ../web_wizard/Apache.pm:236
@@ -2658,6 +2635,43 @@ msgstr "Servidor Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurando seu sistema como servidor Apache ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Se você desejar habilitar o PXE para seu servidor dhcp, favor marque esta "
+#~ "opção."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "O assistente configurou com sucesso o serviço DHCP de seu servidor."
+
+#~ msgid "FTP Server"
+#~ msgstr "Servidor de FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Servidor de Notícias"
+
+#~ msgid "NFS Server"
+#~ msgstr "Servidor NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Servidor de NIS com mapa de autofs"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Servidor NIS:"
+
+#~ msgid "Network File:"
+#~ msgstr "Arquivo da Rede:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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."
+
+#~ msgid "Document Root:"
+#~ msgstr "Documentos Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Configurando o Internet Mail"
 
diff --git a/po/ro.po b/po/ro.po
index 09774cef..1195617b 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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."
@@ -41,7 +41,7 @@ msgstr "Eroare."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -197,7 +197,10 @@ msgstr ""
 "dumneavostră."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -215,16 +218,16 @@ msgstr ""
 "dacă nu aveţi nevoi speciale, puteţi accepta valorile propuse."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Cea mai mică adresă IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Cea mai mare adresă IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Cea mai mică adresă IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -248,7 +251,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Configurez serverul DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -284,7 +287,8 @@ msgid "Interface:"
 msgstr "Interfaţă:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Asistentul a configurat cu succes serviciile DHCP al serverului dvs."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -567,11 +571,11 @@ msgstr "Server ftp"
 msgid "DNS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Server de ştiri"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Server NFS"
 
@@ -579,8 +583,7 @@ msgstr "Server NFS"
 msgid "Mail server"
 msgstr "Server de email"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Server FTP"
 
@@ -641,42 +644,38 @@ msgid "FTP wizard"
 msgstr "Asistent FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Asistent de configurare server FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Acest asistent vă va ajuta la configurarea serverului FTP pentru reţeaua "
 "dumneavoastră."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Server FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Activează serverul FTP pentru Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Activează serverul FTP pentru Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -688,7 +687,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -704,11 +703,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -733,8 +732,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -742,14 +741,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Regret, trebuie să fiţi root pentru a face aceasta..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Configurez serverul FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Asistentul a colectat următorii parametri necesari\n"
 "pentru configurarea serverului FTP"
@@ -764,11 +763,11 @@ msgstr ""
 "Următorul sau folosiţi butonul Înapoi pentru corecţii"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Server FTP în Intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Server FTP în Internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -792,7 +791,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Asistentul a configurat cu succes serverul dvs. FTP pentru Intranet/Internet."
 
@@ -841,11 +840,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1067,7 +1066,7 @@ msgstr "Bine aţi venit la asistentul de configurare Ştiri (News)"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Numele de gazdă Internet trebuie să fie de forma \"gazdă.domeniu.tipdomeniu"
@@ -1075,10 +1074,6 @@ msgstr ""
 "de obicei \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Server de Ştiri"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1088,24 +1083,24 @@ msgstr ""
 "Internet."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Nume server de ştiri:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "În funcţie de tipul conexiunii la Intenet disponibilă, perioada "
 "corespunzătoare de sondare poate varia între 6 şi 24 de ore."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Perioada de sondare"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1114,7 +1109,7 @@ msgstr ""
 "interogări succesive."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Perioada de sondare (Ore):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1131,31 +1126,30 @@ msgstr "Configurez ştirile de Internet"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Asistentul a colectat următorii parametri necesari\n"
 "pentru configurarea serviciului de ştiri din Internet:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Pentru a accepta aceste valori şi a configura serverul, faceţi clic pe "
-"Următorul sau folosiţi butonul Înapoi pentru corecţii."
+"Următorul sau folosiţi butonul Înapoi pentru corecţii"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Server de Ştiri:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Interval de sondare:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1167,7 +1161,6 @@ msgid "NFS Wizard"
 msgstr "Asistent NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Tot - Fără restriţii de acces"
 
@@ -1180,27 +1173,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Asistent de configurare server NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Acest asistent vă va ajuta la configurarea serverului NFS pentru reţeaua "
 "dumneavoastră."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Server NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Director:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Control acces"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Alegeţi nivelul potrivit nevoilor dvs. Dacă nu ştiţi sigur, nivelul Reţea "
@@ -1249,7 +1239,7 @@ msgid "Netmask :"
 msgstr "Mască de reţea:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Asistentul a configurat cu succes serviciul NFS al serverului dvs."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1258,28 +1248,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Server de ştiri"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "IP client:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Server de ştiri"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1295,19 +1281,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Server NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1325,12 +1312,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Server NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1352,22 +1333,6 @@ msgstr "Asistentul a configurat cu succes serviciul Samba al serverului dvs."
 msgid "NIS directory:"
 msgstr "Director utilizator:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1380,7 +1345,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1415,12 +1380,12 @@ msgstr "Configurez serverul DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Server de ştiri"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Configurez serverul DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1510,7 +1475,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Numele de gazdă Internet trebuie să fie de forma \" gazdă.domeniu.tipdomeniu"
@@ -1563,15 +1528,6 @@ msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea "
 "serviciului de poştă de Internet:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Pentru a accepta aceste valori şi a configura serverul, faceţi clic pe "
-"Următorul sau folosiţi butonul Înapoi pentru corecţii"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1712,6 +1668,20 @@ msgid "Disk space (MB):"
 msgstr "Spaţiu pe disc (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Control acces"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Alegeţi nivelul potrivit nevoilor dvs. Dacă nu ştiţi sigur, nivelul Reţea "
+"locală este de obicei cel potrivit. Aveţi grijă că nivelul Tot poate fi "
+"nesigur."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Proxy-ul poate fi configurat pentru a utiliza diferite niveluri de control "
@@ -1779,6 +1749,15 @@ msgid ""
 msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea Proxy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Pentru a accepta aceste valori şi a configura serverul, faceţi clic pe "
+"Următorul sau folosiţi butonul Înapoi pentru corecţii."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2144,17 +2123,18 @@ msgstr "Asistent Samba"
 msgid "%s does not exist."
 msgstr "%s nu există."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Tot - Fără restriţii de acces"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 "Reguli personalizate - Întreabă-mă care sunt gazdele care au/nu au drept de "
 "acces"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Asistent de configurare Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2163,6 +2143,10 @@ msgstr ""
 "imprimare pentru staţiile de lucru ce rulează sisteme non-Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Asistent de configurare Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2187,7 +2171,7 @@ msgid "The Workgroup is wrong"
 msgstr "Grupul de lucru este eronat"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Antet server."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2203,20 +2187,16 @@ msgid "Banner:"
 msgstr "Antet"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Antetul serverului nu este corect"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Control acces"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Nivel acces:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Exemplul 1: permite tuturor IP-urilor din 150.203.*.*; exceptând unul\n"
@@ -2266,7 +2246,7 @@ msgid "Deny hosts:"
 msgstr "Refuză gazdele:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Servicii Samba activate"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2284,7 +2264,7 @@ msgid "Enable file sharing area"
 msgstr "Activează zona de partajare a fişierelor"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Activare partajare imprimante de pe server"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2324,7 +2304,7 @@ msgstr ""
 "root, gigi, @users,@wheel pentru fiecare fel de drepturi."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "Lista citire:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2332,7 +2312,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "Lista scriere:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2355,15 +2335,15 @@ msgstr ""
 "configurarea Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Antet server:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Partajare fişiere:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Server de tipărire:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2427,15 +2407,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Selectaţi un server principal şi unul secundar din listă."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Servere de timp"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Adresa serverului de timp principal:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Adresa serverului de timp secundar:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2508,17 +2488,17 @@ msgid "Web wizard"
 msgstr "Asistent Web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Acest asistent vă va ajuta la configurarea serverului Web pentru reţeaua "
 "dumneavoastră."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Asistent de configurare server Web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Dacă nu vreţi să activaţi serverul Web, nu bifaţi nici o căsuţă."
 
 #: ../web_wizard/Apache.pm:77
@@ -2526,23 +2506,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Selectaţi ce fel de servicii Web doriţi să activaţi:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Server Web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Serverul dvs. poate acţiona ca un server Web către reţeaua dvs. internă "
 "(intranet) şi ca un server Web pentru Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Activează serverul Web pentru Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Activează serverul Web pentru Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2585,18 +2565,18 @@ msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Introduceţi calea spre directorul care vreţi să fie document rădăcină. "
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Document rădăcină:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Rădăcină document:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Configurez serverul Web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Asistentul a colectat următorii parametri necesari pentru configurarea "
 "serverului Web."
@@ -2609,16 +2589,12 @@ msgstr "Server Web în Intranet:"
 msgid "Internet web server:"
 msgstr "Server Web în Internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Rădăcină document:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Director utilizator:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Asistentul a configurat cu succes serverul dvs. Web pentru Intranet/Internet."
 
@@ -2632,6 +2608,38 @@ msgstr "Server web Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Configurez serverul DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr ""
+#~ "Asistentul a configurat cu succes serviciile DHCP al serverului dvs."
+
+#~ msgid "FTP Server"
+#~ msgstr "Server FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Server de Ştiri"
+
+#~ msgid "NFS Server"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Server de ştiri"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Pentru a accepta aceste valori şi a configura serverul, faceţi clic pe "
+#~ "Următorul sau folosiţi butonul Înapoi pentru corecţii"
+
+#~ msgid "Document Root:"
+#~ msgstr "Document rădăcină:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Configurez poşta de Internet"
 
diff --git a/po/ru.po b/po/ru.po
index 25fef84c..2a98a2ca 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-26 00:24+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -41,7 +41,7 @@ msgstr "Ошибка."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -190,10 +190,11 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Этот мастер поможет вам настроить службы DHCP вашего сервера."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Если вы хотите включить PXE для своего dhcp-сервера, пожалуйста, поставьте "
-"галочку."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -210,15 +211,15 @@ msgstr ""
 "предложенные значения (напр., 192.168.100.20 192.168.100.40)."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Нижний IP-адрес:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Верхний IP-адрес:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP-адрес шлюза:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -242,7 +243,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP-адрес сервера должен быть вне диапазона."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Настраивается сервер DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -278,7 +279,8 @@ msgid "Interface:"
 msgstr "Интерфейс:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Мастер успешно настроил службы DHCP вашего сервера."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -568,11 +570,11 @@ msgstr "Сервер DHCP"
 msgid "DNS server"
 msgstr "Сервер DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Сервер новостей"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Сервер NFS"
 
@@ -580,7 +582,7 @@ msgstr "Сервер NFS"
 msgid "Mail server"
 msgstr "Почтовый сервер"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Сервер FTP"
 
@@ -638,41 +640,37 @@ msgid "FTP wizard"
 msgstr "Мастер FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Мастер настройки сервера FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Этот мастер поможет вам настроить сервер FTP для вашей сети."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Сервер FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Выберите тип службы FTP, который вы хотите включить:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Ваш сервер может работать как сервер FTP в вашей внутренней сети (интранет) "
 "и как сервер FTP для Интернет."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Включить сервер FTP для Интранет"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Включить сервер FTP для Интернета"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Email админа: адрес email администратора FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -688,7 +686,7 @@ msgstr "Разрешить FXP: разрешает передачу файлов
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Chroot домашнего каталога пользователя: пользователи будут видеть только "
 "свои домашние каталоги."
@@ -706,11 +704,11 @@ msgid "Admin email:"
 msgstr "Email админа:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Разрешить вход root'a:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot домашнего каталога пользователя:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -737,8 +735,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:115
 #, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "Невозможно найти bash в списке оболочек. Исправьте, пожалуйста."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -746,14 +744,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Извините, для этого вы должны иметь права root'a..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Настраивается сервер FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Мастер собрал следующие параметры,\n"
 "необходимые для настройки вашего сервера FTP"
@@ -768,11 +766,11 @@ msgstr ""
 "или используйте кнопку Назад, чтобы их исправить"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Интранет сервер FTP"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Интернет-сервер FTP:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -796,7 +794,7 @@ msgid "Allow FXP"
 msgstr "Разрешить FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Мастер успешно настроил ваш Интернет/Интранет сервер FTP"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -852,12 +850,12 @@ msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 "Каталог назначения уже используется, пожалуйста, выберите другой каталог."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Ваш сервер установки будет настроен с этими параметрами"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1075,7 +1073,7 @@ msgstr "Добро пожаловать в мастер новостей"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Имена хостов Интернета должны быть в форме \"хост.домен.тип_домена\"; "
@@ -1083,10 +1081,6 @@ msgstr ""
 "обычно выступает \"news.провайдер.com\""
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Сервер новостей"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1095,24 +1089,24 @@ msgstr ""
 "вашей сети; имя обычно предоставляется вашим провайдером."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Имя сервера новостей"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "В зависимости от типа имеющегося у вас подключения к Интернету, период "
 "опроса соответственно может изменяться от 6 до 24 часов."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Период опроса:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1121,7 +1115,7 @@ msgstr ""
 "двумя последовательными опросами."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Период опроса (в часах):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1138,31 +1132,30 @@ msgstr "Настраиваются новости Интернета"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Мастер собрал следующие параметры,\n"
 "необходимые для настройки вашей службы новостей Интернета:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Чтобы принять эти значения и настроить свой сервер, нажмите на кнопку Далее "
 "или используйте кнопку Назад, чтобы их исправить."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Сервер новостей:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Интервал опроса:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Мастер успешно настроил службу новостей Интернета вашего сервера."
@@ -1172,7 +1165,6 @@ msgid "NFS Wizard"
 msgstr "Мастер NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Все - без ограничения доступа"
 
@@ -1185,25 +1177,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Мастер настройки сервера NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Этот мастер поможет вам настроить сервер NFS для вашей сети."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Сервер NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Каталог:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Уровень доступа"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Управление доступом"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Выберите удовлетворяющий вашим требованиям уровень. Если вы не знаете, "
@@ -1252,7 +1241,7 @@ msgid "Netmask :"
 msgstr "Маска сети :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Мастер успешно настроил ваш сервер NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1265,18 +1254,15 @@ msgstr ""
 "изменить имя домена, не равное localdomain или пустому значению. Запустите "
 "drakconnect для его изменения."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "Сервер NIS c картой autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Клиент NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Сервер NIS c картой autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
@@ -1286,7 +1272,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Клиенты могут автоматически монтировать свои домашние каталоги при входе в "
@@ -1305,18 +1291,19 @@ msgstr "Настроить компьютер в качестве клиента
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Вам просто нужно ввести nisdomain и nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Сервер NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Домен NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1338,11 +1325,6 @@ msgstr "Домен NIS: домен NIS для вашего сервера NIS."
 msgid "NIS server: name of your computer."
 msgstr "Сервер NIS: имя вашего компьютера."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Сервер NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Домашний каталог NIS:"
@@ -1362,23 +1344,6 @@ msgstr "Установит ваш сервер NIS с картой autofs"
 msgid "NIS directory:"
 msgstr "Каталог NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Network Файл:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-#, fuzzy
-msgid "NFS exports:"
-msgstr "Nfs exports:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto мастер:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto home:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1392,7 +1357,7 @@ msgstr "Север NIS: имя хоста NIS."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1427,12 +1392,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Настройка вашей системы как сервера NIS с картой Autofs..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS с картой autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Настройка вашей системы как клиента Nis..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1525,7 +1490,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Имена хостов Интернета должны быть в форме \"хост.домен.тип_домена\"; "
@@ -1581,15 +1546,6 @@ msgstr ""
 "Мастер собрал следующие параметры, необходимые для настройки вашей почтовой "
 "службы Интернета:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Чтобы принять эти значения и настроить свой сервер, нажмите на кнопку Далее "
-"или используйте кнопку Назад, чтобы их исправить."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1727,6 +1683,20 @@ msgid "Disk space (MB):"
 msgstr "Дисковое пространство (МБ):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Уровень доступа"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Выберите удовлетворяющий вашим требованиям уровень. Если вы не знаете, "
+"наиболее подходящим будет уровень Локальной сети. Будьте осторожны, уровень "
+"Все может быть небезопасным."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Прокси может быть настроен на использование различных уровней управления "
@@ -1794,6 +1764,15 @@ msgid ""
 msgstr ""
 "Мастер собрал следующие параметры, необходимые для настройки вашего прокси:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Чтобы принять эти значения и настроить свой сервер, нажмите на кнопку Далее "
+"или используйте кнопку Назад, чтобы их исправить."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Порт:"
@@ -2190,15 +2169,16 @@ msgstr "Мастер Samba"
 msgid "%s does not exist."
 msgstr "%s не существует."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Все - без ограничения доступа"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Мои правила - Спрашивать меня о разрешенных и запрещенных хостах"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Мастер настройки Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2208,6 +2188,10 @@ msgstr ""
 "Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Мастер настройки Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Этот мастер поможет вам настроить службы Samba вашего сервера."
@@ -2230,7 +2214,7 @@ msgid "The Workgroup is wrong"
 msgstr "Неверная рабочая группа"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Баннер сервера."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2245,20 +2229,16 @@ msgid "Banner:"
 msgstr "Баннер:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Неверный баннер сервера"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Управление доступом"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Уровень доступа :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Пример 1: разрешить все IP-адреса из 150.203.*.*; за исключением одного\n"
@@ -2307,7 +2287,7 @@ msgid "Deny hosts:"
 msgstr "Запрещенные хосты:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Включенные службы Samba"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2325,7 +2305,7 @@ msgid "Enable file sharing area"
 msgstr "Включить область общего доступа к файлам"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Включить сервер совместного использования печати"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2364,7 +2344,7 @@ msgstr ""
 "root, fred, @users, @wheel для каждого типа прав доступа."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "список чтения:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2372,7 +2352,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "список записи:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2397,15 +2377,15 @@ msgstr ""
 "для настройки Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Баннер сервера:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Общий доступ к файлам:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Сервер печати:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2466,15 +2446,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Выберите из списка первичный и вторичный сервер."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Серверы времени"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Первичный сервер времени:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Вторичный сервер времени:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2547,15 +2527,15 @@ msgid "Web wizard"
 msgstr "Мастер Web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Этот мастер поможет вам настроить веб-сервер для вашей сети."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Мастер настройки веб-сервера"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Не ставьте ни одной галочки, если вы не хотите активировать ваш веб-сервер"
 
@@ -2564,23 +2544,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Выберите тип веб-службы, который вы хотите включить:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web сервер"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Ваш сервер может работать как веб-сервер в вашей внутренней сети (интранет) "
 "и как веб-сервер для Интернета."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Включить веб-сервер для Интранет"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Включить веб-сервер для Интернет"
 
 #: ../web_wizard/Apache.pm:90
@@ -2625,18 +2605,18 @@ msgstr ""
 "Введите путь к каталогу, который вы хотите использовать в качестве корневого "
 "для документов."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Корень документов:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Настраивается веб-сервер"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Мастер собрал следующие параметры, необходимые для настройки вашего веб-"
 "сервера:"
@@ -2649,16 +2629,12 @@ msgstr "Веб-сервер Интранет:"
 msgid "Internet web server:"
 msgstr "Веб-сервер интернета:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Корень документов:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Каталог пользователя:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Мастер успешно настроил ваш Интранет/Интернет веб-сервер."
 
 #: ../web_wizard/Apache.pm:236
@@ -2669,6 +2645,53 @@ msgstr "Сервер Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Настройка вашей системы как сервера Apache..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Если вы хотите включить PXE для своего dhcp-сервера, пожалуйста, "
+#~ "поставьте галочку."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Мастер успешно настроил службы DHCP вашего сервера."
+
+#~ msgid "FTP Server"
+#~ msgstr "Сервер FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Сервер новостей"
+
+#~ msgid "NFS Server"
+#~ msgstr "Сервер NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Сервер NIS c картой autofs"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Сервер NIS:"
+
+#~ msgid "Network File:"
+#~ msgstr "Network Файл:"
+
+#, fuzzy
+#~ msgid "NFS exports:"
+#~ msgstr "Nfs exports:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto мастер:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto home:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Чтобы принять эти значения и настроить свой сервер, нажмите на кнопку "
+#~ "Далее или используйте кнопку Назад, чтобы их исправить."
+
+#~ msgid "Document Root:"
+#~ msgstr "Корень документов:"
+
 #~ msgid "Congratulations, Mandrake Install server is now ready."
 #~ msgstr "Поздравляем! Сервер установки Mandrake теперь готов."
 
diff --git a/po/sk.po b/po/sk.po
index 4b136d7d..ebe5c17e 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-23 02:34+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandrake.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -36,7 +36,7 @@ msgstr "Chyba."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -184,8 +184,11 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "Ak si želáte povoliť PXE pre váš DHCP server zašktnite toto políčko."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -202,15 +205,15 @@ msgstr ""
 "akceptovať navrhnuté hodnoty (t.j. 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Najnižšia IP adresa:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Najvyššia IP adresa:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP adresa brány:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -234,7 +237,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP adresa servera nesmie byť v rozsahu."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Konfigurácia DHCP servera"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -270,7 +273,8 @@ msgid "Interface:"
 msgstr "Rozhranie:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Sprievodca úspešne nakonfiguroval DHCP službu na vašom serveri."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -554,11 +558,11 @@ msgstr "DHCP server"
 msgid "DNS server"
 msgstr "DNS server"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "News správ"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS server"
 
@@ -566,7 +570,7 @@ msgstr "NFS server"
 msgid "Mail server"
 msgstr "Poštový systém"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP server"
 
@@ -624,39 +628,35 @@ msgid "FTP wizard"
 msgstr "Sprievodca konfiguráciou FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Sprievodca konfiguráciou FTP servera"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Tento sprievodca vám pomôže nastaviť FTP server pre vašu sieť."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP server"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Povoliť FTP server pre Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Povoliť FTP server pre Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Admin Email: email adresa správcu FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -670,7 +670,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "Povoliť FXP: povoliť prenos súborov cez iné FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Chroot domovského adresára: používatelia môžu vidiet iba svoje domovské "
 "adresáre."
@@ -688,11 +688,11 @@ msgid "Admin email:"
 msgstr "Email administrátora:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Povoliť prihlásenie pre root-a:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot domovského adresára:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -717,8 +717,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 "Nie je možné nájsť bash v zozname shellov! Zdá sa, že ste ho ručne "
 "nastavovali! Opravte to prosím."
@@ -728,13 +728,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Prepáčte, pre vykonanie tohto musíte byť root..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Konfigurácia FTP servera"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Sprievodca zozbieral nasledovné parametre potrebné pre konfiguráciu vášho "
 "FTP servera"
@@ -748,11 +748,11 @@ msgstr ""
 "tlačidlo Ďalej alebo použite tlačítko Späť pre ich úpravu"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -776,7 +776,7 @@ msgid "Allow FXP"
 msgstr "Povoliť FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Sprievodca úspešne nakonfiguroval váš Intranet/Internet FTP server"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -828,11 +828,11 @@ msgstr ""
 "inštalačný adresár."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Cieľový adresár je momentálne používaný, zvoľte si prosím iný."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Váš inštalačný server bol nakonfigurovaný s nasledovnými parametrami"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1048,7 +1048,7 @@ msgstr "Vitajte v sprievodcovi News služby"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Názvy počítačov musia byť vo formáte \"pocitac.domena.typdomeny\"; "
@@ -1056,10 +1056,6 @@ msgstr ""
 "pravdepodobne \"news.provider.sk\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Server správ"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1068,24 +1064,24 @@ msgstr ""
 "meno vám spravidla poskytne váš Internet provider."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Meno News servera:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "V závislosti na tom, aký typ pripojenia do Internetu máte, primeraný "
 "interval aktualizácie by mal byť medzi 6 až 24 hodinami."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Interval aktualizácie"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1093,7 +1089,7 @@ msgstr ""
 "nastavuje rozmedzie medzi dvomi po sebe nasledujúcimi dotazmi."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Interval aktualizácie (v hodinách):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1110,31 +1106,30 @@ msgstr "Konfigurácia internetových správ"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Sprievodca získal nasledovné parametre\n"
 "potrebné pre konfiguráciu vašej News služby:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
+"tlačidlo Ďalej alebo použite tlačítko Späť pre ich úpravu"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Server správ:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Interval aktualizácie:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Sprievodca úspešne nakonfiguroval váš News systém na vašom serveri."
@@ -1144,7 +1139,6 @@ msgid "NFS Wizard"
 msgstr "Sprievodca konfiguráciou NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Všetci - žiadne prístupové reštrikcie"
 
@@ -1157,25 +1151,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Sprievodca konfiguráciou NFS servera"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Tento sprievodca vám pomôže nakonfigurovať NFS server pre vašu sieť."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS server"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Adresár:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Kontrola prístupu"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Vyberte si úroveň, ktorá zodpovedá vašim potrebám. Ak neviete, je pre vás "
@@ -1224,7 +1215,7 @@ msgid "Netmask :"
 msgstr "Sieťová maska:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Sprievodca úspešne nakonfiguroval váš NFS server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1235,18 +1226,15 @@ msgstr ""
 "Je potrebné zmeniť doménové meno. NIS server vyžaduje korektné NIS doménové "
 "meno, nie localdomain alebo žiadne."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "NIS server s autofs mapovaním"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "NIS server s autofs mapovaním"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
@@ -1254,7 +1242,7 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Klient dokáže automaticky pripojiť tento domovský adresár zo servera ak je "
@@ -1272,18 +1260,19 @@ msgstr "Konfigurovať počítač ako NIS klienta"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Mali by ste zadať nis doménu a nis server"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS server:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS doména:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 "NIS server je užitočný pri vytváraní používateľov alebo databázi hostiteľov. "
@@ -1307,11 +1296,6 @@ msgstr "NIS doména: NIS doména (obyčajne rovnaká ako vaša DNS doména)."
 msgid "NIS server: name of your computer."
 msgstr "NIS server: meno vášho počítača."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS server:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Domovský NIS:"
@@ -1329,22 +1313,6 @@ msgstr "Sprievodca teraz nastaví váš NIS server s autofs mapovaním"
 msgid "NIS directory:"
 msgstr "NIS doména:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Sieťový súbor:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "NFS exporty:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Autofs master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Autofs domov:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS doménové meno: meno NIS domény."
@@ -1356,7 +1324,7 @@ msgstr "NIS server: doménové meno NIS servera."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 "YPBIND démon vyhľadáva servre pre NIS domény a spravuje informácie o "
 "pripojení pre NIS."
@@ -1391,11 +1359,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Konfigurácia vášho systému ako NIS server s Autofs mapovaním..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS s autofs mapou"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Nastaviť váš systém ako NIS klienta ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1489,7 +1457,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internetové názvy počítačov musia byť vo formáte \"pocitac.domena.typdomeny"
@@ -1544,15 +1512,6 @@ msgstr ""
 "Sprievodca zozbieral nasledovné parametre potrebné pre konfiguráciu "
 "poštového systému:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1689,6 +1648,20 @@ msgid "Disk space (MB):"
 msgstr "Diskový priestor (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Kontrola prístupu"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Vyberte si úroveň, ktorá zodpovedá vašim potrebám. Ak neviete, je pre vás "
+"úroveň Lokálna sieť najvhodnejšia. Uvedomte si, že úroveň Všetci nie je "
+"príliš  bezpečná."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Proxy môže byť nastavená tak, aby používala rôzne úrovne prístupu"
 
@@ -1756,6 +1729,15 @@ msgstr ""
 "Sprievodca zhromaždil nasledovné parametre potrebné pre nakonfigurovanie "
 "vašej proxy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2138,15 +2120,16 @@ msgstr "Sprievodca konfiguráciou samby"
 msgid "%s does not exist."
 msgstr "%s neexistuje"
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Všetci - žiadne prístupové reštrikcie"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moje pravidlá - povolený a zakázany hostitelia"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Sprievodca konfiguráciou samby"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2155,6 +2138,10 @@ msgstr ""
 "servera pre neLinuxové pracovné stanice."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Sprievodca konfiguráciou samby"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2178,7 +2165,7 @@ msgid "The Workgroup is wrong"
 msgstr "Zlá skupina"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Banner servera."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2193,20 +2180,16 @@ msgid "Banner:"
 msgstr "Banner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Banner servera nie je správne"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Kontrola prístupu"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Prístupova úroveň :"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Príklad 1: povoliť všetky IP z 150.203.*.*; okrem jednej\\nhosts allow = "
@@ -2250,7 +2233,7 @@ msgid "Deny hosts:"
 msgstr "Zakázaní hostitelia:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Povoliť samba služby"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2267,7 +2250,7 @@ msgid "Enable file sharing area"
 msgstr "Povoliť priestor pre zdieľanie súborov"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Povoliť server pre zdieľanie tlačiarne"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2305,7 +2288,7 @@ msgstr ""
 "'@'), napríklad:\\nroot, fred, @users, @wheel pre každý typ práv."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "zoznam pre čítanie:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2313,7 +2296,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "zoznam pre zápis:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2335,15 +2318,15 @@ msgstr ""
 "konfiguráciu."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Banner servera:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Zdieľanie súborov:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Tlačový server:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2403,15 +2386,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Vyberte si primárny a sekundárny server zo zoznamu:"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Časové servre"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primárny časový server:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekundárny časový server:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2484,15 +2467,15 @@ msgid "Web wizard"
 msgstr "Sprievodca nastavenia webu"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Tento sprievodca vám pomôže nastaviť Web Server pre vašu sieť."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Sprievodca konfiguráciou web servera"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Nezaškrtnite žiadne políčko ak nechcete aktivovať váš web server."
 
 #: ../web_wizard/Apache.pm:77
@@ -2500,23 +2483,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Vyberte si druh Web služby, ktorú chcete aktivovať:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web Server"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Váš server môže plniť funkciu Web servera pre vašu internú sieť (intranet) "
 "alebo byť Web serverom pre Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Povoliť web server pre Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Povoliť web server pre Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2558,18 +2541,18 @@ msgid "Type the path of the directory you want being the document root."
 msgstr ""
 "Zadajte cestu k adresáru kde si želáte mať hlavný adresár s dokumentami."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Hlavný adresár s dokumentami:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Koreňový priečinok dokumentov:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Konfigurácia web servera"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Sprievodca zozbieral nasledovné parametre potrebné pre nakonfigurovanie "
 "vášho web servera."
@@ -2582,16 +2565,12 @@ msgstr "Intranet web server:"
 msgid "Internet web server:"
 msgstr "Internetový web server:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Koreňový priečinok dokumentov:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Použivateľov priečinok:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Sprievodca úspešne nakonfiguroval váš Internet/Intranet Web server"
 
 #: ../web_wizard/Apache.pm:236
@@ -2602,6 +2581,51 @@ msgstr "Apache server"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavovanie vášho systému ako Apache server ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Ak si želáte povoliť PXE pre váš DHCP server zašktnite toto políčko."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Sprievodca úspešne nakonfiguroval DHCP službu na vašom serveri."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP server"
+
+#~ msgid "News Server"
+#~ msgstr "Server správ"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS server"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "NIS server s autofs mapovaním"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS server:"
+
+#~ msgid "Network File:"
+#~ msgstr "Sieťový súbor:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "NFS exporty:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Autofs master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Autofs domov:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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"
+
+#~ msgid "Document Root:"
+#~ msgstr "Hlavný adresár s dokumentami:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Konfigurácia emailu"
 
diff --git a/po/sl.po b/po/sl.po
index 89ecf8ea..6f06886e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-05 12:23+0100\n"
 "Last-Translator: Daniel Žalar <danizmax@email.si>\n"
 "Language-Team: Slovenian <prevajanje@mandrakeprinas.org>\n"
@@ -42,7 +42,7 @@ msgstr "Napaka."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -191,7 +191,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Čarovnik vam bo pomagal nastaviti DHCP servise vašega strežnika."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -209,16 +212,16 @@ msgstr ""
 "če imate posebne potrebe, lahko sprejmete predlagane vrednosti."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Najnižji IP naslov:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Najvišji IP naslov:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP naslov protokolnega konverterja (gateway):"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -245,7 +248,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP naslov strežnika ne sme biti v območju"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Nastavljam strežnik DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -279,7 +282,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Čarovnik je uspešno nastavil servise DHCP vašega strežnika."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -556,12 +560,12 @@ msgstr "DHCP strežnik"
 msgid "DNS server"
 msgstr "DNS strežnik"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "Novičarski strežnik"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS strežnik"
 
@@ -569,7 +573,7 @@ msgstr "NFS strežnik"
 msgid "Mail server"
 msgstr "Poštni strežnik"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP strežnik"
 
@@ -631,40 +635,36 @@ msgid "FTP wizard"
 msgstr "Čarovnik za FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Čarovnik za nastavitev strežnika FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Čarovnik vam bo pomagal nastaviti strežnik FTP za vaše omrežje."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Strežnik FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Označite katere servise FTP bi radi aktivirali:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Strežnik lahko deluje v smeri vašega notranjega omrežja (intranet) in za "
 "internet kot strežnik FTP."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "omogoči strežnik FTP za intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Omogoči strežnik FTP za internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -676,7 +676,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -692,11 +692,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -722,8 +722,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -731,14 +731,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Oprostite, ampak morate biti root da lahko to naredite..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Nastavljam strežnik FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "Čarovnik je zbral podatke, potrebne za nastavitev vašega strežnika FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -751,11 +751,11 @@ msgstr ""
 "popravek nastavitev."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Strežnik FTP za intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internetni strežnik FTP:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -779,7 +779,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Čarovnik je uspešno nastavil intranetni/internetni strežnik FTP"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -832,11 +832,11 @@ msgstr ""
 "instalacije."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1054,7 +1054,7 @@ msgstr "Dobrodošli v čarovniku za novičarski strežnik"
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internetna gostiteljska imena morajo biti v obliki \\qgostitelj.domena."
@@ -1062,10 +1062,6 @@ msgstr ""
 "strežnik navadno \\qnews.ponudnik.com\\q."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Novičarski strežnik"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1074,24 +1070,24 @@ msgstr ""
 "navadno dobite pri vašem ponudniku."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Ime novičarskega strežnika:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Glede na vrsto internetne povezave, se lahko povpraševalna perioda spremeni "
 "med 6 24 ur."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Povpraševalna (polling) perioda"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1100,7 +1096,7 @@ msgstr ""
 "zaporednima povpraševanjima."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Povpraševalna perioda (ure):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1118,31 +1114,30 @@ msgstr "Nastavljam internetne novice"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Čarovnik je zbral podatke, potrebne za nastavitev vaših internetnih "
 "novičarskih servisov:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Za potrditev in nastavitev vašega strežnika, kliknite Naprej ali Nazaj za "
 "popravek nastavitev."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Novičarski strežnik:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Povpraševalni (polling) interval:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Čarovnik je uspešno nastavil internetne novičarske servise."
@@ -1152,7 +1147,6 @@ msgid "NFS Wizard"
 msgstr "NFS čarovnik"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Vse - Ni omejitev"
 
@@ -1165,26 +1159,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Nastavitveni čarovnik za strežnik NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Čarovnik vam bo pomagal nastaviti strežnik NFS za vaše lokalno omrežje."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS strežnik"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Imenik:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Nadzor dostopa"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Izberite stopnjo, ki vam najbolj odgovarja. Navadno, je stopnja lokalnega "
@@ -1232,7 +1223,7 @@ msgid "Netmask :"
 msgstr "Maska:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Čarovnik je uspešno nastavil vaš NFS Strežnik"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1241,26 +1232,23 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Čarovnik za odjemalca DNS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1276,19 +1264,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Strežnik NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1306,12 +1295,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Strežnik NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1333,23 +1316,6 @@ msgstr "Čarovnik je uspešno nastavil strežnik samba"
 msgid "NIS directory:"
 msgstr "Nis imenik:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Omrežna naprava"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1362,7 +1328,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1395,12 +1361,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Nastavljam strežnik DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1490,7 +1456,7 @@ msgstr ""
 #, fuzzy
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internetna gostiteljska imena morajo biti v obliki \\qgostitelj.domena."
@@ -1543,15 +1509,6 @@ msgstr ""
 "Čarovnik je zbral podatke, potrebne za nastavitev vašega internetnega "
 "poštnega protokolnega konverterja (gateway):"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Za potrditev in nastavitev vašega strežnika, kliknite Naprej ali Nazaj za "
-"popravek nastavitev."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1685,6 +1642,19 @@ msgid "Disk space (MB):"
 msgstr "Prostor na disku (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Nadzor dostopa"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Izberite stopnjo, ki vam najbolj odgovarja. Navadno, je stopnja lokalnega "
+"omrežja predlagana najpogosteje. Opozorilo: Stopnja vse ni zaščitena."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1757,6 +1727,15 @@ msgid ""
 msgstr ""
 "Čarovnik je zbral podatke, potrebne za nastavitev vašega strežnika proxy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Za potrditev in nastavitev vašega strežnika, kliknite Naprej ali Nazaj za "
+"popravek nastavitev."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Vrata:"
@@ -2122,15 +2101,16 @@ msgstr "Samba strežnik"
 msgid "%s does not exist."
 msgstr "%s ne obstaja."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Vse - Ni omejitev"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moja pravila - Vprašaj me po dovoljenih in nedovoljenih gostiteljih"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba Nastavitveni Čarovnik"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2140,6 +2120,10 @@ msgstr ""
 "sistemi."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba Nastavitveni Čarovnik"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Čarovnik vam bo pomagal nastaviti servise za strežnik samba."
@@ -2161,7 +2145,7 @@ msgid "The Workgroup is wrong"
 msgstr "Omrežna skupina je napačna"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Opis strežnika samba."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2177,13 +2161,9 @@ msgid "Banner:"
 msgstr "Opis:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Opis strežnika samba je nepravilen"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Nadzor dostopa"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Stopnja dostopa:"
@@ -2191,7 +2171,7 @@ msgstr "Stopnja dostopa:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Primer 1: dovoli vse IP naslove v 150.203.*.*; razen enega\\nhosts allow = "
@@ -2239,7 +2219,7 @@ msgid "Deny hosts:"
 msgstr "Zavrni gostiteljska imena:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Omogočeni servisi sambe"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2257,7 +2237,7 @@ msgstr "Omogoči območje skupne rabe"
 
 #: ../samba_wizard/Samba.pm:141
 #, fuzzy
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Omogoči območje skupne rabe"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2296,7 +2276,7 @@ msgstr ""
 "\\') naprimer: \\nroot, peter, @uporabniki, @ za vsako dovoljenje."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "Seznam uporabnikov z dovoljenjem za branje:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2304,7 +2284,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "Seznam uporabnikov z dovoljenjem za pisanje:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2326,16 +2306,16 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Čarovnik je zbral podatke, potrebne za nastavitev sambe"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Opis strežnika samba:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Datotečna souporaba:"
 
 #: ../samba_wizard/Samba.pm:219
 #, fuzzy
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Strežnik FTP"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2395,15 +2375,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Označite prvi in drugi strežnik."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Časovni strežniki"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Prvi časovni strežnik:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Drugi časovni strežnik:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2478,15 +2458,15 @@ msgid "Web wizard"
 msgstr "Web čarovnik"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Čarovnik vam bo pomagal nastaviti spletni strežnik za vaše omrežje."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Čarovnik za nastavitev spletnega strežnika"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Ne preverjaj za odjemalci, če nočete aktivirati vašega spletnega strežnika."
 
@@ -2495,24 +2475,24 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Označite vrsto spletnega servisa , ki ga hočete aktivirati:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web strežnik"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Vaš strežnik lahko deluje kot internetni (spletni) strežnik v smeri vašega "
 "notranjega omrežja (intranet) in kot internetni (spletni) strežnik za "
 "internet"
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Omogoči spletni strežnik za notranje omrežje (intranet)"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Omogoči spletni strežnik za internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2555,18 +2535,18 @@ msgstr "uporabniški http pod-imenik: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Vpišite pot imenika, ki ga hočete uporabiti za korenski imenik."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Korenski imenik:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Nastavljam spletni strežnik"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Čarovnik je zbral podatke, potrebne za nastavitev vašega spletnega strežnika"
 
@@ -2578,16 +2558,12 @@ msgstr "Spletni strežnik za notranje omrežje (intranet):"
 msgid "Internet web server:"
 msgstr "Internetni spletni strežnik:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Korenski imenik:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Uporabnikov imenik:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Čarovnik je uspešno nastavil internetni/intranetni spletni strežnik"
 
 #: ../web_wizard/Apache.pm:236
@@ -2600,6 +2576,37 @@ msgstr "Spletni strežnik za notranje omrežje (intranet):"
 msgid "Configuring your system as Apache server ..."
 msgstr "Nastavljam strežnik DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Čarovnik je uspešno nastavil servise DHCP vašega strežnika."
+
+#~ msgid "FTP Server"
+#~ msgstr "Strežnik FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Novičarski strežnik"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS strežnik"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Strežnik NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Omrežna naprava"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Za potrditev in nastavitev vašega strežnika, kliknite Naprej ali Nazaj za "
+#~ "popravek nastavitev."
+
+#~ msgid "Document Root:"
+#~ msgstr "Korenski imenik:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Nastavljam elektronsko pošto"
 
diff --git a/po/sq.po b/po/sq.po
index 01ad4a51..d1aff111 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -42,7 +42,7 @@ msgstr "Gabim."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -203,7 +203,10 @@ msgstr ""
 "serverit tuaj."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -221,16 +224,16 @@ msgstr ""
 "DHCP; vet�m n� rastet specifike, ju mund ti pranoni vlerat e propozuara."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Adres� m� e ult� IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Adres� m� e lart� IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Adresa IP Kalimtare (Gateway):"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -259,7 +262,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Konfigurimi i Serverit DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -295,7 +298,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 "Asistenti i ka konfiguruar me sukses sh�rbimet e DHCP n� serverin tuaj."
 
@@ -582,13 +586,12 @@ msgstr "Server NFS"
 msgid "DNS server"
 msgstr "Server NFS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "Server i Lajmeve"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Server NFS"
 
@@ -597,8 +600,7 @@ msgstr "Server NFS"
 msgid "Mail server"
 msgstr "Emri i Serverit Mail:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Server FTP"
 
@@ -664,42 +666,38 @@ msgid "FTP wizard"
 msgstr "Asistenti FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Asistent Konfugurues p�r FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "Server FTP"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Aktivizim i Serverit FTP p�r Rrjet Lokal (Intranet)"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Aktivizim i Serverit FTP p�r Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -711,7 +709,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -727,11 +725,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -758,8 +756,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -767,14 +765,14 @@ 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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Konfigurimi i Serverit FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Asistenti i ka p�rmbledhur paramatrat vijues q� i nevojiten n� konfigurmin e "
 "serverit tuaj FTP"
@@ -789,11 +787,11 @@ msgstr ""
 "kops�n Tjetri ose p�rdoreni kops�n Mbrapa p�r ti korigjuar ato."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Server FTP p�r Rrjet Lokal (Intranet):"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Server FTP p�r Internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -817,7 +815,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Aistenti e ka konfiguruar me sukses Serverin FTP Intranet/Internet"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -865,11 +863,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1094,7 +1092,7 @@ msgstr "Mir�sevini n� Asistentin e Lajmeve (News)"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Emrat e Ftuesve t� Internetit duhen t� jen� n� form�n \"host.domain."
@@ -1102,10 +1100,6 @@ msgstr ""
 "serveri i forumeve �sht� ky \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Server i Lajmeve"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1114,24 +1108,24 @@ msgstr ""
 "rrjetin tuaj; ky em�r zakonisht �sht� i dh�n� nga furnizuesi i juaj hyr�s."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Emri i Serverit t� Lajmeve:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Nga mvar�sia e lidhjes suaj n� internet, nj� frekuenc� e p�rcaktuar "
 "v�shtruese do t� ndryshoj nga 6 deri 24 or�."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Frekuenca Periodike"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1140,7 +1134,7 @@ msgstr ""
 "mes dy v�shtrimeve t� radhitura."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Perioda V�shtruese (Or�):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1158,31 +1152,30 @@ msgstr "Konfigurimi i Serverit t� Lajmeve"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 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 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Server i Lajmeve:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Frekuenca Intervale:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1194,7 +1187,6 @@ msgid "NFS Wizard"
 msgstr "Asistenti NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Gjith� - Asnj� hyrje e kyfizuar"
 
@@ -1207,26 +1199,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Asistent Konfigurmi p�r Server NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Ky asistent do t� ju ndihmoj� n� konfigurmin e Serverit NFS n� rrjetin tuaj."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Server NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Repertori:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Kontrol� e Hyrjeve"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Kontrolues i Hyrjeve"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Zgjedheni nivelin p�r nevojat tuaja. N� rast se jeni i dyshimt, niveli i "
@@ -1276,7 +1265,7 @@ msgid "Netmask :"
 msgstr "Mask� e Rrjetit :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1285,28 +1274,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Server i Lajmeve"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Klient IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Server i Lajmeve"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1322,19 +1307,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "Server NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1352,12 +1338,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "Server NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1379,23 +1359,6 @@ msgstr "Asistenti e ka konfiguruar me sukses serverin tuaj Samba."
 msgid "NIS directory:"
 msgstr "Repertori i p�rdoruesit:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Mjeti i Rrjetit"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1408,7 +1371,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1443,12 +1406,12 @@ msgstr "Konfigurimi i Serverit DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Server i Lajmeve"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurimi i Serverit DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1538,7 +1501,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Emrat ftues t� internetit duhet t� ken� nj� form� sikur \"host.domain."
@@ -1591,15 +1554,6 @@ 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:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1740,6 +1694,20 @@ msgid "Disk space (MB):"
 msgstr "Hap�sira e Diskut (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Kontrol� e Hyrjeve"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Zgjedheni nivelin p�r nevojat tuaja. N� rast se jeni i dyshimt, niveli i "
+"Rrjetit Lokal �sht� n� shumic�n e rasteve nj� zgjedhje m� e p�rshtatshme. "
+"Kujdes �sht� e mundur q� T� Gjith� mund t� jet� nj� problem i siguris�."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1810,6 +1778,15 @@ msgstr ""
 "Asistenti i ka p�mbledhur parametrat vijues q� nevojiten p�r konfigurmin e "
 "proxy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Porta:"
@@ -2175,15 +2152,16 @@ msgstr "Asistenti Samba"
 msgid "%s does not exist."
 msgstr "%s nuk ekziston."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Gjith� - Asnj� hyrje e kyfizuar"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Rregullat e mija - M� pyet p�r mund�sit dhe ftuesit e pa autorizuar"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Asistent Konfigurues Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2192,6 +2170,10 @@ msgstr ""
 "sikur stampues i posteve t� klientav q� nuk e p�rdorin Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Asistent Konfigurues Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2215,7 +2197,7 @@ msgid "The Workgroup is wrong"
 msgstr "Grupi Punues �sht� i pa sakt�"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Banderola Server."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2231,13 +2213,9 @@ msgid "Banner:"
 msgstr "Banderol�:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Serveri Banderol� nuk �sht� i sakt"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Kontrolues i Hyrjeve"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Nivel i Hyrjeve :"
@@ -2245,7 +2223,7 @@ msgstr "Nivel i Hyrjeve :"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Shembull 1: autorizon t� gjitha adresat IP n�, 150.203.*.*;  mir�po vet�m "
@@ -2295,7 +2273,7 @@ msgid "Deny hosts:"
 msgstr "Ftues t� pa autorizuar:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "S�rbimet Samba t� Aktivizuara"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2313,7 +2291,7 @@ msgid "Enable file sharing area"
 msgstr "Aktivizoje hap�sir�n publike shk�mbuese"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Aktivizimi i Shp�rndarjes s� Stampuesve"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2353,7 +2331,7 @@ msgstr ""
 "@wheel."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "drejt� leximi:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2361,7 +2339,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "drejt� shkrimi:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2384,15 +2362,15 @@ msgstr ""
 "Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Banderol� e Serverit:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Shp�rndarja e Skedareve:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Server Stampimi:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2453,15 +2431,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Zgjedheni nj�r server primar dhe sekondar nga lista."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Servera t� Koh�s"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Server i Koh�s Primar:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Server i Koh�s Sekondare:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2538,16 +2516,16 @@ msgid "Web wizard"
 msgstr "Asistenti Web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Ky asistent do t� ju ndihmoj� n� konfigurimin e Serverit Web n� rrjetin tuaj."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Asistenti Konfigurues p�r Server Web"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Mos e verifikoni asnj� kuti n�se ju nuk d�shironi t'aktivizoni Serverin tuaj "
 "Web."
@@ -2558,23 +2536,23 @@ msgstr ""
 "Zgjedheni tipin e sh�rbimit t� Serverit tuaj, q� d�shironi t'aktivizoni."
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Server Web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Serveri i juaj mund t� konfigurohet sikur server Web p�r rrjetin tuaj lokal "
 "(intranet), apo sikur server Web p�r rrjetin Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Aktivizoje Serverin Web p�r Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Aktivizoje Serverin Web p�r Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2622,18 +2600,18 @@ msgstr ""
 "Shtypni shtegun lokal t� repertorit i cili do ti p�rshtatet dokumenteve "
 "rr�nj�zore (root), q� furnizohen nga Serveri juaj Web."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Dokumenti Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Dokumenti root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Konfigurimi i Serverit Web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Asistenti i ka p�rmbledhur parametrat vijues q� ju nevojiten n� konfigurmin "
 "Serverit tuaj Web"
@@ -2646,16 +2624,12 @@ msgstr "Server Web Intranet:"
 msgid "Internet web server:"
 msgstr "Server Web Intenet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Dokumenti root:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Repertori i p�rdoruesit:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Asistenti e ka konfiguruar me sukses Serverin tuaj Web p�r Intranet/Internet"
 
@@ -2669,6 +2643,42 @@ msgstr "Server Web Intranet:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurimi i Serverit DNS"
 
+#~ 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."
+
+#~ msgid "FTP Server"
+#~ msgstr "Server FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Server i Lajmeve"
+
+#~ msgid "NFS Server"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Server i Lajmeve"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "Server NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Mjeti i Rrjetit"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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."
+
+#~ msgid "Document Root:"
+#~ msgstr "Dokumenti Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Konfigurimi i Mesazheve (Mail) n� Internet"
 
diff --git a/po/sr.po b/po/sr.po
index a5d51803..a3a29777 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -42,7 +42,7 @@ msgstr "Грешка у чаробњаку."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -195,7 +195,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Овај чаробњак ће Вам помоћи да подесите DHCP сервисе Вашег сервера."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -211,16 +214,16 @@ msgid ""
 msgstr "Изаберите опсег адреса"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Најнижа IP адреса:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Највиша IP адреса"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -248,7 +251,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP адреса сервера не сме бити у распону"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Подешавање DHCP сервера"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -284,7 +287,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Чаробњак је успешно подесио DHCP сервисе Вашег сервера."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -560,22 +564,18 @@ msgid "Apache web server"
 msgstr "Интранет Web сервер:"
 
 #: ../drakwizard.pl:41
-#, fuzzy
 msgid "DHCP server"
-msgstr "NFS сервер"
+msgstr "DHCP сервер"
 
 #: ../drakwizard.pl:42
-#, fuzzy
 msgid "DNS server"
-msgstr "NFS сервер"
+msgstr "DNS сервер"
 
-#: ../drakwizard.pl:43
-#, fuzzy
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "News сервер"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS сервер"
 
@@ -584,8 +584,7 @@ msgstr "NFS сервер"
 msgid "Mail server"
 msgstr "Име сервера поште:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP сервер"
 
@@ -648,40 +647,36 @@ msgid "FTP wizard"
 msgstr "FTP чаробњак"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Чаробњак за подешавање FTP сервера"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Овај чаробњак ће вам помоћи да подесите FTP сервер на Вашој мрежи."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP сервер"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Изаберите врсту FTP сервиса коју желите да активирате:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Ваш сервер може да се понаша као FTP сервер за Вашу интерну мрежу "
 "(интранет), као и FTP сервер за интернет."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Укључи FTP сервер за интранет"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Укључи FTP сервер за интернет"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -693,7 +688,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -709,11 +704,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -739,8 +734,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -748,14 +743,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "На -алост, морате да будете администратор како би сте то учинили..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Подешавање FTP сервера"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Чаробњак је сакупи следеће параметре који су потребни да би се подесио FTP "
 "сервер"
@@ -770,11 +765,11 @@ msgstr ""
 "Даље или искористите дугме Назад да би сте их исправили."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Интранет FTP сервер:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Интернет FTP сервер:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -798,7 +793,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Чаробњак је успешно подесио Ваш интернет/интранет FTP сервер"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -846,11 +841,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1075,7 +1070,7 @@ msgstr "Добродошли у чаробњака за подешавање New
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Имена интернет домаћина мора да буде у облику \"domacin.domen.tipdomena\"; "
@@ -1083,10 +1078,6 @@ msgstr ""
 "news сервера највероватније \"news.pruzalac.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "News сервер"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1095,24 +1086,24 @@ msgstr ""
 "ова име најчешће даје Ваш пружалац интернет услуга."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Име News сервера:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "У зависности од врсте интернет везе коју имате, период провере може се "
 "мењати између 6 и 24 часа."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Период провере"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1120,7 +1111,7 @@ msgstr ""
 "интернет вести; време провере одређује период између две узастопне провере."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Период провере (у сатима):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1138,31 +1129,30 @@ msgstr "Подешавање интернет news сервера"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Чаробњак је сакупио следеће параметре који су потребни да би сте подесили "
 "Ваш интернет news сервис:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Да би сте прихватили ове вредности, и подесили Ваш сервер, кликните на дугме "
 "Даље или искористите дугме Назад да би сте их исправили."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "News сервер:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Интервал провере:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Чаробњак је успе[но подесио интернет news сервис на Башем серверу."
@@ -1172,7 +1162,6 @@ msgid "NFS Wizard"
 msgstr "NFS чаробњак"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Све - без забрани приступа"
 
@@ -1185,25 +1174,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Чаробњак за подешавање NFS сервера"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Овај чаробњак ће Вам помоћи у подешавању NFS сервера на Вашој мрежи."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS сервер"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Директоријум:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Контрола приступа"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Изаберите ниво који Вам одговара. Ако нисте сигурни, препоручљив је ниво "
@@ -1251,7 +1237,7 @@ msgid "Netmask :"
 msgstr "Мрежна маска:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Чаробњак је успешно подесио Ваш NFS сервер"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1260,28 +1246,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "News сервер"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Клијентски IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "News сервер"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1297,19 +1279,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS сервер"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1327,12 +1310,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS сервер"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1354,23 +1331,6 @@ msgstr "Овај чаробњак је успешно подесио Samba се�
 msgid "NIS directory:"
 msgstr "КОриснички директоријум:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Мрежни уређај"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1383,7 +1343,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1418,12 +1378,12 @@ msgstr "Подешавање DNS сервера"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "News сервер"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Подешавање DNS сервера"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1514,7 +1474,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Имена интернет домаћина морају да буду облика \"domacin.domen.tipdomena\"; "
@@ -1567,15 +1527,6 @@ msgstr ""
 "Овај чаробњак је сакупио следеће параметре потрбне за подешавање Вашег "
 "интернет поштанског сервиса:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Да би сте прихватили ове вредности, и подесили Ваш сервер, кликните на дугме "
-"Даље или искористите дугме Назад да би сте их исправили."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1713,6 +1664,19 @@ msgid "Disk space (MB):"
 msgstr "Простор на диску (МБ):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Контрола приступа"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Изаберите ниво који Вам одговара. Ако нисте сигурни, препоручљив је ниво "
+"Локалне мреже. Опција Сви нивои може бити несигурна."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Прокси се може подесити да користи различите нивое приступа."
@@ -1780,6 +1744,15 @@ msgstr ""
 "Чаробњак је сакупио следеће податке потребне да би се Ваш прокси сервер "
 "подесио:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Да би сте прихватили ове вредности, и подесили Ваш сервер, кликните на дугме "
+"Даље или искористите дугме Назад да би сте их исправили."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Прикључак"
@@ -2143,15 +2116,16 @@ msgstr "Samba чаробњак"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Све - без забрани приступа"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Моја правила - Птај ме за прихваћене и одбијене домаћине"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Чаробњак за подешавање Samba-е"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2160,6 +2134,10 @@ msgstr ""
 "за оне радне станицекоје не користе Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Чаробњак за подешавање Samba-е"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2182,7 +2160,7 @@ msgid "The Workgroup is wrong"
 msgstr "Радна група је погрешна"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Серверов банер."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2198,13 +2176,9 @@ msgid "Banner:"
 msgstr "Банер:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Серверов Банер није исправан"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Контрола приступа"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Ниво приступа:"
@@ -2212,7 +2186,7 @@ msgstr "Ниво приступа:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Пример 1: дозволи свим IP-овима у 150.203.*.*, осим једном \\hosts allow = "
@@ -2259,7 +2233,7 @@ msgid "Deny hosts:"
 msgstr "Одбиј домаћине:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Samba сервиси укључени"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2276,7 +2250,7 @@ msgid "Enable file sharing area"
 msgstr "Укључи простор дељења датотека"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Омогући дељење сервера за штампу"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2317,7 +2291,7 @@ msgstr ""
 "сваку врсту дозволе."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "прочитај листу:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2325,7 +2299,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "листа писања:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2349,15 +2323,15 @@ msgstr ""
 "Чаробњак је сакупио следеће податке који су потребни да би се подесила Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Серверов банер:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Дељење датотека:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Сервер за штампање:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2417,15 +2391,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Изаберите примарни и секундарни сервер из листе."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Временски сервери"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Примарни временски сервер:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Секундарни временски сервер:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2502,15 +2476,15 @@ msgid "Web wizard"
 msgstr "Web чаробњак"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Овај чаробњак ће Вам помоћи да подесите Web сервер на Вашој мрежи."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Чаробњак за подешавање Web сервера"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Немојте да обелеђите било које од поља ако желите да активирате Web сервер."
 
@@ -2519,23 +2493,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Изаберите врсту Web услуге коју желите да активирате:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web сервер"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Ваш сервер може да се понаша као Web сервер за Вашу интерну мрежу (интранет) "
 "као и Web сервер за интернет."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Web сервер за интранет"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Web сервер за интернет"
 
 #: ../web_wizard/Apache.pm:90
@@ -2579,18 +2553,18 @@ msgstr "корисников http под-директоријум: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Унесите путању до директоријума коју желите да буде корен документа."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Корен документа:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Подешавање Web сервера"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Чаробњак је сакупио следеће параметре коју су потребни да би се Ваш Web "
 "сервер подесио"
@@ -2603,16 +2577,12 @@ msgstr "Интранет Web сервер:"
 msgid "Internet web server:"
 msgstr "Интернет web сервер:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Корен документа:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "КОриснички директоријум:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Чаробњак је успешно подесио ваш интранет/интернет Web сервер"
 
 #: ../web_wizard/Apache.pm:236
@@ -2625,6 +2595,41 @@ msgstr "Интранет Web сервер:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Подешавање DNS сервера"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Чаробњак је успешно подесио DHCP сервисе Вашег сервера."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP сервер"
+
+#~ msgid "News Server"
+#~ msgstr "News сервер"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS сервер"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "News сервер"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS сервер"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Мрежни уређај"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Да би сте прихватили ове вредности, и подесили Ваш сервер, кликните на "
+#~ "дугме Даље или искористите дугме Назад да би сте их исправили."
+
+#~ msgid "Document Root:"
+#~ msgstr "Корен документа:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Подешавање интернет поште"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index b6350d32..2307da9f 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -42,7 +42,7 @@ msgstr "Greška u čarobnjaku."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -197,7 +197,10 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -213,16 +216,16 @@ msgid ""
 msgstr "Izaberite opseg adresa"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Najniža IP adresa:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Najviša IP adresa"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -250,7 +253,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP adresa servera ne sme biti u rasponu"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Podešavanje DHCP servera"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -286,7 +289,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -562,22 +566,18 @@ msgid "Apache web server"
 msgstr "Intranet Web server:"
 
 #: ../drakwizard.pl:41
-#, fuzzy
 msgid "DHCP server"
-msgstr "NFS server"
+msgstr "DHCP server"
 
 #: ../drakwizard.pl:42
-#, fuzzy
 msgid "DNS server"
-msgstr "NFS server"
+msgstr "DNS server"
 
-#: ../drakwizard.pl:43
-#, fuzzy
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "News server"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS server"
 
@@ -586,8 +586,7 @@ msgstr "NFS server"
 msgid "Mail server"
 msgstr "Ime servera pošte:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP server"
 
@@ -650,40 +649,36 @@ msgid "FTP wizard"
 msgstr "FTP čarobnjak"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Čarobnjak za podešavanje FTP servera"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "FTP server"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Uključi FTP server za intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Uključi FTP server za internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -695,7 +690,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -711,11 +706,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -741,8 +736,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -750,14 +745,14 @@ 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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Podešavanje FTP servera"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Čarobnjak je sakupi sledeće parametre koji su potrebni da bi se podesio FTP "
 "server"
@@ -772,11 +767,11 @@ msgstr ""
 "Dalje ili iskoristite dugme Nazad da bi ste ih ispravili."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -800,7 +795,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Čarobnjak je uspešno podesio Vaš internet/intranet FTP server"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -848,11 +843,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1077,7 +1072,7 @@ msgstr "Dobrodošli u čarobnjaka za podešavanje News servera"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Imena internet domaćina mora da bude u obliku \"domacin.domen.tipdomena\"; "
@@ -1085,10 +1080,6 @@ msgstr ""
 "news servera najverovatnije \"news.pruzalac.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "News server"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1097,24 +1088,24 @@ msgstr ""
 "ova ime najčešće daje Vaš pružalac internet usluga."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Ime News servera:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "U zavisnosti od vrste internet veze koju imate, period provere može se "
 "menjati između 6 i 24 časa."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Period provere"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1122,7 +1113,7 @@ msgstr ""
 "internet vesti; vreme provere određuje period između dve uzastopne provere."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Period provere (u satima):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1140,31 +1131,30 @@ msgstr "Podešavanje internet news servera"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Čarobnjak je sakupio sledeće parametre koji su potrebni da bi ste podesili "
 "Vaš internet news servis:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Da bi ste prihvatili ove vrednosti, i podesili Vaš server, kliknite na dugme "
 "Dalje ili iskoristite dugme Nazad da bi ste ih ispravili."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "News server:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Interval provere:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "Čarobnjak je uspe[no podesio internet news servis na Bašem serveru."
@@ -1174,7 +1164,6 @@ msgid "NFS Wizard"
 msgstr "NFS čarobnjak"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Sve - bez zabrani pristupa"
 
@@ -1187,25 +1176,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Čarobnjak za podešavanje NFS servera"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Ovaj čarobnjak će Vam pomoći u podešavanju NFS servera na Vašoj mreži."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS server"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Direktorijum:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Kontrola pristupa"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Izaberite nivo koji Vam odgovara. Ako niste sigurni, preporučljiv je nivo "
@@ -1253,7 +1239,7 @@ msgid "Netmask :"
 msgstr "Mrežna maska:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Čarobnjak je uspešno podesio Vaš NFS server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1262,28 +1248,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "News server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Klijentski IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "News server"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1299,19 +1281,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1329,12 +1312,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS server"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1356,23 +1333,6 @@ msgstr "Ovaj čarobnjak je uspešno podesio Samba server."
 msgid "NIS directory:"
 msgstr "KOrisnički direktorijum:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Mrežni uređaj"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1385,7 +1345,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1420,12 +1380,12 @@ msgstr "Podešavanje DNS servera"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "News server"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Podešavanje DNS servera"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1516,7 +1476,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Imena internet domaćina moraju da budu oblika \"domacin.domen.tipdomena\"; "
@@ -1569,15 +1529,6 @@ msgstr ""
 "Ovaj čarobnjak je sakupio sledeće parametre potrbne za podešavanje Vašeg "
 "internet poštanskog servisa:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Da bi ste prihvatili ove vrednosti, i podesili Vaš server, kliknite na dugme "
-"Dalje ili iskoristite dugme Nazad da bi ste ih ispravili."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1716,6 +1667,19 @@ msgid "Disk space (MB):"
 msgstr "Prostor na disku (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Kontrola pristupa"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Izaberite nivo koji Vam odgovara. Ako niste sigurni, preporučljiv je nivo "
+"Lokalne mreže. Opcija Svi nivoi može biti nesigurna."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Proksi se može podesiti da koristi različite nivoe pristupa."
@@ -1783,6 +1747,15 @@ msgstr ""
 "Čarobnjak je sakupio sledeće podatke potrebne da bi se Vaš proksi server "
 "podesio:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Da bi ste prihvatili ove vrednosti, i podesili Vaš server, kliknite na dugme "
+"Dalje ili iskoristite dugme Nazad da bi ste ih ispravili."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Priključak"
@@ -2146,15 +2119,16 @@ msgstr "Samba čarobnjak"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Sve - bez zabrani pristupa"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Moja pravila - Ptaj me za prihvaćene i odbijene domaćine"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Čarobnjak za podešavanje Samba-e"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2163,6 +2137,10 @@ msgstr ""
 "štampače za one radne stanicekoje ne koriste Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Čarobnjak za podešavanje Samba-e"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2185,7 +2163,7 @@ msgid "The Workgroup is wrong"
 msgstr "Radna grupa je pogrešna"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Serverov baner."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2201,13 +2179,9 @@ msgid "Banner:"
 msgstr "Baner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Serverov Baner nije ispravan"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Kontrola pristupa"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Nivo pristupa:"
@@ -2215,7 +2189,7 @@ msgstr "Nivo pristupa:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Primer 1: dozvoli svim IP-ovima u 150.203.*.*, osim jednom \\hosts allow = "
@@ -2262,7 +2236,7 @@ msgid "Deny hosts:"
 msgstr "Odbij domaćine:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Samba servisi uključeni"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2279,7 +2253,7 @@ msgid "Enable file sharing area"
 msgstr "Uključi prostor deljenja datoteka"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Omogući deljenje servera za štampu"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2320,7 +2294,7 @@ msgstr ""
 "svaku vrstu dozvole."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "pročitaj listu:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2328,7 +2302,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "lista pisanja:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2353,15 +2327,15 @@ msgstr ""
 "Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Serverov baner:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Deljenje datoteka:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Server za štampanje:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2422,15 +2396,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Izaberite primarni i sekundarni server iz liste."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Vremenski serveri"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primarni vremenski server:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekundarni vremenski server:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2508,15 +2482,15 @@ msgid "Web wizard"
 msgstr "Web čarobnjak"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Ovaj čarobnjak će Vam pomoći da podesite Web server na Vašoj mreži."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Čarobnjak za podešavanje Web servera"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Nemojte da obeleđite bilo koje od polja ako želite da aktivirate Web server."
 
@@ -2525,23 +2499,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Izaberite vrstu Web usluge koju želite da aktivirate:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web server"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Vaš server može da se ponaša kao Web server za Vašu internu mrežu (intranet) "
 "kao i Web server za internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Web server za intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Web server za internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2585,18 +2559,18 @@ msgstr "korisnikov http pod-direktorijum: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Unesite putanju do direktorijuma koju želite da bude koren dokumenta."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Koren dokumenta:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Podešavanje Web servera"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Čarobnjak je sakupio sledeće parametre koju su potrebni da bi se Vaš Web "
 "server podesio"
@@ -2609,16 +2583,12 @@ msgstr "Intranet Web server:"
 msgid "Internet web server:"
 msgstr "Internet web server:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Koren dokumenta:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "KOrisnički direktorijum:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Čarobnjak je uspešno podesio vaš intranet/internet Web server"
 
 #: ../web_wizard/Apache.pm:236
@@ -2631,6 +2601,41 @@ msgstr "Intranet Web server:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Podešavanje DNS servera"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Čarobnjak je uspešno podesio DHCP servise Vašeg servera."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP server"
+
+#~ msgid "News Server"
+#~ msgstr "News server"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS server"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "News server"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS server"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Mrežni uređaj"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Da bi ste prihvatili ove vrednosti, i podesili Vaš server, kliknite na "
+#~ "dugme Dalje ili iskoristite dugme Nazad da bi ste ih ispravili."
+
+#~ msgid "Document Root:"
+#~ msgstr "Koren dokumenta:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Podešavanje internet pošte"
 
diff --git a/po/sv.po b/po/sv.po
index aa2478f6..ee9b02c5 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -46,7 +46,7 @@ msgstr "Fel."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -195,7 +195,10 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -213,16 +216,16 @@ msgstr ""
 "inte har speciella behov kan du acceptera de förvalda värdena."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Lägsta IP-adress:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Högsta IP-adress:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Lägsta IP-adress:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -246,7 +249,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Konfigurerar DHCP-servern"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -282,7 +285,8 @@ msgid "Interface:"
 msgstr "Gränssnitt:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Guiden lyckades med att konfigurera DHCP-tjänsterna på servern."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -554,11 +558,11 @@ msgstr "DHCP-server"
 msgid "DNS server"
 msgstr "DNS-server"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Diskussionsgruppserver"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS-server"
 
@@ -566,7 +570,7 @@ msgstr "NFS-server"
 msgid "Mail server"
 msgstr "E-postserver"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP-server"
 
@@ -627,41 +631,37 @@ msgid "FTP wizard"
 msgstr "Guide för FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Konfigurationsguide för FTP-server"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "FTP-server"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Aktivera FTP-servern för Intranätet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Aktivera FTP-servern för Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -673,7 +673,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -689,11 +689,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -718,8 +718,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -727,14 +727,14 @@ 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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Konfigurerar FTP-servern"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Guiden samlade in följande parametrar som behövs\n"
 "för att konfigurera FTP-servern"
@@ -749,11 +749,11 @@ msgstr ""
 "Nästa eller använd Tillbaka för att korrigera dem."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "FTP-server för Intranät:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "FTP-server för Internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -777,7 +777,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Guiden lyckades med att konfigurera FTP-servern för Intranät/Internet"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -825,11 +825,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1050,7 +1050,7 @@ msgstr "Välkommen till guiden för diskussionsgrupper"
 #, fuzzy
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internetdatornamn måste vara i formen \"dator.domän.domäntyp\". Om din "
@@ -1058,10 +1058,6 @@ msgstr ""
 "\"news.leverantör.se\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Diskussionsgruppserver"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1071,24 +1067,24 @@ msgstr ""
 "leverantör."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Namn på diskussionsgruppserver:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Beroende på vilken typ av Internetanslutning du har kan tiden mellan den "
 "periodiska kontrollen variera mellan 6 och 24 timmar."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Periodisk kontroll"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1097,7 +1093,7 @@ msgstr ""
 "ställer in intervallet mellan två successiva periodiska kontroller."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Periodisk kontroll (timmar):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1115,31 +1111,30 @@ msgstr "Konfigurerar diskussionsgrupper"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera "
 "diskussionsgruppstjänsten:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Diskussionsgruppserver:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Intervall för periodisk kontroll:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1150,7 +1145,6 @@ msgid "NFS Wizard"
 msgstr "Guide för NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Alla - Inga åtkomstbegränsningar"
 
@@ -1163,26 +1157,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Konfigurationsguide för NFS-server"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Den här guiden hjälper dig att konfigurera en NFS-server för ditt nätverk."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS-server"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Åtkomstkontroll"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Välj nivån som passar dina behov. Om du inte vet så brukar nivån Lokalt "
@@ -1230,7 +1221,7 @@ msgid "Netmask :"
 msgstr "Nätmask: "
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Guiden lyckades med att konfigurera NFS-servern."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1239,27 +1230,23 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Diskussionsgruppserver"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS-klient"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Diskussionsgruppserver"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1275,18 +1262,19 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS-server:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS-domän:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1304,11 +1292,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS-server:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1329,23 +1312,6 @@ msgstr "Guiden lyckades med att konfigurera Samba-servern."
 msgid "NIS directory:"
 msgstr "NIS-katalog:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Nätverksenhet"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1358,7 +1324,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1393,12 +1359,12 @@ msgstr "Konfigurerar DNS-servern"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Diskussionsgruppserver"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Konfigurerar DNS-servern"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1489,7 +1455,7 @@ msgstr ""
 #, fuzzy
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internetdatornamn måste vara i formen \"dator.domän.domäntyp\". Om din "
@@ -1542,15 +1508,6 @@ msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera e-"
 "posttjänsten för Internet"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1691,6 +1648,19 @@ msgid "Disk space (MB):"
 msgstr "Diskutrymme (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Åtkomstkontroll"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Välj nivån som passar dina behov. Om du inte vet så brukar nivån Lokalt "
+"nätverk räcka bra. Observera att nivån Alla kanske inte är säker."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Proxyn kan konfigureras till att använda olika åtkomstkontrollnivåer."
 
@@ -1756,6 +1726,15 @@ msgid ""
 msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera proxyn:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2116,15 +2095,16 @@ msgstr "Guide för Samba"
 msgid "%s does not exist."
 msgstr "%s finns inte."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Alla - Inga åtkomstbegränsningar"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Mina regler - Fråga mig för nekade/tillåtna värddatorer"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Konfigurationsguide för Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2133,6 +2113,10 @@ msgstr ""
 "arbetsstationer som kör icke-Linux-system."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Konfigurationsguide för Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Den här guiden hjälper dig att konfigurera Samba-tjänster på servern."
@@ -2154,7 +2138,7 @@ msgid "The Workgroup is wrong"
 msgstr "Arbetsgruppen är fel"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Serverrubrik."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2170,20 +2154,16 @@ msgid "Banner:"
 msgstr "Rubrik:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Serverrubriken är felaktig"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Åtkomstkontroll"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Åtkomstnivå:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Exempel 1: tillåt alla IP-adresser i 150.203.*.*; utom en\n"
@@ -2231,7 +2211,7 @@ msgid "Deny hosts:"
 msgstr "Neka datorer:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Aktiverade Samba-tjänster"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2248,7 +2228,7 @@ msgid "Enable file sharing area"
 msgstr "Aktivera filutdelningsområde"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Aktivera utdelning av serverskrivare"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2288,7 +2268,7 @@ msgstr ""
 "behörighet."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "läslista:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2296,7 +2276,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fredrik, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "skrivlista:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2319,15 +2299,15 @@ msgstr ""
 "behövs för att konfigurera Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Serverrubrik:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Filutdelning:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Skrivarserver:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2386,15 +2366,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Välj en primär och en sekundär server från listan."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Tidsservrar"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Primär tidsserver:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sekundär tidsserver:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2467,16 +2447,16 @@ msgid "Web wizard"
 msgstr "Webbguide"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Den här guiden hjälper dig att konfigurera webbservern för ditt nätverk."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Konfigurationsguide för webbserver"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Markera ingen ruta om du inte vill aktivera webbservern."
 
 #: ../web_wizard/Apache.pm:77
@@ -2484,23 +2464,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Välj vilken form av webbtjänst du vill aktivera:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Webbserver"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Servern kan uppträda som en webbserver mot ditt interna nätverk (intranät) "
 "och som en webbserver för Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Aktivera webbservern för Intranätet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Aktivera webbservern för Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2543,18 +2523,18 @@ msgstr "Användar-HTTP-underkatalog: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Ange sökvägen till katalogen som du vill ska vara dokumentrot."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "Dokumentrot:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Konfigurerar webbservern"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Guiden samlade in följande parametrar som behövs för att konfigurera "
 "webbservern"
@@ -2567,16 +2547,12 @@ msgstr "Webbserver för Intranät:"
 msgid "Internet web server:"
 msgstr "Webbserver för Internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Dokumentrot:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Användarkatalog:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Guiden lyckades med att konfigurera Intranät/Internet-webbservern"
 
 #: ../web_wizard/Apache.pm:236
@@ -2589,6 +2565,40 @@ msgstr "Webbserver för Intranät:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Konfigurerar DNS-servern"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Guiden lyckades med att konfigurera DHCP-tjänsterna på servern."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP-server"
+
+#~ msgid "News Server"
+#~ msgstr "Diskussionsgruppserver"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS-server"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Diskussionsgruppserver"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS-server:"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Nätverksenhet"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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."
+
+#~ msgid "Document Root:"
+#~ msgstr "Dokumentrot:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Konfigurerar e-post för Internet"
 
diff --git a/po/ta.po b/po/ta.po
index 51ce080b..20e27363 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -42,7 +42,7 @@ msgstr "மாயாவியில் பிழை நேர்ந்துள�
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -197,7 +197,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "இந்த மாயாவி உங்கள் DHCP சேவைகளை வடிவமைக்க உதவும்"
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -215,16 +218,16 @@ msgstr ""
 "பொதுவாக இங்கே கொடுக்கப்பட்டுள்ள மதிப்புகளை நீங்கள் பயன்படுத்தலாம்"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "குறைந்தபட்ச IP முகவரி:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "அதிகபட்ச IP முகவரி:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "நுழைவு வாயில் IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -251,7 +254,7 @@ msgid "The IP of the server must not be in range."
 msgstr "ேசவையகத்தின் IP இந்ம வீச்சில் இருக்க ேவண்டும்"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP சேவையகம் வடிவமைக்கப்படுகிறது"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -285,7 +288,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "இந்த மாயாவி உங்கள் DHCP சேவைகளை வெற்றிகரமாக வடிவமைத்துவிட்டது"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -561,22 +565,19 @@ msgid "Apache web server"
 msgstr "உள்ளமை வலையத்தளச் சேவையகம்:"
 
 #: ../drakwizard.pl:41
-#, fuzzy
 msgid "DHCP server"
-msgstr "NFS சேவையகம்"
+msgstr "DHCP சேவையகம்"
 
 #: ../drakwizard.pl:42
-#, fuzzy
 msgid "DNS server"
-msgstr "NFS சேவையகம்"
+msgstr "DNS சேவையகம்"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "செய்தியஞ்சல் சேவையகம்"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS சேவையகம்"
 
@@ -585,8 +586,7 @@ msgstr "NFS சேவையகம்"
 msgid "Mail server"
 msgstr "மின்னஞ்சல் சேவையகத்தின் பெயர்:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP சேவையகம்"
 
@@ -652,40 +652,36 @@ msgid "FTP wizard"
 msgstr "FTP மாயாவி"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP சேவையக வடிவமைப்பு மாயாவி"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "இந்த மாயாவி உங்கள் வலையமைப்பிற்கு FTP சேவையகத்ைத வடிவமைத்து தரும்"
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP சேவையகம்"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "நீங்கள் செயல்படுத்த விரும்பும் FTP சேவை வகையைத் தேர்வுச் செய்யவும்"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "உங்கள் சேவையகம் FTP சேவையை உள்ளமை வலையமைப்புக்கு மட்டும் அல்லது இணையத்திற்கும் சேர்த்து "
 "வழங்கலாம்"
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "FTP சேவையை இணையத்திற்காகச் செயல்படுத்து"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "FTP சேவையை இணையத்திற்காகச் செயல்படுத்து "
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -697,7 +693,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -713,11 +709,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -743,8 +739,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -752,14 +748,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "மன்னிக்கவும், இதைச் செய்ய நீங்கள் நிர்வாகியாக இருக்க வேண்டும்"
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP சேவையகம் வடிவமைக்கப்படுகிறது"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "உங்கள் FTP சேவையை வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -773,11 +769,11 @@ msgstr ""
 "செல்லவும்"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "அக இணைய FTP சேவையகம்"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "FTP இணையச் சேவையகம் :"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -801,7 +797,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "மாயாவி உங்கள் FTP இணையச் சேவையகத்ைத வெற்றிகரமாக வடிவமைத்தது"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -849,11 +845,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1077,7 +1073,7 @@ msgstr "செய்தியஞ்சல் மாயாவிக்கு ந�
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "இணையத்தில் உள்ள கணினியின் பெயர் என்றும் \"host.domain.domaintype\\ முழுதாகச் சொல்லப்பட "
@@ -1085,10 +1081,6 @@ msgstr ""
 "சேவையகத்தின் பெயர் -\"news.provider.com\". என இருக்கும்"
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "செய்தியஞ்சல் சேவையகம்"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1098,24 +1090,24 @@ msgstr ""
 "உங்களுக்கு தருவார்"
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "செய்தியஞ்சல் சேவையகத்தின் பெயர்:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "உங்கள் இணையத்ெதாடர்பை பொறுத்து நீங்கள் சரியான வாக்ெகடுப்பு இடைவெளியை 6 முதல் 24 மனிநேரம் "
 "வரை வைக்க முடியும்"
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "வாக்ெகடுப்பு இடைவெளி"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1123,7 +1115,7 @@ msgstr ""
 "பொறுத்து அஞ்சல்களைப்ெபறும்"
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "வாக்ெகடுப்பு இடைவெளி(மனிகளில்)"
 
 #: ../news_wizard/Inn.pm:76
@@ -1141,30 +1133,29 @@ msgstr "இணைய செய்தியஞ்சல் வடிவமைக�
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr "உங்கள் செய்தியஞ்சல் சேவையகத்ைத வடிவமைக்க மாயாவி கீழுள்ள விவரங்களைசேகரித்துள்ளது"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "இங்கு கொடுக்கப்பட்டுள்ள மதிப்புகளை ஓப்புக்ெகன்டு சேவையகத்ைத வடிவமைக்க அடுத்தது என்ற "
 "பொத்தானை தேர்வுச்ெசய், அல்லது மாற்றங்கள் செய்ய பின்னால் என்ற பொத்தானை தேர்வுச்ெசய்து பின்னால் "
 "செல்லவும்"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "செய்தியஞ்சல் சேவையம்"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "வாக்ெகடுப்பு இடைவெளி:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1175,7 +1166,6 @@ msgid "NFS Wizard"
 msgstr "NFS மாயாவி"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "அனைத்தும்- எந்த கட்டுபாடும் இல்ைல"
 
@@ -1188,25 +1178,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS சேவையக வடிவமைப்பு மாயாவி"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "இந்த மாயாவி உங்கள் வலையமைப்பிற்கு ஏற்றவாறு NFS சேவையகத்ைத வடிவமைத்து தரும்"
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS சேவையகம்"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "அடைவு:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "அணுகல் கட்டுப்பாடு"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "உங்கள் தேவைக்கேற்ற நிலையைத் தேர்வுச் செய்க. உங்களுக்கு சரியாகத் தெரியவில்ைல என்றால் உள்ளமை "
@@ -1255,7 +1242,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "இந்த மாயாவி NFS சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைத்தது."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1264,28 +1251,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "செய்தியஞ்சல் சேவையகம்"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "வேண்டியின் IP:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "செய்தியஞ்சல் சேவையகம்"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1301,19 +1284,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS சேவையகம்"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1331,12 +1315,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS சேவையகம்"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1358,23 +1336,6 @@ msgstr "இந்த மாயாவி சம்பா சேவையை உ�
 msgid "NIS directory:"
 msgstr "பயனர் அடைவு:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "வலையமைப்புச் சாதனம்"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1387,7 +1348,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1422,12 +1383,12 @@ msgstr "DNS சேவையகம் வடிவமைக்கப்படு�
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "செய்தியஞ்சல் சேவையகம்"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1515,7 +1476,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "மின்னஞ்சல் சேவையகத்தின் பெயர் என்பது இணையத்திலிருந்து உங்கள் வலையமைப்பிற்கு மின்னஞ்சல்களை "
@@ -1565,16 +1526,6 @@ msgid ""
 "external mail server:"
 msgstr "உங்கள் மின்னஞ்சல் சேவையகத்ைத வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"இங்கு கொடுக்கப்பட்டுள்ள மதிப்புகளை ஓப்புக்ெகன்டு சேவையகத்ைத வடிவமைக்க அடுத்தது என்ற "
-"பொத்தானை தேர்வுச்ெசய், அல்லது மாற்றங்கள் செய்ய பின்னால் என்ற பொத்தானை தேர்வுச்ெசய்து பின்னால் "
-"செல்லவும்"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1710,6 +1661,20 @@ msgid "Disk space (MB):"
 msgstr "வட்டளவு (மெகாபைட்)"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "அணுகல் கட்டுப்பாடு"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"உங்கள் தேவைக்கேற்ற நிலையைத் தேர்வுச் செய்க. உங்களுக்கு சரியாகத் தெரியவில்ைல என்றால் உள்ளமை "
+"வலையமைப்பு என்பதைத் தேர்வுச் செய்யவும். எல்லா நிலைகளுமே பாதுகாப்பானது இல்ைல என்பதை "
+"நினைவில் கொள்ளவும்"
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr "பினாமியை பல்வேறு அணுகல் கட்டுப்பாடுகளில் வடிவமைக்கலாம்"
@@ -1772,6 +1737,16 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "உங்கள் பினாமியை வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"இங்கு கொடுக்கப்பட்டுள்ள மதிப்புகளை ஓப்புக்ெகன்டு சேவையகத்ைத வடிவமைக்க அடுத்தது என்ற "
+"பொத்தானை தேர்வுச்ெசய், அல்லது மாற்றங்கள் செய்ய பின்னால் என்ற பொத்தானை தேர்வுச்ெசய்து பின்னால் "
+"செல்லவும்"
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "துறை:"
@@ -2137,15 +2112,16 @@ msgstr "சம்பா மாயாவி"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "அனைத்தும்- எந்த கட்டுபாடும் இல்ைல"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "என்னுைடய சட்டங்கள்- அனுமதிக்கப்பட்ட, மறுக்கப்பட்ட கணினிகள்"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "சம்பா வடிவமைப்பு மாயாவி"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2154,6 +2130,10 @@ msgstr ""
 "சேவையகமாக மாற்ற முடியும்"
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "சம்பா வடிவமைப்பு மாயாவி"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "இந்த மாயாவி சம்பா சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைக்க உதவும்"
@@ -2175,7 +2155,7 @@ msgid "The Workgroup is wrong"
 msgstr "பணிக்குழுவில் பிழை உள்ளது"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "சேவையகத்தின் பட்டப்ெபயர்"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2189,13 +2169,9 @@ msgid "Banner:"
 msgstr "பட்டப்ெபயர்:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "சேவையகத்தின் பட்டப்ெபயர் தவறாக உள்ளது"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "அணுகல் கட்டுப்பாடு"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "அணுகல் நிலை:"
@@ -2203,11 +2179,11 @@ msgstr "அணுகல் நிலை:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
-" Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+" Example 1: allow all IP in 150.203.*.*; except one\\nhosts allow = 150.203. "
+"EXCEPT 150.203.6.66"
 
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
@@ -2249,7 +2225,7 @@ msgid "Deny hosts:"
 msgstr "கணினிகளை மறுக்கவும்"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "சம்பா சேவைகளை செயல்படுத்து"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2266,7 +2242,7 @@ msgid "Enable file sharing area"
 msgstr "பகிர்தலைச் ெசயல்படுத்து"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "உங்கள் சேவையகத்தில் அச்சுப்ெபறியை பகிர்"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2305,7 +2281,7 @@ msgstr ""
 "\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "பட்டியலை வாசி"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2313,7 +2289,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "பட்டியலை எழுது:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2334,15 +2310,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "உங்கள் சம்பா  சேவையகளை வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "சேவையகத்தின் பட்டப்ெபயர்:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "பகிர்தல்"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "அச்சு சேவையகம்:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2404,15 +2380,15 @@ msgstr ""
 "கீழே கொடுக்கப்பட்டுள்ள பட்டியலில் அடிப்படை மற்றும் துணை சேவையகங்களை தேர்வு செய்யுங்கள்"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "நேரச் சேவையகங்கள்"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "அடிப்படை நேரச் சேவையகம்:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "துணை நேரச் சேவையகம்:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2489,15 +2465,15 @@ msgid "Web wizard"
 msgstr "வலையத்தள மாயாவி"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "இந்த மாயாவி வலையத்தளச் சேவையகத்ைத உங்கள் வலையமைப்புக்கு ஏற்றவாறு வடிவமைக்க உதவும்"
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "வலையத்தளச் சேவையக வடிவமைப்பு மாயாவி"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "நீங்கள் உங்கள் வலையத்தளச் சேவையையை பயன்படுத்த விரும்பவில்ைலயென்றால், எந்த பெட்டியிலும் "
 "தேர்வுச் செய்யாதீர்கள்"
@@ -2507,21 +2483,21 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "நீங்கள் எந்த வகை  வலையத்தளச் சேவையையை வழங்க விரும்புகிறீர்கள் என தேர்வுச் செய்யுங்கள்"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "வலையத்தளச் சேவையகம்"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr "உங்கள் வலையத்தளத்ைத உள்ளமை வலையமைப்புக்கும் இணையத்திற்கும்சேர்த்துச்  செயல்படுத்தலாம்"
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "உங்கள் வலையத்தளச் சேவையகத்ைத உள்ளமை வலையமைப்புக்கு மட்டும் செயல்படுத்து"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "உங்கள் வலையத்தளச் சேவையகத்ைத இணையத்திற்கு செயல்படுத்து"
 
 #: ../web_wizard/Apache.pm:90
@@ -2562,18 +2538,18 @@ msgstr "பயனர் http துைன-அைடவு "
 msgid "Type the path of the directory you want being the document root."
 msgstr "நீங்கள் document root க்காக இருக்க ேவண்டிய அைடவை ேதர்வுச்ெசய்"
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Document root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "வலையத்தளச் சேவையகம் வடிவமைக்கப்படுகிறது"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "உங்கள் வலையத்தளச் சேவையகத்ைத வடிவமைக்க மாயாவி கீழுள்ள விவரங்களை சேகரித்துள்ளது"
 
 #: ../web_wizard/Apache.pm:137
@@ -2584,16 +2560,12 @@ msgstr "உள்ளமை வலையத்தளச் சேவையகம�
 msgid "Internet web server:"
 msgstr "இணைய வலையத்தளச் சேவையகம்"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Document root:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "பயனர் அடைவு:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "இந்த மாயாவி வலையத்தளச் சேவையை உங்கள் வலையமைப்புக்கு ஏற்றவாறு வெற்றிகரமாக வடிவமைத்தது"
 
@@ -2607,6 +2579,42 @@ msgstr "உள்ளமை வலையத்தளச் சேவையகம�
 msgid "Configuring your system as Apache server ..."
 msgstr "DNS சேவையகம் வடிவமைக்கப்படுகிறது"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "இந்த மாயாவி உங்கள் DHCP சேவைகளை வெற்றிகரமாக வடிவமைத்துவிட்டது"
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP சேவையகம்"
+
+#~ msgid "News Server"
+#~ msgstr "செய்தியஞ்சல் சேவையகம்"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS சேவையகம்"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "செய்தியஞ்சல் சேவையகம்"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS சேவையகம்"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "வலையமைப்புச் சாதனம்"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "இங்கு கொடுக்கப்பட்டுள்ள மதிப்புகளை ஓப்புக்ெகன்டு சேவையகத்ைத வடிவமைக்க அடுத்தது என்ற "
+#~ "பொத்தானை தேர்வுச்ெசய், அல்லது மாற்றங்கள் செய்ய பின்னால் என்ற பொத்தானை தேர்வுச்ெசய்து "
+#~ "பின்னால் செல்லவும்"
+
+#~ msgid "Document Root:"
+#~ msgstr "Document Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "இணைய மின்னஞ்சல் வடிவமைக்கப்படுகிறது"
 
diff --git a/po/tg.po b/po/tg.po
index 6359f3fd..ec873ed2 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -43,7 +43,7 @@ msgstr "Хатогӣ."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -196,7 +196,10 @@ msgstr ""
 "шабака"
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -214,16 +217,16 @@ msgstr ""
 "шумо бехатаран инро қабул кунедқиматиҳо"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "IP адреси пастарин"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "IP адреси баландтарин"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP Дарвоза:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -248,7 +251,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP-и хидматрасон набояд дар маҳдуда бошад."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Ба танзим даровардани DHCP сервер"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -283,7 +286,8 @@ msgid "Interface:"
 msgstr "Интерфейс:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Манъаи DHCP серверо устод бомуввафақият б танзим двроварда шуд "
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -567,11 +571,11 @@ msgstr "хидматрасони Ftp"
 msgid "DNS server"
 msgstr "хидматрасони NFS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Хидматрасони нав"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "хидматрасони NFS"
 
@@ -579,8 +583,7 @@ msgstr "хидматрасони NFS"
 msgid "Mail server"
 msgstr "Хидматрасонро фиристодан"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Хидматрасони FTP"
 
@@ -643,42 +646,38 @@ msgid "FTP wizard"
 msgstr "Устоди FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Ба танзим даровардани устоди хидматрасони FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Ин устод ба шумо ёри мерасонад ба танзим даровардани хидматрасони FTPро ба "
 "шабакаатоню"
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Хидматрасони FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Барои хадамоти FTPро фаъол кардан намудашро интихоб кунед."
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Шабакаи шумо метавонад хидматрасони FTPро бо шабакаи гузаргоҳи дохили "
 "(Intranet)ва бо хидматрасони FTP-ии итернет"
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Хидматрасони FTPро ба Интернет тавоно сохтан."
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Хидматрасони FTPро ба Интернет тавоно сохтан."
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -690,7 +689,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -706,11 +705,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -736,8 +735,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -745,14 +744,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "мебахшид, шумо бояд рут бошед барои инро кардан..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Ба танзим даровардани хидматрасони FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Устод параметрҳои зеринро ҷамъ намуд, ки\n"
 "барои ба танзимдарории Хидматрасони FTP зарур аст"
@@ -768,11 +767,11 @@ msgstr ""
 "истифода баред"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Хидматрасони FTP-ии Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Хидматрасони FTP-ии интернет"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -796,7 +795,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Манъаи Intranet/Интернети FTP серверо устод бомуввафақият ба танзим "
 "дароварда шуд"
@@ -846,11 +845,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1075,7 +1074,7 @@ msgstr "Марҳамад намоед ба устоди хабарҳо"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Номи хидматгори Интернет бояд дар варақа бошад\"host.domain.domaintype\"; "
@@ -1083,10 +1082,6 @@ msgstr ""
 "интернетбисёртар \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Хабарҳои хидматрасон"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1095,24 +1090,24 @@ msgstr ""
 "башабакаатон; номро бисёртар Раис дода мешавад."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "номи хабарҳои хидматрасон:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "пайвастагии Интернет ба нигоҳ карда, ба шумо муввофиқ бозпурсии давраро шумо "
 "метавонед мобайни 6 ва 24 соат иваз кунед"
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "бозпурси кадани давра"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1120,7 +1115,7 @@ msgstr ""
 "бозпурси кардани давраи фосила мобайни ду паёпайбозпурси"
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "бозпурси кадани давра(соат):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1137,31 +1132,31 @@ msgstr "ба танзим даровардани хабарҳои интерне
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Устод параметрҳои зеринро ҷамъ намуд, ки барои\n"
 "ба танзим даровардани Хадамоти Ахбороти Интернет лозим аст:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"Барои қабул кардани ин қимматиҳо ва ба танзим даровадани шабака, дагмаи "
-"давомро зер кунед ёхатогиҳоро ислоҳ кардан дагмаи пўшро зер кунед"
+"Барои қабули ин қиматҳо ва ба танзим даровардани хидамарасони худ ба дагмаи "
+"Навбатӣ ангушт занед, ё ин ки дагмаи Back-ро барои ислоҳ намудани онҳо "
+"истифода баред"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Хабарҳои хидматрасон"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "бозпурси кадани фосила"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1172,7 +1167,6 @@ msgid "NFS Wizard"
 msgstr "Устоди NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Ҳама- маҳдудияти роҳ нест"
 
@@ -1185,25 +1179,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "ба тазим даровардани устози хидматрасони NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Устод ба шумо ёри медиҳад ба танзим дарории NFS-ии Манъаи хидматрасон"
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "хидматрасони NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "феҳрист"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Дастёбии идора кардан"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Идораи пайвастшавӣ"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "дараҷаро интихоб кунед Ки ба шумо дохиласт. Агар шумо надонед, шабакаи маҳали"
@@ -1250,7 +1241,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "устод бомуввафақатиян хидматрасони NFS ба танзим дароварда шуд"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1259,28 +1250,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Хидматрасони нав"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Мизоҷи IP"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Хидматрасони нав"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1296,19 +1283,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "хидматрасони NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1326,12 +1314,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "хидматрасони NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1353,23 +1335,6 @@ msgstr "Устод Samba хидматрасони Шуморо муваффақ�
 msgid "NIS directory:"
 msgstr "Феҳристи корванд"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Дастгоҳи шабака"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1382,7 +1347,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1417,12 +1382,12 @@ msgstr "Ба танзим даровардани шабакаи DNS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Хидматрасони нав"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Ба танзим даровардани шабакаи DNS"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1510,7 +1475,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Номи соҳибони Internet бояд дар намуди \"host.domain.domaintype\" бошад; "
@@ -1561,16 +1526,6 @@ msgstr ""
 "Устод параметрҳои зерине ки ба танзими Хадамоти Internet Пости шумо зарур "
 "аст ҷамъ кард;"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Барои қабули ин қиматҳо ва ба танзим даровардани хидамарасони худ ба дагмаи "
-"Навбатӣ ангушт занед, ё ин ки дагмаи Back-ро барои ислоҳ намудани онҳо "
-"истифода баред"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1711,6 +1666,18 @@ msgid "Disk space (MB):"
 msgstr "Фосилаи диск (MB)"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Дастёбии идора кардан"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"дараҷаро интихоб кунед Ки ба шумо дохиласт. Агар шумо надонед, шабакаи маҳали"
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Бовариномаро метавон барои истифодаи дараҷаҳои мухталифи дастрасшавӣ ба "
@@ -1778,6 +1745,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "Устод параметрҳои зеринро барои танзими proxyи Шумо ҷамъ кард:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Барои қабул кардани ин қимматиҳо ва ба танзим даровадани шабака, дагмаи "
+"давомро зер кунед ёхатогиҳоро ислоҳ кардан дагмаи пўшро зер кунед"
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Бандар:"
@@ -2143,15 +2119,16 @@ msgstr "Устоди Samba"
 msgid "%s does not exist."
 msgstr "%s вуҷуд надорад."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Ҳама- маҳдудияти роҳ нест"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Қоидаҳои ман - Аз ман Соҳибони иҷозатшуда ва инкоргударо пурсед"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Устоди Танзими Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2160,6 +2137,10 @@ msgstr ""
 "чопихидматрасон дар стансияҳои кории ғайри Linux истифода бурда мешавад."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Устоди Танзими Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2182,7 +2163,7 @@ msgid "The Workgroup is wrong"
 msgstr "Гурўҳи корӣ нодуруст"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Сарлавҳаи Хидматрасон."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2197,20 +2178,16 @@ msgid "Banner:"
 msgstr "Сарлавҳа"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Сарлавҳаи Хидмтрасон нодуруст."
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Идораи пайвастшавӣ"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Дараҷаи пайвастшавӣ:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Мисоли 1:ба ҳамаиIP-ҳо дар 150.203 иҷозат медиҳад.*.*; ба ғайр азяк\n"
@@ -2259,7 +2236,7 @@ msgid "Deny hosts:"
 msgstr "Инкори соҳибҳо:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Хадамоти Samba-и фаъол"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2277,7 +2254,7 @@ msgid "Enable file sharing area"
 msgstr "Маҳалли тақсими файлро дар гирон"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Фаъолкунии Тақсими Чопгари Хидматрасон"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2317,7 +2294,7 @@ msgstr ""
 "root, fred, @users, @чарх барои як иҷозатнома."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "рўйхати хониш:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2325,7 +2302,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "рўйхати навиштаҷот:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2350,15 +2327,15 @@ msgstr ""
 "даровардани Samba ҷамъ намуд."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Сарлавҳаи Хидматрасон:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Тақсими файл:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Хидматрасони Чопӣ:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2425,15 +2402,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Аз рўйхат хидматрасони асосӣ ва дуюминро интихоб кунед."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Хидмарасонхои Вақт"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Хидматрасони Вакти Аввала:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Дуюмин Хидматрасони вақт"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2507,16 +2484,16 @@ msgid "Web wizard"
 msgstr "Устоди web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Ин устод барои танзимдарории Web Хидматрасони шабакаи шумо ёри мерасонад."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Устоди Танзимдарории WebХидматрасон"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Агар шумо Web Хидматрасони худро фаъол кардан нахоҳед ягон қуттиро қайд "
 "накунед"
@@ -2526,23 +2503,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Намуди Web хидмате, ки Шумо фаъол кардан мехоҳед интихоб кунед"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web Хидматрасон"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Хидматрасони Шумо хамчун Web Хидматрасон ба шабакаи дохилӣ (intranet) ва "
 "хамчун Web Хидматрасон барои Internet амал карда метавонад."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Web Хидматрасонро барои Intranet дар гиронед"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Web Хидматрасонро барои Internet дар гиронед"
 
 #: ../web_wizard/Apache.pm:90
@@ -2585,18 +2562,18 @@ msgstr "http зерфеҳрасти корванд : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Номи феҳристе, ки Шумо онро решаи ҳуҷҷат кардан мехоҳед нишон диҳед."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Решаи Ҳуҷҷат:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Решаи ҳуҷҷат"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Танзимдарории Web Хидматрасон"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Устод параметрҳои зеринро ки дар Web Хидматрасони Шумо бояд танзим дода "
 "шавад пайдо кард"
@@ -2609,16 +2586,12 @@ msgstr "Web хидматрасони Intranet"
 msgid "Internet web server:"
 msgstr "web хидматрасони Internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Решаи ҳуҷҷат"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Феҳристи корванд"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Устод бомувафаққона Web Хидматрасони Intranet/Internet-и Шуморо танзим кард"
 
@@ -2632,6 +2605,42 @@ msgstr "Хидматрасони Apache web"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ба танзим даровардани шабакаи DNS"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Манъаи DHCP серверо устод бомуввафақият б танзим двроварда шуд "
+
+#~ msgid "FTP Server"
+#~ msgstr "Хидматрасони FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Хабарҳои хидматрасон"
+
+#~ msgid "NFS Server"
+#~ msgstr "хидматрасони NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Хидматрасони нав"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "хидматрасони NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Дастгоҳи шабака"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Барои қабули ин қиматҳо ва ба танзим даровардани хидамарасони худ ба "
+#~ "дагмаи Навбатӣ ангушт занед, ё ин ки дагмаи Back-ро барои ислоҳ намудани "
+#~ "онҳо истифода баред"
+
+#~ msgid "Document Root:"
+#~ msgstr "Решаи Ҳуҷҷат:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Танзими Internet Пост"
 
diff --git a/po/tr.po b/po/tr.po
index 52e92b26..12885dec 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-01-28 01:18+0200\n"
 "Last-Translator: Cengizhan Kaptan <kaptan@kablonet.com.tr>\n"
 "Language-Team: Turkish <cooker-i18n@linux-mandrake.com>\n"
@@ -45,7 +45,7 @@ msgstr "Hata."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -195,7 +195,10 @@ msgstr ""
 "olacaktır."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -210,16 +213,16 @@ msgid ""
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "En Düşük IP Adresi:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "En Yüksek IP Adresi:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Geçidin IP'si:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -243,7 +246,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Sunucunun IP'si bu aralıkta olmamalı"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP Sunucusu yapılandırılıyor"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -279,7 +282,8 @@ msgid "Interface:"
 msgstr "Arayüz:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr ""
 "Sihirbaz, sunucunuz için DHCP servislerini başarılı bir şekilde yapılandırdı."
 
@@ -574,11 +578,11 @@ msgstr "DHCP sunucusu"
 msgid "DNS server"
 msgstr "DNS sunucusu"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Haber sunucusu"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS sunucusu"
 
@@ -586,7 +590,7 @@ msgstr "NFS sunucusu"
 msgid "Mail server"
 msgstr "Posta sunucusu"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP sunucusu"
 
@@ -646,43 +650,39 @@ msgid "FTP wizard"
 msgstr "FTP sihirbazı"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP Sunucusu Yapılandırma Sihirbazı"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "FTP Sunucusu"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Sunucunuz hem yerel ağınızda (intranetinizde) hem de Internet'te FTP "
 "Sunucusu olarak davranabilir."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Intranet için FTP Sunucusunu etkinleştir"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Internet için FTP Sunucusunu etkinleştir"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Yönetici Email adresi: FTP yöneticisinin e-posta adresi."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -697,7 +697,7 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "Home kullanıcısına Chroot: Kullanıcıyı ev dizininde tut."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -713,11 +713,11 @@ msgid "Admin email:"
 msgstr "Yönetici e-postası:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -741,8 +741,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -750,14 +750,14 @@ 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:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP Sunucusu yapılandırılıyor"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Sihirbaz FTP Sunucunuzu yapılandırmak için gereken parametreleri şu şekilde "
 "belirledi"
@@ -772,11 +772,11 @@ msgstr ""
 "tıklayın ya da Geri tuşunu kullanarak değerleri düzeltin."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP Sunucusu:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP Sunucusu:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -800,7 +800,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Sihirbaz, Intranet/Internet FTP Sunucunuzu başarılı bir şekilde yapılandırdı."
 
@@ -853,11 +853,11 @@ msgstr "Hata, kaynak dizin Mandrake kurulum dizini olmalıdır"
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Hedef dizin kullanımda, lütfen başka bir dizin seçin."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1078,7 +1078,7 @@ msgstr "Haber Sihirbazına hoşgeldiniz"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internet bilgisayar adları \"bilgisayar.alan.alanturu\" şeklinde olmalı. "
@@ -1086,10 +1086,6 @@ msgstr ""
 "genellikle \"news.saglayici.com\" 'dur."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Haber Sunucusu"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1098,24 +1094,24 @@ msgstr ""
 "ismidir ve bu isim genellikle sağlayıcınız tarafından verilir."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Haber Sunucusunun Adı:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Internet bağlantınızın türüne göre uygun bir sorgu aralığı 6-24 saat "
 "arasında değişebilir."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Sorgu Aralığı"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1123,7 +1119,7 @@ msgstr ""
 "sorgulayacak, sorgu aralığı iki ardışık sorgu arasındaki zamanı ayarlar."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Sorgu Aralığı (Saat):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1141,31 +1137,30 @@ msgstr "Internet Haber yapılandırılıyor"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Internet Haber Servislerinizi yapılandırmak için gereken parametreleri "
 "sihirbaz şu şekilde belirledi:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"Bu değerleri kabul etmek ve sunucunuzu yapılandırmak için İlerituşuna "
+"Bu değerleri kabul etmek ve sunucunuzu yapılandırmak için İleri tuşuna "
 "tıklayın ya da Geri tuşunu kullanarak değerleri düzeltin."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Haber Sunucusu:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Sorgu Aralığı:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1177,7 +1172,6 @@ msgid "NFS Wizard"
 msgstr "NFS Sihirbazı"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Hepsi - Erişim kısıtlaması yok"
 
@@ -1190,27 +1184,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS Sunucusu Yapılandırma Sihirbazı"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Bu sihirbaz ağınız için bir NFS Sunucusu yapılandırmanızda size yardımcı "
 "olacaktır."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS Sunucusu"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Dizin:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Erişim Denetimi"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Erişim denetimi"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "İhtiyaçlarınıza uygun bir seviye seçin. Eğer hangisini seçeceğinizden emin "
@@ -1259,7 +1250,7 @@ msgid "Netmask :"
 msgstr "Ağ maskesi:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Sihirbaz, NFS sunucunuzu başarılı bir şekilde yapılandırdı."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1272,28 +1263,24 @@ msgstr ""
 "alanadı belirtmeniz gerekir ve bu localdomain ya da none olmamalıdır. "
 "Ayarlamak için drakconnect'i çalıştırın."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "Haber Sunucusu"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "İstemci IP'si:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "Haber Sunucusu"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1309,19 +1296,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "NFS Sunucusu"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS Alan:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1339,12 +1327,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "NFS Sunucusu"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1366,23 +1348,6 @@ msgstr "Sihirbaz, Samba sunucunuzu başarılı bir şekilde yapılandırdı."
 msgid "NIS directory:"
 msgstr "Kullanıcı dizini:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "Ağ Aygıtı"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1395,7 +1360,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1430,12 +1395,12 @@ msgstr "DNS Sunucusu yapılandırılıyor"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Haber Sunucusu"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Sisteminiz ikincil DNS Sunucusu olarak yapılandırılıyor ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1523,7 +1488,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internet bilgisayar adları \"bilgisayar.alan.turu\" şeklinde olmalı. Örneğin "
@@ -1576,15 +1541,6 @@ msgstr ""
 "Internet Posta Servislerinizi yapılandırmak için gereken parametreleri "
 "sihirbaz şu şekilde belirledi:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Bu değerleri kabul etmek ve sunucunuzu yapılandırmak için İleri tuşuna "
-"tıklayın ya da Geri tuşunu kullanarak değerleri düzeltin."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1721,6 +1677,20 @@ msgid "Disk space (MB):"
 msgstr "Disk alanı (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Erişim Denetimi"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"İhtiyaçlarınıza uygun bir seviye seçin. Eğer hangisini seçeceğinizden emin "
+"değilseniz, Yerel Ağ genellikle en uygun olanıdır. Hepsi'nin güvenli "
+"olmayabileceğine dikkat edin."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1791,6 +1761,15 @@ msgstr ""
 "Vekil sunucunuzu yapılandırmak için gereken parametreleri sihirbaz şu "
 "şekilde belirledi:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Bu değerleri kabul etmek ve sunucunuzu yapılandırmak için İlerituşuna "
+"tıklayın ya da Geri tuşunu kullanarak değerleri düzeltin."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2161,15 +2140,16 @@ msgstr "Samba sihibazı"
 msgid "%s does not exist."
 msgstr "%s mevcut değil."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Hepsi - Erişim kısıtlaması yok"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Benim Kurallarım - Makinelerin izinli veya yasaklı olmalarını bana sor"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba Yapılandırma Sihirbazı"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2178,6 +2158,10 @@ msgstr ""
 "sunucusu olabilmesini sağlar."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba Yapılandırma Sihirbazı"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2200,7 +2184,7 @@ msgid "The Workgroup is wrong"
 msgstr "Çalışmagrubu yanlış"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Sunucu Başlığı."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2215,13 +2199,9 @@ msgid "Banner:"
 msgstr "Başlık:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Sunucu Başlığı yanlış"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Erişim denetimi"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Erişim seviyesi :"
@@ -2229,7 +2209,7 @@ msgstr "Erişim seviyesi :"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Örnek 1: tüm 150.203.*.* içindeki bir tanesi dışındakilere izin ver\\nhost "
@@ -2279,7 +2259,7 @@ msgid "Deny hosts:"
 msgstr "Reddedilmiş makinalar:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Etkin Samba Servisleri"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2296,7 +2276,7 @@ msgid "Enable file sharing area"
 msgstr "Dosya paylaşım alanını etkinleştir"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Yazıcı Paylaşımını etkinleştir"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2336,7 +2316,7 @@ msgstr ""
 "@users, @wheel"
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "okuma listesi:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2344,7 +2324,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "yazma listesi:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2368,15 +2348,15 @@ msgstr ""
 "belirledi:"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Sunucu Başlığı:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Dosya Paylaşımı:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Yazıcı Sunucusu:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2435,15 +2415,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Listeden bir birincil ve ikincil sunucu seçin."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Zaman Sunucuları"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Birincil Zaman Sunucusu"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "İkincil Zaman Sunucusu:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2519,16 +2499,16 @@ msgid "Web wizard"
 msgstr "Web sihirbazı"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Bu sihirbaz ağınız için Web Sunucusunu yapılandırmada size yardımcı olacak."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Web Sunucusu Yapılandırma Sihirbazı"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Web Sunucunuzu etkinleştirmek istemiyorsanız hiçbir kutuya işaret koymayın."
 
@@ -2537,23 +2517,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Etkinleştirmek istediğiniz Web servisini seçin:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web Sunucusu"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Sunucunuz hem yerel ağınızda (intranetinizde) hem de Internet'te Web "
 "Sunucusu olarak davranabilir."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Web Sunucusunu Intranet için etkinleştir"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Web Sunucusunu Internet için etkinleştir"
 
 #: ../web_wizard/Apache.pm:90
@@ -2597,18 +2577,18 @@ msgstr "kullanıcı http alt-dizini : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Döküman kökü yapmak istediğiniz dizinin yolunu giriniz."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Döküman Kökü:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Döküman kökü:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Web Sunucusu yapılandırılıyor"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Web Sunucunuzu yapılandırmak için gereken parametreleri sihirbaz şu şekilde "
 "belirledi:"
@@ -2621,16 +2601,12 @@ msgstr "Intranet web sunucusu:"
 msgid "Internet web server:"
 msgstr "Internet web sunucusu:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Döküman kökü:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Kullanıcı dizini:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Sihirbaz, Intranet/Internet Web Sunucunuzu başarılı bir şekilde yapılandırdı."
 
@@ -2644,6 +2620,43 @@ msgstr "Apache web sunucusu:"
 msgid "Configuring your system as Apache server ..."
 msgstr "Sisteminiz ikincil DNS Sunucusu olarak yapılandırılıyor ..."
 
+#~ 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ı."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP Sunucusu"
+
+#~ msgid "News Server"
+#~ msgstr "Haber Sunucusu"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS Sunucusu"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Haber Sunucusu"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "NFS Sunucusu"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "Ağ Aygıtı"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Bu değerleri kabul etmek ve sunucunuzu yapılandırmak için İleri tuşuna "
+#~ "tıklayın ya da Geri tuşunu kullanarak değerleri düzeltin."
+
+#~ msgid "Document Root:"
+#~ msgstr "Döküman Kökü:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Internet Posta yapılandırılıyor"
 
@@ -2716,7 +2729,7 @@ msgstr "Sisteminiz ikincil DNS Sunucusu olarak yapılandırılıyor ..."
 #~ "Uyarı\n"
 #~ "dhcp kullanıyorsunuz, sunucu bu yapılandırmayla çalışmayabilir."
 
-#~ msgid "I Will configure your install server with those parameters"
+#~ msgid "I Will configure your install server with these parameters"
 #~ msgstr "Kurulum sunucunuzu şu parametrelerle yapılandıracağım"
 
 #~ msgid ""
diff --git a/po/uk.po b/po/uk.po
index ef793e20..7e855feb 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+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"
@@ -43,7 +43,7 @@ msgstr "�������."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -197,7 +197,10 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "��� ��ͦ���� �������� ����������� ���צ�� DHCP ������ �������."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -215,16 +218,16 @@ msgstr ""
 "����� ���æ������ ������, �� ������ �������� �������� �����������Φ ��������."
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "�������� IP-������:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "������� IP-������:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "IP �����:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -252,7 +255,7 @@ msgid "The IP of the server must not be in range."
 msgstr "IP ������� �� ������� ���� � �������̦"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "���������� ������ DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -288,7 +291,8 @@ msgid "Interface:"
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "��ͦ���� ��Ц��� ���������� ���צ�� DHCP �� ������ �����Ҧ."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -563,22 +567,19 @@ msgid "Apache web server"
 msgstr "�������� ���-������:"
 
 #: ../drakwizard.pl:41
-#, fuzzy
 msgid "DHCP server"
-msgstr "������ NFS"
+msgstr "������ DHCP"
 
 #: ../drakwizard.pl:42
-#, fuzzy
 msgid "DNS server"
-msgstr "������ NFS"
+msgstr "������ DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 #, fuzzy
 msgid "News server"
 msgstr "������ �����"
 
-#: ../drakwizard.pl:44
-#, fuzzy
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "������ NFS"
 
@@ -587,8 +588,7 @@ msgstr "������ NFS"
 msgid "Mail server"
 msgstr "����� ������� �����:"
 
-#: ../drakwizard.pl:46
-#, fuzzy
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "������ FTP"
 
@@ -654,40 +654,36 @@ msgid "FTP wizard"
 msgstr "��ͦ���� FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "��ͦ���� ������������ ������� FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "��� ��ͦ���� �������� ��� ����������� FTP-������ ��� ���ϧ ����֦."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "������ FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "����Ҧ�� ��� ���צ�� FTP, ���� �� ������ ����������:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "��� ������ ���� Ħ��� �� FTP-������ ���ϧ ����Ҧ���ϧ (��������) ����֦, ��� "
 "�� FTP-������ ��� ���������."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "��������� FTP-������ ��� Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "��������� FTP-������ ��� ���������"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -699,7 +695,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -715,11 +711,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -746,8 +742,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -755,14 +751,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "�������, ��� ���Ҧ��� ���� ����� ��ͦΦ��������, ��� �� �������..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "������������ ������� FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "��ͦ���� ڦ���� ������Φ ��Φ, �˦ ���Ҧ�Φ ��� ������������ ������ FTP- "
 "�������"
@@ -777,11 +773,11 @@ msgstr ""
 "�����Φ�� \"�����\", ��� �ͦ���� ��."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "�������� FTP-������: "
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "�������� FTP-������:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -805,7 +801,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "��ͦ���� ��Ц��� ���������� ��� ��������/�������� FTP-������"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -853,11 +849,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1081,7 +1077,7 @@ msgstr "������� ������� �� ��ͦ����� �����"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "����� ����� � �������Ԧ �����Φ ���� � �����Ħ \\������.�����.���_������\"; "
@@ -1089,10 +1085,6 @@ msgstr ""
 "� \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "������ �����"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1101,24 +1093,24 @@ msgstr ""
 "����֦; �� ����� �������� �������������� ����� �����������."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "����� ������� �����:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "� ��������Ԧ צ� ����Ԧ ������ ��������-��'���� ��Ҧ�� ���������� ���� "
 "�ͦ�������� ͦ� 6 � 24 ��������."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "��Ҧ�� ����������"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1127,7 +1119,7 @@ msgstr ""
 "���̦������� ������������."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "��Ҧ�� ���������� (� �������):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1145,31 +1137,30 @@ msgstr "������������ ��������-�����"
 #: ../news_wizard/Inn.pm:86
 #, fuzzy
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ ��� ������������ ���צ�� "
 "��������-�����:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "��� �������� æ �������� � ����������� ��� ������, �����Φ�� \"��̦\" ��� "
 "�����Φ�� \"�����\", ��� �ͦ���� ��."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "������ �����:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "�������� ����������:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "��ͦ���� ��Ц��� ���������� ��� ������ ��������-�����."
@@ -1179,7 +1170,6 @@ msgid "NFS Wizard"
 msgstr "��ͦ���� NFS "
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "��� - ��� ��������� �������."
 
@@ -1192,25 +1182,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "��ͦ���� ������������ NFS-�������"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "��� ��ͦ���� �������� ��� ����������� ������ NFS ��� ���ϧ ����֦."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "������ NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "����:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "�������� �������"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "����Ҧ�� Ҧ����, ���� ��¦���� צ���צ��� ����� ��������. ���� �� �� ������, "
@@ -1259,7 +1246,7 @@ msgid "Netmask :"
 msgstr "�����:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "��ͦ���� ��Ц��� ���������� ��� NFS-������"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1268,28 +1255,24 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
 #, fuzzy
-msgid "NIS Server with autofs map"
+msgid "NIS server with autofs map"
 msgstr "������ �����"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "IP-������ �̦����:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
-msgid "NIS server with autofs map"
-msgstr "������ �����"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1305,19 +1288,20 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
 #, fuzzy
-msgid "NIS Server:"
+msgid "NIS server:"
 msgstr "������ NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1335,12 +1319,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-#, fuzzy
-msgid "NIS server:"
-msgstr "������ NFS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 #, fuzzy
 msgid "Home NIS:"
@@ -1362,23 +1340,6 @@ msgstr "��ͦ���� ��Ц��� ���������� ��� ������ Samba."
 msgid "NIS directory:"
 msgstr "���� �����������:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-#, fuzzy
-msgid "Network File:"
-msgstr "��������� �����Ҧ�"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1391,7 +1352,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1426,12 +1387,12 @@ msgstr "���������� DNS-������"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
 #, fuzzy
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "������ �����"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "���������� DNS-������"
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1520,7 +1481,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "����� ����� � �������Ԧ ������� ���� � ��˦� ���ͦ \\������.�����.���_������"
@@ -1573,15 +1534,6 @@ msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ ��� ������������ ������ "
 "���צ�� ��������-�����:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"��� �������� æ �������� � ����������� ��� ������, �����Φ�� \"��̦\" ��� "
-"�����Φ�� \"�����\", ��� �ͦ���� ��."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1719,6 +1671,20 @@ msgid "Disk space (MB):"
 msgstr "����� �� ����� (��):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "�������� �������"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"����Ҧ�� Ҧ����, ���� ��¦���� צ���צ��� ����� ��������. ���� �� �� ������, "
+"�� ��� ���Ҧ���, �� Ҧ���� �������ϧ ����֦ ���� ��������� �������. ����Φ�� "
+"����� �� ��, �� Ҧ���� ��� ���� �� ����������� ������ϧ �������."
+
+#: ../proxy_wizard/Squid.pm:104
 #, fuzzy
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
@@ -1786,6 +1752,15 @@ msgid ""
 msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ ��� ������������ ����Ӧ:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"��� �������� æ �������� � ����������� ��� ������, �����Φ�� \"��̦\" ��� "
+"�����Φ�� \"�����\", ��� �ͦ���� ��."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "����:"
@@ -2151,15 +2126,16 @@ msgstr "��ͦ���� Samba"
 msgid "%s does not exist."
 msgstr "%s �� ���դ."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "��� - ��� ��������� �������."
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "�ϧ ������� - ���������� ���� ��� �������Φ � ��������Φ ������"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "��ͦ���� ������������ Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2168,6 +2144,10 @@ msgstr ""
 "������� ����æ� �� ��-̦���� ��������."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "��ͦ���� ������������ Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "��� ��ͦ���� �������� ��� ����������� ���צ�� Samba �� ������ �����Ҧ."
@@ -2190,7 +2170,7 @@ msgid "The Workgroup is wrong"
 msgstr "������ ����� �����������."
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "����� �������."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2206,13 +2186,9 @@ msgid "Banner:"
 msgstr "�����:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "����� ������� ��צ����"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "�������� �������"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "����� �������:"
@@ -2220,7 +2196,7 @@ msgstr "����� �������:"
 #: ../samba_wizard/Samba.pm:119
 #, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* ������� 1: ��������� �Ӧ IP � 150.203.*.*; �� �������� ��Φ��\\nhosts "
@@ -2269,7 +2245,7 @@ msgid "Deny hosts:"
 msgstr "���������� ������:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "�צ����� ���צ�� Samba"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2286,7 +2262,7 @@ msgid "Enable file sharing area"
 msgstr "�צ������ ������� �Ц������ ������������"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "��������� �����Ħ����� ������ �� ������� �����"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2325,7 +2301,7 @@ msgstr ""
 "\\'@\\'), ��������� :\\nroot, fred, @users, @wheel ��� ������� ���� �������."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "������ �������:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2333,7 +2309,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "������ ������:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2357,15 +2333,15 @@ msgstr ""
 "��ͦ���� ڦ���� ������Φ ���������, �˦ ���Ҧ�Φ ��� ������������ Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "����� �������:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "������ ������ �� �����:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "������ �����:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2424,15 +2400,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "����Ҧ�� ��������� � ��������� ������� ڦ ������."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "����צ �������"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "��������� ������� ������:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "��������� ������� ������:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2508,15 +2484,15 @@ msgid "Web wizard"
 msgstr "��ͦ���� ����"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "��� ��ͦ���� �������� ��� ����������� ���-������ ��� ���ϧ ����֦."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "��ͦ���� ������������ ���-�������"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "�� ��¦�� ������ צ�ͦ���, ���� �� ������ �צ������ ��� ���-������."
 
 #: ../web_wizard/Apache.pm:77
@@ -2524,23 +2500,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "����Ҧ�� ��� ���-���צ��, ���� �� ������ ����צ������:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "���-������"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "��� ������ ���� ���� ���-�������� ��� ���ϧ ͦ����ϧ ����֦ (intranet) ����-"
 "�������� ��� ���������"
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "�צ������ ���-������ ��� ��������"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "�צ������ ���-������ ��� ���������"
 
 #: ../web_wizard/Apache.pm:90
@@ -2583,18 +2559,18 @@ msgstr "������ http-���� ����������� : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "���Ħ�� ���� �� ����, ��� �� ������ ������� ͦ���� ��� �������Ԧ�."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "����� ��� �������Ԧ�:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "������������ ���-�������"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "��ͦ���� ڦ���� ������Φ ��Φ, �˦ ���Ҧ�Φ ��� ������������ ������ ���-"
 "�������"
@@ -2607,16 +2583,12 @@ msgstr "�������� ���-������:"
 msgid "Internet web server:"
 msgstr "�������� ���-������:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "����� ��� �������Ԧ�:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "���� �����������:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "��ͦ���� ��Ц��� ���������� ��� ��������/�������� ���-������"
 
 #: ../web_wizard/Apache.pm:236
@@ -2629,6 +2601,41 @@ msgstr "�������� ���-������:"
 msgid "Configuring your system as Apache server ..."
 msgstr "���������� DNS-������"
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "��ͦ���� ��Ц��� ���������� ���צ�� DHCP �� ������ �����Ҧ."
+
+#~ msgid "FTP Server"
+#~ msgstr "������ FTP"
+
+#~ msgid "News Server"
+#~ msgstr "������ �����"
+
+#~ msgid "NFS Server"
+#~ msgstr "������ NFS"
+
+#, fuzzy
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "������ �����"
+
+#, fuzzy
+#~ msgid "NIS Server:"
+#~ msgstr "������ NFS"
+
+#, fuzzy
+#~ msgid "Network File:"
+#~ msgstr "��������� �����Ҧ�"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "��� �������� æ �������� � ����������� ��� ������, �����Φ�� \"��̦\" ��� "
+#~ "�����Φ�� \"�����\", ��� �ͦ���� ��."
+
+#~ msgid "Document Root:"
+#~ msgstr "����� ��� �������Ԧ�:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "������������ ��������-�����"
 
diff --git a/po/uz.po b/po/uz.po
index 197d9647..9f8bc508 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-16 00:06+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -41,7 +41,7 @@ msgstr "Хато."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -190,7 +190,10 @@ msgstr ""
 "Бу ёрдамчи серверингиз учун DHCP хизматларини мослашда сизга ёрдам беради."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -205,15 +208,15 @@ msgid ""
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Энг кичкина IP рақам:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Энг катта IP рақам:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Гэйтвейниг IP рақам:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -237,7 +240,7 @@ msgid "The IP of the server must not be in range."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP сервери мосланмоқда"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -271,7 +274,8 @@ msgid "Interface:"
 msgstr "Интерфейс:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Ёрдамчи серверингизнинг DHCP хизматларини муваффақиятли мослади."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -528,11 +532,11 @@ msgstr "DHCP сервери"
 msgid "DNS server"
 msgstr "DNS сервери"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Янги сервер"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS сервери"
 
@@ -540,7 +544,7 @@ msgstr "NFS сервери"
 msgid "Mail server"
 msgstr "Хат-хабар сервери"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP сервери"
 
@@ -598,40 +602,36 @@ msgid "FTP wizard"
 msgstr "FTP ёрдамчи"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP серверини мослаш учун ёрдамчи"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "Бу ёрдамчи тармоғингиз учун FTP серверини мослашда сизга ёрдам беради."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP сервери"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Серверингиз ички тармоқ (интранет) ва Интернет учун FTP сервери сифатида "
 "хизмат қилиши мумкин."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Интранет учун FTP серверини ёқиш"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Интернет учун FTP серверини ёқиш"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -643,7 +643,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -659,11 +659,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -688,8 +688,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 # M:
@@ -698,14 +698,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Узр, буни бажариш учун сиз root бўлишингиз керак"
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP серверини мослаяпман"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "FTP серверингизни мослаш учун ёрдамчи\n"
 "қуйидаги параметрларни аниқлади"
@@ -720,11 +720,11 @@ msgstr ""
 "тугмасини босинг, уларни ўзгартириш учун \"Орқага\" тугмасидан фойдаланинг"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Интранет учун FTP сервер:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Интернет учун FTP сервер:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -748,7 +748,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Ёрдамчи Интранет/Интернет учун FTP серверингизни муваффақиятли мослади."
 
@@ -796,11 +796,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Ўрнатиш сервери қуйидаги параметрлар билан мосланади"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1009,43 +1009,39 @@ msgstr "Янгиликлар серверини мослаш ёрдамчиси�
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Янгиликлар сервери"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Янгиликлар серверининг номи:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:76
@@ -1062,31 +1058,30 @@ msgstr "Интернет янгиликлар серверини мослаяп�
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Интернет янгиликлар хизматини мослаш учун\n"
 "ёрдамчи қуйидаги параметрларни аниқлади"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Бу қийматларни қабул қилиш ва серверингизни мослаш учун \"Кейингиси\" "
-"тугмасини босинг, уларни ўзгартириш учун \"Орқага\" тугмасидан фойдаланинг."
+"тугмасини босинг, уларни ўзгартириш учун \"Орқага\" тугмасидан фойдаланинг"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Янгиликлар сервери:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1097,7 +1092,6 @@ msgid "NFS Wizard"
 msgstr "NFS ёрдамчиси"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Ҳамма - ҳаммага рухсат"
 
@@ -1110,25 +1104,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS серверини мослаш учун ёрдамчи"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Бу ёрдамчи тармоғингиз учун NFS серверини мослашда сизга ёрдам беради."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS сервери"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Директория:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Талабингизга жавоб берадиган даражани танланг. Агар билмасангиз, одатда "
@@ -1175,7 +1166,7 @@ msgid "Netmask :"
 msgstr "Тармоқ маскаси:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Ёрдамчи NFS серверингизни муваффақиятли мослади."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1184,26 +1175,23 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr ""
 
 # M:
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS клиенти"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1219,18 +1207,19 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS сервери:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1248,11 +1237,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS сервери:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr ""
@@ -1271,22 +1255,6 @@ msgstr ""
 msgid "NIS directory:"
 msgstr "NIS директория:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Тармоқ файли:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
@@ -1298,7 +1266,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1328,12 +1296,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Система иккиламчи DNS сервер сифатида мосланмоқда..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1418,7 +1386,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
@@ -1466,15 +1434,6 @@ msgstr ""
 "Интернет хат-хабар хизматини мослаш учун ёрдамчи қуйидаги параметрларни "
 "аниқлади:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Бу қийматларни қабул қилиш ва серверингизни мослаш учун \"Кейингиси\" "
-"тугмасини босинг, уларни ўзгартириш учун \"Орқага\" тугмасидан фойдаланинг"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1601,6 +1560,20 @@ msgid "Disk space (MB):"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Талабингизга жавоб берадиган даражани танланг. Агар билмасангиз, одатда "
+"\"Локал тармоқ\" даражаси кўп ҳолларда талабга мос келади. Эсингизда турсин, "
+"\"Ҳамма\" даражаси хафвсиз эмас бўлиши мумкин."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 
@@ -1660,6 +1633,15 @@ msgid ""
 msgstr ""
 "Прокси серверингизни мослаш учун ёрдамчи қуйидаги параметрларни аниқлади:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Бу қийматларни қабул қилиш ва серверингизни мослаш учун \"Кейингиси\" "
+"тугмасини босинг, уларни ўзгартириш учун \"Орқага\" тугмасидан фойдаланинг."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Порт:"
@@ -2014,21 +1996,26 @@ msgstr "Самба ёрдамчиси"
 msgid "%s does not exist."
 msgstr "%s мавжуд эмас."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Ҳамма - ҳаммага рухсат"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Самба серверини мослаш учун ёрдамчи"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Самба серверини мослаш учун ёрдамчи"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2051,7 +2038,7 @@ msgid "The Workgroup is wrong"
 msgstr "Ишчи гуруҳи нотўғри"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
@@ -2065,11 +2052,7 @@ msgid "Banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
-msgstr ""
-
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
+msgid "The server banner is incorrect"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:114
@@ -2078,7 +2061,7 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2115,7 +2098,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Samba хизматларини ёқиш"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2130,7 +2113,7 @@ msgid "Enable file sharing area"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:142
@@ -2164,7 +2147,7 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2172,7 +2155,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:182
@@ -2192,15 +2175,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "Samba серверини мослаш учун ёрдамчи қуйидаги параметрларни аниқлади."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Босиб чиқариш сервери:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2258,15 +2241,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Рўйхатдан асосий ва иккиламчи серверларни танланг."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Вақт серверлари"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Асосий вақт сервери:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Иккиламчи вақт сервери:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2336,15 +2319,15 @@ msgid "Web wizard"
 msgstr "Веб ёрдамчи"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Бу ёрдамчи тармоғингиз учун Веб серверини мослашда сизга ёрдам беради."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Веб серверини мослаш учун ёрдамчи"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
@@ -2352,21 +2335,21 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Веб сервери"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:90
@@ -2400,18 +2383,18 @@ msgstr ""
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Веб серверини мослаяпман"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "Веб серверингизни мослаш учун ёрдамчи қуйидаги параметрларни аниқлади:"
 
 #: ../web_wizard/Apache.pm:137
@@ -2422,16 +2405,12 @@ msgstr "Интранет учун веб сервер:"
 msgid "Internet web server:"
 msgstr "Интернет веб сервер:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr ""
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Фойдаланувчининг директорияси:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Ёрдамчи Интранет/Интернет учун Веб серверингизни муваффақиятли мослади."
 
@@ -2443,6 +2422,32 @@ msgstr "Apache сервери"
 msgid "Configuring your system as Apache server ..."
 msgstr "Система Apache сервер сифатида мосланмоқда..."
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Ёрдамчи серверингизнинг DHCP хизматларини муваффақиятли мослади."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP сервери"
+
+#~ msgid "News Server"
+#~ msgstr "Янгиликлар сервери"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS сервери"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS сервери:"
+
+#~ msgid "Network File:"
+#~ msgstr "Тармоқ файли:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Бу қийматларни қабул қилиш ва серверингизни мослаш учун \"Кейингиси\" "
+#~ "тугмасини босинг, уларни ўзгартириш учун \"Орқага\" тугмасидан фойдаланинг"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Интернет хат-хабар сервери мосланмоқда"
 
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index 9c80ff0f..da55e82d 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-16 00:06+0100\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -41,7 +41,7 @@ msgstr "Xato."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -194,7 +194,10 @@ msgstr ""
 "beradi."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
@@ -209,15 +212,15 @@ msgid ""
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Eng kichkina IP raqam:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Eng katta IP raqam:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Geytveynig IP raqam:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -241,7 +244,7 @@ msgid "The IP of the server must not be in range."
 msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "DHCP serveri moslanmoqda"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -276,7 +279,8 @@ msgid "Interface:"
 msgstr "Interfeys:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Yordamchi serveringizning DHCP xizmatlarini muvaffaqiyatli mosladi."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -533,11 +537,11 @@ msgstr "DHCP serveri"
 msgid "DNS server"
 msgstr "DNS serveri"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Yangi server"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS serveri"
 
@@ -545,7 +549,7 @@ msgstr "NFS serveri"
 msgid "Mail server"
 msgstr "Xat-xabar serveri"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP serveri"
 
@@ -604,41 +608,37 @@ msgid "FTP wizard"
 msgstr "FTP yordamchi"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP serverini moslash uchun yordamchi"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Bu yordamchi tarmog'ingiz uchun FTP serverini moslashda sizga yordam beradi."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP serveri"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Serveringiz ichki tarmoq (intranet) va Internet uchun FTP serveri sifatida "
 "xizmat qilishi mumkin."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Intranet uchun FTP serverini yoqish"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Internet uchun FTP serverini yoqish"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -650,7 +650,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -666,11 +666,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -695,8 +695,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 # M:
@@ -705,14 +705,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Uzr, buni bajarish uchun siz root bo'lishingiz kerak"
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "FTP serverini moslayapman"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "FTP serveringizni moslash uchun yordamchi\n"
 "quyidagi parametrlarni aniqladi"
@@ -727,11 +727,11 @@ msgstr ""
 "tugmasini bosing, ularni o'zgartirish uchun \"Orqaga\" tugmasidan foydalaning"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet uchun FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet uchun FTP server:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -755,7 +755,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Yordamchi Intranet/Internet uchun FTP serveringizni muvaffaqiyatli mosladi."
 
@@ -803,11 +803,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "O'rnatish serveri quyidagi parametrlar bilan moslanadi"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1016,43 +1016,39 @@ msgstr "Yangiliklar serverini moslash yordamchisiga marhamat"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Yangiliklar serveri"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Yangiliklar serverining nomi:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:76
@@ -1069,32 +1065,30 @@ msgstr "Internet yangiliklar serverini moslayapman"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Internet yangiliklar xizmatini moslash uchun\n"
 "yordamchi quyidagi parametrlarni aniqladi"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "Bu qiymatlarni qabul qilish va serveringizni moslash uchun \"Keyingisi\" "
-"tugmasini bosing, ularni o'zgartirish uchun \"Orqaga\" tugmasidan "
-"foydalaning."
+"tugmasini bosing, ularni o'zgartirish uchun \"Orqaga\" tugmasidan foydalaning"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Yangiliklar serveri:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1106,7 +1100,6 @@ msgid "NFS Wizard"
 msgstr "NFS yordamchisi"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Hamma - hammaga ruxsat"
 
@@ -1119,26 +1112,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS serverini moslash uchun yordamchi"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Bu yordamchi tarmog'ingiz uchun NFS serverini moslashda sizga yordam beradi."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS serveri"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Direktoriya:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr ""
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Talabingizga javob beradigan darajani tanlang. Agar bilmasangiz, odatda "
@@ -1185,7 +1175,7 @@ msgid "Netmask :"
 msgstr "Tarmoq maskasi:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Yordamchi NFS serveringizni muvaffaqiyatli mosladi."
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1194,26 +1184,23 @@ msgid ""
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr ""
 
 # M:
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS klienti"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1229,18 +1216,19 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS serveri:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1258,11 +1246,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS serveri:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr ""
@@ -1281,22 +1264,6 @@ msgstr ""
 msgid "NIS directory:"
 msgstr "NIS direktoriya:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Tarmoq fayli:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr ""
@@ -1308,7 +1275,7 @@ msgstr ""
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1338,12 +1305,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Sistema ikkilamchi DNS server sifatida moslanmoqda..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1428,7 +1395,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
@@ -1476,15 +1443,6 @@ msgstr ""
 "Internet xat-xabar xizmatini moslash uchun yordamchi quyidagi parametrlarni "
 "aniqladi:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Bu qiymatlarni qabul qilish va serveringizni moslash uchun \"Keyingisi\" "
-"tugmasini bosing, ularni o'zgartirish uchun \"Orqaga\" tugmasidan foydalaning"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1613,6 +1571,20 @@ msgid "Disk space (MB):"
 msgstr ""
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Talabingizga javob beradigan darajani tanlang. Agar bilmasangiz, odatda "
+"\"Lokal tarmoq\" darajasi ko'p hollarda talabga mos keladi. Esingizda "
+"tursin, \"Hamma\" darajasi xafvsiz emas bo'lishi mumkin."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 
@@ -1672,6 +1644,16 @@ msgid ""
 msgstr ""
 "Proksi serveringizni moslash uchun yordamchi quyidagi parametrlarni aniqladi:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Bu qiymatlarni qabul qilish va serveringizni moslash uchun \"Keyingisi\" "
+"tugmasini bosing, ularni o'zgartirish uchun \"Orqaga\" tugmasidan "
+"foydalaning."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2026,21 +2008,26 @@ msgstr "Samba yordamchisi"
 msgid "%s does not exist."
 msgstr "%s mavjud emas."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Hamma - hammaga ruxsat"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba serverini moslash uchun yordamchi"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba serverini moslash uchun yordamchi"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -2064,7 +2051,7 @@ msgid "The Workgroup is wrong"
 msgstr "Ishchi guruhi noto'g'ri"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:92
@@ -2078,11 +2065,7 @@ msgid "Banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
-msgstr ""
-
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
+msgid "The server banner is incorrect"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:114
@@ -2091,7 +2074,7 @@ msgstr ""
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2128,7 +2111,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Samba xizmatlarini yoqish"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2143,7 +2126,7 @@ msgid "Enable file sharing area"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:142
@@ -2177,7 +2160,7 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2185,7 +2168,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:182
@@ -2206,15 +2189,15 @@ msgstr ""
 "Samba serverini moslash uchun yordamchi quyidagi parametrlarni aniqladi."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Bosib chiqarish serveri:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2272,15 +2255,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Ro'yxatdan asosiy va ikkilamchi serverlarni tanlang."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Vaqt serverlari"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Asosiy vaqt serveri:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Ikkilamchi vaqt serveri:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2350,16 +2333,16 @@ msgid "Web wizard"
 msgstr "Veb yordamchi"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Bu yordamchi tarmog'ingiz uchun Veb serverini moslashda sizga yordam beradi."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Veb serverini moslash uchun yordamchi"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
@@ -2367,21 +2350,21 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Veb serveri"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:90
@@ -2415,18 +2398,18 @@ msgstr ""
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Veb serverini moslayapman"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Veb serveringizni moslash uchun yordamchi quyidagi parametrlarni aniqladi:"
 
@@ -2438,16 +2421,12 @@ msgstr "Intranet uchun veb server:"
 msgid "Internet web server:"
 msgstr "Internet veb server:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr ""
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Foydalanuvchining direktoriyasi:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Yordamchi Intranet/Internet uchun Veb serveringizni muvaffaqiyatli mosladi."
 
@@ -2459,6 +2438,33 @@ msgstr "Apache serveri"
 msgid "Configuring your system as Apache server ..."
 msgstr "Sistema Apache server sifatida moslanmoqda..."
 
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Yordamchi serveringizning DHCP xizmatlarini muvaffaqiyatli mosladi."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP serveri"
+
+#~ msgid "News Server"
+#~ msgstr "Yangiliklar serveri"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS serveri"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS serveri:"
+
+#~ msgid "Network File:"
+#~ msgstr "Tarmoq fayli:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Bu qiymatlarni qabul qilish va serveringizni moslash uchun \"Keyingisi\" "
+#~ "tugmasini bosing, ularni o'zgartirish uchun \"Orqaga\" tugmasidan "
+#~ "foydalaning"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Internet xat-xabar serveri moslanmoqda"
 
diff --git a/po/vi.po b/po/vi.po
index 36ba1240..9ffd8844 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-04 12:31+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -44,7 +44,7 @@ msgstr "Lỗi."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -194,9 +194,11 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Nếu bạn muốn bật chạy PXE cho máy chủ DHCP của bạn, hãy đánh dấu vào hộp này."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -213,16 +215,16 @@ msgstr ""
 "trị đề nghị. (ví dụ: 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Địa chỉ IP thấp nhất:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Địa chỉ IP cao nhất:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
 #, fuzzy
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Gateway IP:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -246,7 +248,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Cấu hình máy chủ DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -282,7 +284,8 @@ msgid "Interface:"
 msgstr "Giao tiếp:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Đồ thuật đã cấu hình thành công các dịch vụ DHCP cho máy chủ của bạn."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -562,11 +565,11 @@ msgstr "Máy chủ DHCP"
 msgid "DNS server"
 msgstr "Máy chủ DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Máy chủ News"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Máy chủ NFS"
 
@@ -574,7 +577,7 @@ msgstr "Máy chủ NFS"
 msgid "Mail server"
 msgstr "Máy chủ Mail"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Máy chủ FTP"
 
@@ -632,41 +635,37 @@ msgid "FTP wizard"
 msgstr "Đồ thuật FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Đồ Thuật Cấu Hình Máy Chủ FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an 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:79
-msgid "FTP Server"
-msgstr "Máy chủ FTP"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Chọn loại dịch vụ FTP bạn muốn kích hoạt:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Bật chạy máy chủ FTP cho Intranet"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Bật chạy Máy Chủ FTP cho Internet"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Admin Email: địa chỉ email của người quản trị FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -682,7 +681,7 @@ msgstr "Cho phép FXP: cho phép truyền qua FTP khác."
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "Chroot Home user: người dùng sẽ chỉ thấy được thư mục của họ."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -698,11 +697,11 @@ msgid "Admin email:"
 msgstr "Admin email:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Cho phép đăng nhập root:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot Home user:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -730,8 +729,8 @@ msgstr ""
 #: ../ftp_wizard/Proftpd.pm:115
 #, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "Không thấy bash trong danh sách shell. Hãy chỉnh lại."
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -739,14 +738,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Xin lỗi, bạn phải là root để thực hiện việc này..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Cấu hình máy chủ FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây cần để\n"
 "cấu hình Máy Chủ FTP của bạn"
@@ -761,11 +760,11 @@ msgstr ""
 "Theo (Next) hoặc dùng nút Trở Lại (Back) để hiệu chỉnh chúng"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Máy chủ FTP Intranet:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Máy chủ FTP Internet:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -789,7 +788,7 @@ msgid "Allow FXP"
 msgstr "Cho phép FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "Đồ thuật đã hoàn thành cấu hình máy chủ FTP cho Intranet/Internet"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -840,11 +839,11 @@ msgstr "Lỗi, thư mục nguồn nên là thư mục có đầy đủ mọi th�
 
 #: ../installsrv_wizard/Installsrv.pm:79
 #, fuzzy
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "Thư mục đích đang được dùng, hãy chọn thư mục khác."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Máy chủ cài đặt sẽ được cấu hình bằng những tham số đó"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1060,7 +1059,7 @@ msgstr "Chào Mừng Đồ Thuật News"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Tên host cho internet phải có khuôn dạng \"host.domain.domaintype\"; ví dụ: "
@@ -1068,10 +1067,6 @@ msgstr ""
 "luôn là \"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Máy chủ News"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1080,24 +1075,24 @@ msgstr ""
 "tên luôn được cấp bởi nhà cung cấp của bạn."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Tên máy chủ News:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Phụ thuộc vào loại kết nối internet đang có, giai đoạn polling thích hợp có "
 "thể thay đổi trong khoảng 6 - 24 giờ."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Giai đoạn Polling"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1105,7 +1100,7 @@ msgstr ""
 "giai đoạn polling thiết lập khoảng thời gian giữa hai lần polling liên tiếp."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Giai đoạn Polling (Giờ):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1122,31 +1117,30 @@ msgstr "Cấu hình Internet News"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây\n"
 "cần để cấu hình Dịch Vụ Internet News của bạn:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 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."
+"Để chấp nhận các 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"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Máy chủ News:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Khoảng thời gian Polling:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1157,7 +1151,6 @@ msgid "NFS Wizard"
 msgstr "Đồ thuật NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Toàn bộ - Không hạn chế truy cập"
 
@@ -1170,25 +1163,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Đồ thuật cấu hình máy chủ NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "Đồ thuật này giúp cấu hình Máy Chủ NFS cho mạng của bạn."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Máy chủ NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Thư mục:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Điều khiển truy cập"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Chọn mức độ phù hợp với nhu cầu của bạn. Nếu bạn không biết, mức độ Mạng Cục "
@@ -1236,7 +1226,7 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Đồ thuật đã hoàn thành cấu hình máy chủ NFS của bạn"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1249,18 +1239,15 @@ msgstr ""
 "domainname đúng, không tương đương với localdomain hay không có gì. Hãy chạy "
 "drakconnect để hiệu chỉnh nó."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "Máy chủ NIS với autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Máy khách NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Máy chủ NIS với autofs map"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
@@ -1269,7 +1256,7 @@ msgstr "Lập máy chủ Nis với autofs map, tập tin auto.home và auto.mast
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Máy khách có thể tự động gắn kết (mount) thư mục home của họ khi họ đăng "
@@ -1288,18 +1275,19 @@ msgstr "Cấu hình máy tính thành máy khách NIS"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Bạn phải cung cấp nisdomain và nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Máy chủ NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS Domain:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1321,11 +1309,6 @@ msgstr "NIS domain: NIS domain cho máy chủ NIS của bạn."
 msgid "NIS server: name of your computer."
 msgstr "Máy chủ NIS: tên máy của bạn."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Máy chủ NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Home NIS:"
@@ -1345,23 +1328,6 @@ msgstr "Sẽ lập máy chủ NIS với autofs map"
 msgid "NIS directory:"
 msgstr "Thư mục NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Tập tin mạng:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-#, fuzzy
-msgid "NFS exports:"
-msgstr "Nfs exports:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Auto master:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Auto home:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1375,7 +1341,7 @@ msgstr "Máy chủ NIS: hostname của nisserver."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1408,12 +1374,12 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Cấu hình máy tính của bạn làm một máy chủ NIS với autofs map..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS với autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
 #, fuzzy
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Đang cấu hình hệ thống thành máy khách NIS..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1503,7 +1469,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Các tên chủ (hostname) Internet phải có khuôn dạng \"host.domain.domaintype"
@@ -1556,15 +1522,6 @@ msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây cần để cấu hình Dịch Vụ Internet "
 "Mail của bạn:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"Để chấp nhận các 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"
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1701,6 +1658,19 @@ msgid "Disk space (MB):"
 msgstr "Không gian đĩa (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Điều khiển truy cập"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Chọn mức độ phù hợp với nhu cầu của bạn. Nếu bạn không biết, mức độ Mạng Cục "
+"Bộ thường thích hợp nhất. Chú ý là mọi mức độ có thể không bảo mật."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "Có thể cấu hình proxy để dùng các mức điều khiển truy cập khác"
 
@@ -1766,6 +1736,15 @@ msgid ""
 msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây được cần để cấu hình proxy của bạn:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Để 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."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Port:"
@@ -2149,15 +2128,16 @@ msgstr "Đồ thuật Samba"
 msgid "%s does not exist."
 msgstr "%s không tồn tại."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Toàn bộ - Không hạn chế truy cập"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Quy tắc - Đề nghị cho phép và từ chối các host"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Đồ Thuật Cấu Hình Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2166,6 +2146,10 @@ msgstr ""
 "máy trạm không chạy hệ thống Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Đồ Thuật Cấu Hình Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Đồ thuật này sẽ giúp cấu hình các dịch vụ Samba của máy chủ của bạn."
@@ -2187,7 +2171,7 @@ msgid "The Workgroup is wrong"
 msgstr "Nhóm làm việc không đúng"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Banner máy chủ."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2202,20 +2186,16 @@ msgid "Banner:"
 msgstr "Banner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Banner máy chủ sai"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Điều khiển truy cập"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Mức độ truy cập:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Ví dụ 1: cho phép mọi IP trong 150.203.*.*; trừ một\n"
@@ -2262,7 +2242,7 @@ msgid "Deny hosts:"
 msgstr "Từ chối host:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Các dịch vụ Samba được bật chạy"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2280,7 +2260,7 @@ msgid "Enable file sharing area"
 msgstr "Bật chạy vùng chia sẻ tập tin"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Bật chạy Chia Sẻ Máy Chủ In Ấn"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2319,7 +2299,7 @@ msgstr ""
 "root, fred, @users, @wheel cho từng loại quyền hạn."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "đọc danh sách:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2327,7 +2307,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "ghi danh sách:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2350,15 +2330,15 @@ msgstr ""
 "cấu hình Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Banner máy chủ:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Chia sẻ tập tin:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Máy chủ in:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2417,15 +2397,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Chọn một máy chủ chính và phụ từ danh sách."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Máy Chủ Thời Gian"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Máy chủ Thời gian Chính:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Máy Chủ Thời Gian Phụ:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2499,15 +2479,15 @@ msgid "Web wizard"
 msgstr "Đồ Thuật Web"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "Đồ thuật này giúp cấu hình máy chủ Web cho mạng của bạn."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Đồ Thuật Cấu hình Máy Chủ WEB"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web 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ủ Web."
 
 #: ../web_wizard/Apache.pm:77
@@ -2515,23 +2495,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Chọn loại dịch vụ web bạn muốn kích hoạt:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Máy chủ Web"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Máy chủ của bạn có thể hoạt động như một Máy Chủ Web hướng về mạng nội bộ "
 "(intranet) và như một Máy Chủ Web cho Internet."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Bật chạy Máy Chủ Web cho Intranet"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Bật chạy Máy Chủ Web cho Internet"
 
 #: ../web_wizard/Apache.pm:90
@@ -2572,18 +2552,18 @@ msgstr "thư mục con http của người dùng : ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Gõ đường dẫn của thư mục bạn muốn là tài liệu root."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Tài Liệu Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Tài liệu root:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Cấu hình máy chủ web"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Đồ thuật đã thu thập các tham số sau đây cần để cấu hình Máy Chủ Web của bạn"
 
@@ -2595,16 +2575,12 @@ msgstr "Máy Chủ Web Intranet:"
 msgid "Internet web server:"
 msgstr "Máy Chủ Web Internet:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Tài liệu root:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Thư mục người dùng:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "Đồ thuật đã hoàn thành cấu hình Máy Chủ Web Intranet/Internet của bạn"
 
 #: ../web_wizard/Apache.pm:236
@@ -2617,6 +2593,54 @@ msgstr "Máy chủ web Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Cấu hình hệ thống làm máy chủ DNS phụ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr ""
+#~ "Nếu bạn muốn bật chạy PXE cho máy chủ DHCP của bạn, hãy đánh dấu vào hộp "
+#~ "này."
+
+#~ 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."
+
+#~ msgid "FTP Server"
+#~ msgstr "Máy chủ FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Máy chủ News"
+
+#~ msgid "NFS Server"
+#~ msgstr "Máy chủ NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Máy chủ NIS với autofs map"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Máy chủ NIS:"
+
+#~ msgid "Network File:"
+#~ msgstr "Tập tin mạng:"
+
+#, fuzzy
+#~ msgid "NFS exports:"
+#~ msgstr "Nfs exports:"
+
+#~ msgid "Auto master:"
+#~ msgstr "Auto master:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Auto home:"
+
+#, fuzzy
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "Để chấp nhận các 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"
+
+#~ msgid "Document Root:"
+#~ msgstr "Tài Liệu Root:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Cấu hình Internet Mail"
 
diff --git a/po/wa.po b/po/wa.po
index c7e5cb09..ac9d3679 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-25 13:11+0100\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -45,7 +45,7 @@ msgstr "Aroke."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -86,7 +86,8 @@ msgstr ""
 
 #: ../client_wizard/Bind_client.pm:55
 msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Ci macrea chal vos aidrè a radjouter on novea cliyint dins vosse DNS locå."
+msgstr ""
+"Ci macrea chal vos aidrè a radjouter on novea cliyint dins vosse DNS locå."
 
 #: ../client_wizard/Bind_client.pm:61
 msgid "(you don't need to type the domain after the name)"
@@ -100,7 +101,8 @@ msgstr "Idintifiaedje do cliyint:"
 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."
+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:126
 msgid ""
@@ -128,7 +130,8 @@ msgstr "Adviertixhmint"
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:89
 #: ../dns_wizard/Bind.pm:183 ../web_wizard/Apache.pm:85
 msgid "You are in dhcp, server may not work with your configuration."
-msgstr "Vos eployîz l' dhcp, li sierveu pout n' nén ovrer avou vost apontiaedje."
+msgstr ""
+"Vos eployîz l' dhcp, li sierveu pout n' nén ovrer avou vost apontiaedje."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71
@@ -143,7 +146,8 @@ msgstr "Aroke sistinme, nol apontiaedje di fwait"
 
 #: ../client_wizard/Bind_client.pm:83
 msgid "This is not a valid address... press next to continue"
-msgstr "Çouchal n' est nén ene adresse valide... clitchîz so «Shuvant» po continouwer"
+msgstr ""
+"Çouchal n' est nén ene adresse valide... clitchîz so «Shuvant» po continouwer"
 
 #: ../client_wizard/Bind_client.pm:88
 msgid "Adding a new client to your network"
@@ -192,13 +196,15 @@ msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:58
 msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Ci macrea chal vos aidrè a-z apontyî les siervices DHCP pol sierveu da vosse."
+msgstr ""
+"Ci macrea chal vos aidrè a-z apontyî les siervices DHCP pol sierveu da vosse."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
 msgstr ""
-"Si vos vloz mete PXE en alaedje po vosse sierveu DHCP clitchîz l' boesse "
-"s' i vs plait."
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -216,15 +222,15 @@ msgstr ""
 "propozêyes. (eg: 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Adresse IP li pus basse:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Adresse IP li pus hôte:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Adresse IP del pasrele:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -248,7 +254,7 @@ 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:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Apontiaedje do sierveu DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -284,8 +290,8 @@ msgid "Interface:"
 msgstr "Eterface:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-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."
+msgid "The wizard successfully configured the DHCP services."
+msgstr "Li macrea a-st apontyî comifåt les siervices DHCP."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
@@ -443,7 +449,8 @@ msgid "Default domain name to search:"
 msgstr "Prémetou no d' dominne a cweri:"
 
 #: ../dns_wizard/Bind.pm:168
-msgid "This is not a valid IP address for your forwarder... press next to continue"
+msgid ""
+"This is not a valid IP address for your forwarder... press next to continue"
 msgstr ""
 "Çouchal n' est nén ene adresse IP valide... clitchîz so «Shuvant» po "
 "continouwer"
@@ -513,7 +520,8 @@ msgid "Client with this identification will be removed from your DNS"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:233
-msgid "The DNS server is about to be configured with the following configuration"
+msgid ""
+"The DNS server is about to be configured with the following configuration"
 msgstr ""
 
 #: ../dns_wizard/Bind.pm:235
@@ -560,11 +568,11 @@ msgstr "Sierveu DHCP"
 msgid "DNS server"
 msgstr "Sierveu DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Sierveu di copinreyes"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Sierveu NFS"
 
@@ -572,7 +580,7 @@ msgstr "Sierveu NFS"
 msgid "Mail server"
 msgstr "Sierveu d' emilaedje"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Sierveu FTP"
 
@@ -630,16 +638,13 @@ msgid "FTP wizard"
 msgstr "Macrea FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Macrea d' apontiaedje do sierveu FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
-msgstr "Ci macrea chal vos aidrè a-z apontyî on sierveu FTP pol rantoele da vosse."
-
-#: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Sierveu FTP"
+msgid "This wizard will help you configuring an FTP server for your network."
+msgstr ""
+"Ci macrea chal vos aidrè a-z apontyî on sierveu FTP pol rantoele da vosse."
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
@@ -647,22 +652,22 @@ msgstr "Tchoezixhoz li sôre di siervice FTP ki vos vloz mete en alaedje:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Vosse sierveu FTP pout-st ovrer sol rantoele locåle (intranet) eyet sol "
 "daegntoele (internet)."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Mete en alaedje li sierveu FTP sol daegntoele"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Mete en alaedje li sierveu FTP sol daegntoele"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -674,7 +679,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -690,11 +695,11 @@ msgid "Admin email:"
 msgstr "Emile do manaedjeu:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Permete l' elodjaedje di root:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot dins l' ridant måjhon di l' uzeu:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -707,7 +712,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:106
 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."
+msgstr ""
+"Vos eployîz l' DHCP, li sierveu pout n' nén ovrer avou vost apontiaedje."
 
 #: ../ftp_wizard/Proftpd.pm:111
 msgid ""
@@ -717,8 +723,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -726,13 +732,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr "Dji rgrete, mins vos dvoz esse root po çoula..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Apontiaedje do sierveu FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "vosse sierveu FTP"
@@ -746,11 +752,11 @@ msgstr ""
 "«Shuvant» oudonbén sol boton «En erî» po lzès coridjî."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Sierveu FTP sol rantoele locåle:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Sierveu FTP sol daegntoele:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -774,7 +780,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+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 "
 "pol daegntoele"
@@ -823,11 +829,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1034,7 +1040,7 @@ msgstr "Bénvnowe å Macrea d' apontiaedje des copinreyes"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Les nos d' lodjoe internet divèt esse dizo l' cogne «lodjoe.dominne»; "
@@ -1042,38 +1048,34 @@ msgstr ""
 "serè-st åbitouwelmint «news.ahesseu.com»."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Sierveu di copinreyes"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "No do sierveu di copinreyes:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr ""
 
 #: ../news_wizard/Inn.pm:76
@@ -1090,32 +1092,31 @@ msgstr "Apontiaedje do sierveu di copinreyes (newsgroups)"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 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 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"Po-z accepter cisse valixhance la, ey apontyî vosse sierveu, clitchîz so "
-"«Shuvant» oudonbén sol boton «En erî» pol coridjî."
+"Po-z accepter ces valixhances la, ey apontyî vosse sierveu, clitchîz so "
+"«Shuvant» oudonbén sol boton «En erî» po lzès coridjî."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Sierveu di copinreyes:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr ""
 
-#: ../news_wizard/Inn.pm:96
-msgid "The wizard successfully configured your Internet News service of your server."
+#: ../news_wizard/Inn.pm:95
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr ""
 "Li macrea a-st apontyî comifåt li siervice di copinreyes pol sierveu da "
 "vosse."
@@ -1125,7 +1126,6 @@ msgid "NFS Wizard"
 msgstr "Macrea NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr ""
 
@@ -1138,25 +1138,23 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Macrea d' apontiaedje do sierveu NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr "Ci macrea chal vos aidrè a-z apontyî li sierveu NFS pol rantoele da vosse."
-
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Sierveu NFS"
+msgid "This wizard will help you configuring the NFS server for your network."
+msgstr ""
+"Ci macrea chal vos aidrè a-z apontyî li sierveu NFS pol rantoele da vosse."
 
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Ridant:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "Contrôle d' accès"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 
@@ -1200,7 +1198,7 @@ msgid "Netmask :"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Li macrea a-st apontyî comifåt vosse sierveu NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1211,25 +1209,22 @@ msgstr ""
 "Vos dvoz coridjî vosse no d' dominne NIS. Po on sierveu NIS vos dvoz aveur "
 "on no d' dominne corek, nén «localdomain» nerén on dominne vude."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "Sierveu NIS avou mapaedje autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Cliyint NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Sierveu NIS avou mapaedje autofs"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Li cliyint pout monter otomaticmint si ridant måjhon tot s' elodjant so ene "
@@ -1247,18 +1242,19 @@ msgstr "Apontiaedje di vosse sistinme come cliyint NIS"
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Sierveu NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Dominne NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1278,11 +1274,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr "Sierveu NIS: li no d' vosse copiutrece."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Sierveu NIS:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "Måjhon NIS:"
@@ -1300,22 +1291,6 @@ msgstr "Li macrea aponteyrè vosse sierveu NIS avou l' mapaedje autofs"
 msgid "NIS directory:"
 msgstr "Ridant NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Fitchî rantoele:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "Ebagaedjes NFS:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Måjhon otomatike:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "Dominne NIS: no do dominne NIS"
@@ -1327,7 +1302,7 @@ msgstr "Sierveu NIS: li no del copiutrece k' est sierveu NIS."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1344,7 +1319,8 @@ msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:142
 msgid "The wizard successfully configured your machine to be a NIS client."
-msgstr "Li macrea a-st apontyî comifåt vosse copiutrece po-z esse on cliyint NIS."
+msgstr ""
+"Li macrea a-st apontyî comifåt vosse copiutrece po-z esse on cliyint NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:149
 msgid ""
@@ -1359,11 +1335,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Apontiaedje di vosse sistinme come sierveu NIS avou mapaedje autofs..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "Sierveu NIS avou mapaedje autofs"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Apontiaedje di vosse sistinme come cliyint NIS..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1372,7 +1348,8 @@ msgstr "Macrea postfix"
 
 #: ../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."
+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"
@@ -1445,7 +1422,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 
@@ -1493,14 +1470,6 @@ msgstr ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "vosse siervice d' emilaedje sol daegntoele:"
 
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-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î."
-
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
 msgstr "Cogne di l' adresse"
@@ -1511,11 +1480,13 @@ msgstr "myorigin"
 
 #: ../postfix_wizard/Postfix.pm:144
 msgid "The wizard now will configure an internal mail server."
-msgstr "Li macrea va asteure apontyî on sierveu d' emilaedje sol rantoele locåle."
+msgstr ""
+"Li macrea va asteure apontyî on sierveu d' emilaedje sol rantoele locåle."
 
 #: ../postfix_wizard/Postfix.pm:149
 msgid "The wizard successfully configured your external mail server."
-msgstr "Li macrea a-st apontyî comifåt vosse sierveu d' emilaedje sol daegntoele."
+msgstr ""
+"Li macrea a-st apontyî comifåt vosse sierveu d' emilaedje sol daegntoele."
 
 #: ../postfix_wizard/Postfix.pm:171
 msgid "Check if sendmail is installed, to avoid conflict...."
@@ -1582,7 +1553,8 @@ msgid "Proxy port:"
 msgstr "Pôrt do procsi:"
 
 #: ../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 ""
 "Clitchîz so «Shuvant» si vos vloz wårder cisse valixhancechal; ou so «En "
 "erî» po coridjî vosse tchuze."
@@ -1597,10 +1569,12 @@ msgstr "Clitchîz so «En erî» po candjî si valixhance."
 
 #: ../proxy_wizard/Squid.pm:88
 msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Vos dvoz tchoezi on limero d' pôrt pus grand ki 1024 et pus ptit ki 65535"
+msgstr ""
+"Vos dvoz tchoezi on limero d' pôrt pus grand ki 1024 et pus ptit ki 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 ""
 "Li muchete sol deure plake c' est l' plaece sol deure plake ki pout esse "
 "eployeye po fé l' muchete."
@@ -1630,6 +1604,17 @@ msgid "Disk space (MB):"
 msgstr "Plaece sol deure plake (Mo):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Contrôle d' accès"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 
@@ -1689,11 +1674,21 @@ msgid "Configuring the Proxy"
 msgstr "Apontiaedje do procsi"
 
 #: ../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 ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "vosse procsi:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Po-z accepter cisse valixhance la, ey apontyî vosse sierveu, clitchîz so "
+"«Shuvant» oudonbén sol boton «En erî» pol coridjî."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Pôrt:"
@@ -1782,7 +1777,9 @@ msgstr "No do PXE: li no el menu PXE (on mot/limero, pont d' blancs)"
 
 #: ../pxe_wizard/Pxe.pm:135
 msgid "Path to image: provide the full path to the network boot image"
-msgstr "Tchimin po l' imådje: tchimin en etir disk' a l' imådje d' enondaedje rantoele"
+msgstr ""
+"Tchimin po l' imådje: tchimin en etir disk' a l' imådje d' enondaedje "
+"rantoele"
 
 #: ../pxe_wizard/Pxe.pm:135
 msgid ""
@@ -1848,8 +1845,10 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:163
-msgid "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Tchoezixhoz, el djivêye chal pa dzo, l' imådje d' enondaedje PXE a candjî"
+msgid ""
+"Please choose, from the list below, the PXE boot image you want to modify"
+msgstr ""
+"Tchoezixhoz, el djivêye chal pa dzo, l' imådje d' enondaedje PXE a candjî"
 
 #: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
 msgid "Boot image to modify:"
@@ -1891,7 +1890,8 @@ msgstr "Metôde d' astalaedje:"
 
 #: ../pxe_wizard/Pxe.pm:181
 msgid "ACPI option: Advanced Configuration and Power Interface"
-msgstr "Tchuze ACPI: Eterface d' apontiaedje avancî eyet manaedjmint d' enerdjeye"
+msgstr ""
+"Tchuze ACPI: Eterface d' apontiaedje avancî eyet manaedjmint d' enerdjeye"
 
 #: ../pxe_wizard/Pxe.pm:181
 msgid ""
@@ -1903,11 +1903,13 @@ msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:181
 msgid "Ramsize: adjust the ramsize parameter on boot disk."
-msgstr "Memwere: coridjî li grandeu del memwere (ramsize) sol plakete d' enondaedje."
+msgstr ""
+"Memwere: coridjî li grandeu del memwere (ramsize) sol plakete d' enondaedje."
 
 #: ../pxe_wizard/Pxe.pm:181
 msgid "VGA option: if you encounter any problem whith VGA, please adjust. "
-msgstr "Môde VGA: si vos avoz des rujhes avou l' môde VGA, vos l' poloz candjî chal."
+msgstr ""
+"Môde VGA: si vos avoz des rujhes avou l' môde VGA, vos l' poloz candjî chal."
 
 #: ../pxe_wizard/Pxe.pm:183 ../pxe_wizard/Pxe.pm:255
 msgid "Network client interface:"
@@ -1938,8 +1940,8 @@ msgid ""
 "Now the wizard will configure all needed default configurations files to "
 "allow computers to boot through the network."
 msgstr ""
-"Li macrea va asteure apontyî tos les prémetous fitchîs d' apontiaedje k' i fåt "
-"po permete åzès copiutreces di s' enonder pal rantoele."
+"Li macrea va asteure apontyî tos les prémetous fitchîs d' apontiaedje k' i "
+"fåt po permete åzès copiutreces di s' enonder pal rantoele."
 
 #: ../pxe_wizard/Pxe.pm:193
 msgid ""
@@ -1970,11 +1972,14 @@ msgid "Please choose an image from a different directory than %s."
 msgstr "Tchoezixhoz ene imådje d' on ridant diferin di %s s' i vs plait."
 
 #: ../pxe_wizard/Pxe.pm:221
-msgid "Please provide a correct PXE name: one word or one number with no space."
-msgstr "Dinez on no PXE corek s' i vs plait: on seu mot, ou on limero, sins blancs."
+msgid ""
+"Please provide a correct PXE name: one word or one number with no space."
+msgstr ""
+"Dinez on no PXE corek s' i vs plait: on seu mot, ou on limero, sins blancs."
 
 #: ../pxe_wizard/Pxe.pm:225
-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 ""
 "Po radjouter/oister/candjî l' imådje PXE, vos dvoz d' aprume enonder «Defini "
 "sierveu PXE»."
@@ -2011,7 +2016,8 @@ msgstr "Fitchî d' aidance PXE «help»:"
 
 #: ../pxe_wizard/Pxe.pm:249
 msgid "The wizard will now modify boot options with those parameters:"
-msgstr "Li macrea va asteure candjî les tchuzes d' enondaedje avou ces parametes ci:"
+msgstr ""
+"Li macrea va asteure candjî les tchuzes d' enondaedje avou ces parametes ci:"
 
 #: ../pxe_wizard/Pxe.pm:266
 msgid "The wizard will now remove this PXE boot image"
@@ -2054,13 +2060,13 @@ msgstr "Macrea Samba"
 msgid "%s does not exist."
 msgstr "%s n' egzistêye nén."
 
-#: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+#: ../samba_wizard/Samba.pm:65
+msgid "All - no access restriction"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Macrea d' apontiaedje di Samba"
+#: ../samba_wizard/Samba.pm:66
+msgid "My rules - ask me allowed and denied hosts"
+msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
 msgid ""
@@ -2069,7 +2075,12 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
-msgid "This wizard will help you configuring the Samba services of your server."
+msgid "Samba configuration wizard"
+msgstr "Macrea d' apontiaedje di Samba"
+
+#: ../samba_wizard/Samba.pm:71
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
 "Ci macrea chal vos aidrè a-z apontyî les siervices Samba pol sierveu da "
 "vosse."
@@ -2091,7 +2102,7 @@ msgid "The Workgroup is wrong"
 msgstr "Li groupe d' ovraedje n' est nén valide"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Messaedje do sierveu."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2107,20 +2118,16 @@ msgid "Banner:"
 msgstr "Messaedje:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Li messaedje do sierveu n' est nén corek"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Contrôle d' accès"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Livea d' accès:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2157,7 +2164,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Siervices Samba metous en alaedje"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2172,7 +2179,7 @@ msgid "Enable file sharing area"
 msgstr "Mete en alaedje li zône di pårtaedje di fitchîs"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Mete en alaedje li sierveu di pårtaedje di scrireces"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2209,7 +2216,7 @@ msgstr ""
 "root, djoze, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "Djivêye léjhaedje:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2217,12 +2224,13 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, djoze, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "Djivêye sicrijhaedje:"
 
 #: ../samba_wizard/Samba.pm:182
 msgid "Select which printers you want to be accessible from known users"
-msgstr "Tchoezixhoz les kénès scrireces ki dvèt esse accessibe pås cnoxhous uzeus"
+msgstr ""
+"Tchoezixhoz les kénès scrireces ki dvèt esse accessibe pås cnoxhous uzeus"
 
 #: ../samba_wizard/Samba.pm:189
 msgid "Enable all printers"
@@ -2239,15 +2247,15 @@ msgstr ""
 "Samba"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Messaedje do sierveu:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Pårtaedje di fitchîs:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Sierveu d' imprimaedje:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2307,15 +2315,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Tchoezixhoz on sierveu primaire et onk segondaire el djivêye."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Sierveus d' eure"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Sierveu d' eure primaire:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Sierveu d' eure segondaire:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2378,22 +2386,24 @@ msgstr "L' apontiaedje do sierveu d' eure a stî schapêye"
 
 #: ../time_wizard/Ntp.pm:165
 msgid "Your server can now act as a time server for your local network."
-msgstr "Vosse sierveu pout asteure fé do sierveu d' eure pol rantoele da vosse."
+msgstr ""
+"Vosse sierveu pout asteure fé do sierveu d' eure pol rantoele da vosse."
 
 #: ../web_wizard/Apache.pm:39
 msgid "Web wizard"
 msgstr "Macrea waibe"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
-msgstr "Ci macrea chal vos aidrè a-z apontyî li sierveu waibe pol rantoele da vosse."
+msgid "This wizard will help you configuring the Web server for your network."
+msgstr ""
+"Ci macrea chal vos aidrè a-z apontyî li sierveu waibe pol rantoele da vosse."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Macrea d' apontiaedje do sierveu waibe"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr ""
 "Èn clitchîz so nole boesse si vos n' voloz nén mete en alaedje vosse sierveu "
 "waibe."
@@ -2403,23 +2413,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Tchoezixhoz li sôre di siervice waibe ki vos vloz mete en alaedje:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Sierveu waibe"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Vosse sierveu waibe pout-st ovrer sol rantoele locåle (intranet) eyet sol "
 "daegntoele (internet)."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Mete en alaedje li sierveu waibe sol daegntoele"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Mete en alaedje li sierveu waibe sol daegntoele"
 
 #: ../web_wizard/Apache.pm:90
@@ -2455,20 +2465,21 @@ msgstr "sorridant waibe des uzeus : ~/"
 
 #: ../web_wizard/Apache.pm:108
 msgid "Type the path of the directory you want being the document root."
-msgstr "Tapez li tchmin do ridant ki vos vloz k' i soeye li raecene des documints."
+msgstr ""
+"Tapez li tchmin do ridant ki vos vloz k' i soeye li raecene des documints."
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Raecene des documints:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Raecene po les documints:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Apontiaedje do sierveu waibe"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Li macrea a ramexhné les parametes shuvants, k' end a mezåjhe po-z apontyî "
 "vosse sierveu waibe"
@@ -2481,16 +2492,12 @@ msgstr "Sierveu waibe sol rantoele locåle:"
 msgid "Internet web server:"
 msgstr "Sierveu waibe sol daegntoele:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Raecene po les documints:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Ridant di l' uzeu:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+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"
@@ -2503,13 +2510,52 @@ msgstr "Sierveu waibe apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Apontiaedje di vosse sistinme come sierveu waibe Apache..."
 
+#~ 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."
+
+#~ 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."
+
+#~ msgid "FTP Server"
+#~ msgstr "Sierveu FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Sierveu di copinreyes"
+
+#~ msgid "NFS Server"
+#~ msgstr "Sierveu NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Sierveu NIS avou mapaedje autofs"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Sierveu NIS:"
+
+#~ msgid "Network File:"
+#~ msgstr "Fitchî rantoele:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "Ebagaedjes NFS:"
+
+#~ msgid "Auto home:"
+#~ msgstr "Måjhon otomatike:"
+
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ 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î."
+
+#~ msgid "Document Root:"
+#~ msgstr "Raecene des documints:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "Apontiaedje di l' emilaedje"
 
-#, fuzzy
-#~ msgid "Similar PXE name is already used in PXE menu"
-#~ msgstr "On no rshonnant est ddja en alaedje come intrêye di menu PXE"
-
 #~ msgid "Congratulations, Mandrake Install server is now ready."
 #~ msgstr "Proficiate, li sierveu d' astalaedje di Mandrake est presse."
 
@@ -2553,13 +2599,10 @@ msgstr "Apontiaedje di vosse sistinme come sierveu waibe Apache..."
 #~ msgid "UID number:"
 #~ msgstr "Idintifiant d' uzeu (UID):"
 
-#~ msgid ""
-#~ "The wizard collected the following parameters\n"
-#~ "configure Samba."
+#~ msgid "The wizard collected the following parameters configure Samba."
 #~ msgstr ""
 #~ "Li macrea a ramexhné les parametes shuvants,\n"
 #~ "k' end a mezåjhe po-z apontyî Samba"
 
 #~ msgid "Choose a country:"
 #~ msgstr "Tchoezixhoz on payis:"
-
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a6352dd..d2d420d9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-25 22:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
@@ -46,7 +46,7 @@ msgstr "出错。"
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -185,8 +185,11 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "此向导将帮助您在本服务器上配置 DHCP 服务。"
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "如果您想要为您的 DHCP 服务器启用 PXE，请选中此框。"
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -202,15 +205,15 @@ msgstr ""
 "是安全的。(如：192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "最低的 IP 地址:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "最高的 IP 地址:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "网关 IP 地址:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -234,7 +237,7 @@ msgid "The IP of the server must not be in range."
 msgstr "服务器的 IP 必须不位于范围内。"
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "配置 DHCP 服务器"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -268,7 +271,8 @@ msgid "Interface:"
 msgstr "网卡："
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "向导成功地为您的服务器配置了 DHCP 服务。"
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -537,11 +541,11 @@ msgstr "DHCP 服务器"
 msgid "DNS server"
 msgstr "DNS 服务器"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "新闻组服务器"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS 服务器"
 
@@ -549,7 +553,7 @@ msgstr "NFS 服务器"
 msgid "Mail server"
 msgstr "邮件服务器"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP 服务器"
 
@@ -607,39 +611,35 @@ msgid "FTP wizard"
 msgstr "FTP 向导"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP 服务器配置向导"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "此向导将帮助您在网络中配置 FTP 服务器。"
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP 服务器"
-
-#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "选择您要激活的 FTP 服务类型:"
 
 #: ../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."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "您的服务器可以向内部网络(Intranet)提供 FTP 服务，也可以向 Internet 提供 FTP "
 "服务。"
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "启用 Intranet 的 FTP 服务器"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "启用 Internet 的 FTP 服务器"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "管理员电子邮件：FTP 维护者的电子邮件地址。"
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -651,7 +651,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "允许 FXP：允许通过其他 FTP 进行文件传输。"
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr "Chroot Home 用户：用户只能看见他们的主目录。"
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -667,11 +667,11 @@ msgid "Admin email:"
 msgstr "管理员电子邮件:"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "允许 root 登录:"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Chroot Home 用户:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -694,8 +694,8 @@ msgstr "请选择是允许从内部主机还是从外部主机连接到 FTP 服�
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr "在 shell 列表中找不到 bash。可能您自行修改了该列表！请纠正。"
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -703,13 +703,13 @@ msgid "Sorry, you must be root to do this..."
 msgstr "对不起，您必须是 root 才能执行此操作..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "配置 FTP 服务器"
 
 #: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "为了配置您的 FTP 服务器，向导收集了下列需要的参数"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -721,11 +721,11 @@ msgstr ""
 "们"
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Intranet FTP 服务器:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Internet FTP 服务器:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -749,7 +749,7 @@ msgid "Allow FXP"
 msgstr "允许 FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "向导成功地配置了您的 Intranet/Internet FTP 服务器"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -796,11 +796,11 @@ msgid ""
 msgstr "错误，源目录必须是一个拥有完整的 Mandrake 安装文件的目录。"
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr "目的目录已经被使用，请选择其他的目录。"
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "您的安装服务器将会以这些参数加以配置"
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1017,17 +1017,13 @@ msgstr "欢迎使用新闻组向导"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Internet 主机名的格式必须是“host.domain.domaintype”；例如，您的提供商是 "
 "“provider.com”，互联网新闻组服务器通常就是“news.provider.com”。"
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "新闻组服务器"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1036,22 +1032,22 @@ msgstr ""
 "提供。"
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "新闻组服务器名:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr "根据您使用的不同类型的互联网连接，合适的查询间隔在 6 到 24 小时之间。"
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "查询周期"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1059,7 +1055,7 @@ msgstr ""
 "次查询之间的间隔。"
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "查寻周期(小时):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1076,29 +1072,27 @@ msgstr "配置互联网新闻组服务"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr "为了配置 Internet 新闻组服务，向导收集了下列需要的参数:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
 "要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改它"
 "们。"
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "新闻组服务器:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "查询间隔:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "向导成功地为您的服务器配置了 Internet 新闻组服务。"
@@ -1108,7 +1102,6 @@ msgid "NFS Wizard"
 msgstr "NFS 向导"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "全部 - 没有访问限制"
 
@@ -1121,25 +1114,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS 服务器配置向导"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "此向导将帮助您在您的网络配置 NFS 服务器。"
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS 服务器"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "目录:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "访问控制"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "选择适合您需要的级别。如果不清楚，通常局域网是合适的级别。注意并非所有的级别"
@@ -1186,7 +1176,7 @@ msgid "Netmask :"
 msgstr "子网掩码:"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "向导成功地配置了您的 NFS 服务器"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1197,25 +1187,22 @@ msgstr ""
 "您需要重新调整您的 NIS 域名。对于 NIS 服务器，您需要正确的 NIS 域名，而不能是"
 "localdomain 或不设置。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "带 Autofs 映射的 NIS 服务器"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS 客户端"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "带 Autofs 映射的 NIS 服务器"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "设置带 Autofs 映射、auto.home 和 auto.master 文件的 NIS 服务器。"
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr "用户会在登录到 NIS 客户端网络时从服务器自动挂载他们的 home 目录。"
 
@@ -1231,18 +1218,19 @@ msgstr "将计算机配置为 NIS 客户"
 msgid "You just have to put nisdomain and nisserver."
 msgstr "您必须输入 NIS 域名和 NIS 服务器。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NFS 服务器:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS 域名:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 "NIS 服务器用于创建用户、主机名数据库。向导还将创建 autofs 映射，这样可让 NIS "
@@ -1263,11 +1251,6 @@ msgstr "NIS 域名：您要使用的 NIS 域名(通常与您的 DNS 域名相同
 msgid "NIS server: name of your computer."
 msgstr "NIS 服务器：您计算机的名称。"
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NFS 服务器:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "主 NIS:"
@@ -1285,22 +1268,6 @@ msgstr "向导将要设置您的带 Autofs 映射的 NIS 服务器"
 msgid "NIS directory:"
 msgstr "NIS 目录:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "网络文件:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "NFS 导出:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "自动主服务器:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "自动主目录:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname: name of NIS domain."
 msgstr "NIS 域名：NIS 域上的名字。"
@@ -1312,7 +1279,7 @@ msgstr "NIS 服务器：NIS 服务器的主机名。"
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr "YPBIND 守护程序查找 NIS 域服务器并维护 NIS 绑定信息。"
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1342,11 +1309,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "将您的系统配置为带 autofs 映射的 NIS 服务器..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "带 autofs 映射的 NIS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "正在将您的系统配置为 NIS 客户..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1426,7 +1393,7 @@ msgstr "出错，已经安装 sendmail，请在安装并配置 Postfix 前先删
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Internet 主机名必须采用下列格式“host.domain.domaintype”；例如，您的服务商"
@@ -1470,14 +1437,6 @@ msgid ""
 "external mail server:"
 msgstr "为了配置外部邮件服务器，向导收集了下列需要的参数:"
 
-#: ../postfix_wizard/Postfix.pm:134
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改它"
-"们。"
-
 #: ../postfix_wizard/Postfix.pm:137
 msgid "Form of the address"
 msgstr "地址格式"
@@ -1603,6 +1562,19 @@ msgid "Disk space (MB):"
 msgstr "磁盘空间(MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "访问控制"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"选择适合您需要的级别。如果不清楚，通常局域网是合适的级别。注意并非所有的级别"
+"都足够安全。"
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "可以配置代理使用不同的访问控制级别"
 
@@ -1661,6 +1633,15 @@ msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr "为了配置您的代理服务器，向导收集了下列需要的参数:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改它"
+"们。"
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "端口:"
@@ -2032,15 +2013,16 @@ msgstr "Samba 向导"
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "全部 - 没有访问限制"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "我的规则 - 询问我允许和禁用主机"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba 配置向导"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2048,6 +2030,10 @@ msgstr ""
 "Samba 让您的服务器为运行 Linux 以外操作系统的工作站提供文件和打印服务。"
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba 配置向导"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "此向导将帮助您在您的服务器上配置 Samba 服务。"
@@ -2069,7 +2055,7 @@ msgid "The Workgroup is wrong"
 msgstr "工作组不对"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "服务器标志。"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2083,20 +2069,16 @@ msgid "Banner:"
 msgstr "标志:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "服务器标志不对"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "访问控制"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "访问级别:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* 示例 1: 允许 150.203.*.* 中的所有 IP，除了其中一个\n"
@@ -2142,7 +2124,7 @@ msgid "Deny hosts:"
 msgstr "禁止的主机:"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "已启用 Samba 服务"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2159,7 +2141,7 @@ msgid "Enable file sharing area"
 msgstr "启用文件共享区域"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "启用服务器打印机共享"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2197,7 +2179,7 @@ msgstr ""
 "root, fred, @users, @wheel。"
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "读取列表:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2205,7 +2187,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "root, fred, @users, @wheel"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "写入列表:"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2225,15 +2207,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "为了配置 Samba，向导收集了下列需要的参数。"
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "服务器标语:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "文件共享:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "打印服务器:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2291,15 +2273,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "从列表中选择一个主服务器和一个副服务器:"
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "时间服务器"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "主时间服务器:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "副时间服务器:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2368,15 +2350,15 @@ msgid "Web wizard"
 msgstr "Web 服务器向导"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "此向导将帮助您配置您网络的 Web 服务器。"
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Web 服务器配置向导"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "如果您不想激活您的 Web 服务器，不要选中任何复选框。"
 
 #: ../web_wizard/Apache.pm:77
@@ -2384,23 +2366,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "选择您想激活的 Web 服务:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Web 服务器"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "您的服务器可以在您的网络(Intranet)上作为 Web 服务器，也可以对 Internet 提供 "
 "Web 服务。"
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "启用 Intranet 用的 Web 服务器"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "启用 Intranet 用的 Web 服务器"
 
 #: ../web_wizard/Apache.pm:90
@@ -2440,18 +2422,18 @@ msgstr "使用 http 子目录: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "输入您想要做为文档根的目录路径。"
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr "文档根:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "配置 Web 服务器"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "为了配置您的 WEB 服务器，向导收集了下列需要的参数:"
 
 #: ../web_wizard/Apache.pm:137
@@ -2462,16 +2444,12 @@ msgstr "Intranet Web 服务器:"
 msgid "Internet web server:"
 msgstr "Internet Web 服务器:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "文档根:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "用户目录:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "向导成功地配置了您的 Intranet/Internet Web 服务器"
 
 #: ../web_wizard/Apache.pm:236
@@ -2482,6 +2460,49 @@ msgstr "Apache 服务器"
 msgid "Configuring your system as Apache server ..."
 msgstr "正在将您的系统配置为 Apache 服务器..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr "如果您想要为您的 DHCP 服务器启用 PXE，请选中此框。"
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "向导成功地为您的服务器配置了 DHCP 服务。"
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP 服务器"
+
+#~ msgid "News Server"
+#~ msgstr "新闻组服务器"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS 服务器"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "带 Autofs 映射的 NIS 服务器"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NFS 服务器:"
+
+#~ msgid "Network File:"
+#~ msgstr "网络文件:"
+
+#~ msgid "NFS exports:"
+#~ msgstr "NFS 导出:"
+
+#~ msgid "Auto master:"
+#~ msgstr "自动主服务器:"
+
+#~ msgid "Auto home:"
+#~ msgstr "自动主目录:"
+
+#~ msgid ""
+#~ "To accept these values, and configure your server, click the next button "
+#~ "or use the Back button to correct them."
+#~ msgstr ""
+#~ "要接受这些值，并配置您的服务器，请单击“下一步”按钮或使用“上一步”按钮来修改"
+#~ "它们。"
+
+#~ msgid "Document Root:"
+#~ msgstr "文档根:"
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "配置 Internet 邮件"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 759fdc4a..8355e811 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-02-25 12:47+0100\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
 "PO-Revision-Date: 2004-02-21 22:10+0800\n"
 "Last-Translator: Hilbert <h@mandrake.org>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -41,7 +41,7 @@ msgstr "���~."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -179,8 +179,11 @@ 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:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "�p�G�z�Q�n�ҥ� PXE ��z�� dhcp ���A��, �п�����."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -196,15 +199,15 @@ msgstr ""
 "�����ҫ�ij���ƭ�. (ie: 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "�̧C�� IP ��}:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "�̰��� IP ��}:"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "�h�D IP ��}:"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -228,7 +231,7 @@ msgid "The IP of the server must not be in range."
 msgstr "���A�� IP �������A�d��."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "���b�]�w DHCP ���A��"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -262,7 +265,8 @@ msgid "Interface:"
 msgstr "����:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "�o���F���\���z�����A���]�w DHCP �A��."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -532,11 +536,11 @@ msgstr "DHCP ���A��"
 msgid "DNS server"
 msgstr "DNS ���A��"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "�s�D���A��"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "NFS ���A��"
 
@@ -544,7 +548,7 @@ msgstr "NFS ���A��"
 msgid "Mail server"
 msgstr "�q�l���A��"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "FTP ���A��"
 
@@ -602,39 +606,35 @@ msgid "FTP wizard"
 msgstr "FTP ���F"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "FTP ���A���]�w���F"
 
 #: ../ftp_wizard/Proftpd.pm:73
 #, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr "�o���F�|���U�z�]�w�z�������� FTP ���A��."
 
 #: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "FTP ���A��"
-
-#: ../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:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"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:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "�ҥ� FTP ���A���󤺳�����"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "�ҥ� FTP ���A������ں���"
 
 #: ../ftp_wizard/Proftpd.pm:88
 #, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "Admin Email: FTP �޲z���� email �a�}."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -646,7 +646,7 @@ msgid "Allow FXP: allow file transfer via another FTP."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -662,11 +662,11 @@ msgid "Admin email:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -690,8 +690,8 @@ msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:115
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:121
@@ -699,14 +699,14 @@ msgid "Sorry, you must be root to do this..."
 msgstr "�藍�_, �z�����H root �����~�i�H�o�˰�..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "���b�]�w FTP ���A��"
 
 #: ../ftp_wizard/Proftpd.pm:126
 #, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr "���F������H�U�ݭn�]�w�z�� FTP ���A�����Ѽ�"
 
 #: ../ftp_wizard/Proftpd.pm:126
@@ -717,11 +717,11 @@ msgid ""
 msgstr "���U�@�B�����o�ǼƭȩM�]�w�z�����A��, �ΨϥΤW�@�B�@�X��."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "�������� FTP ���A��:"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "���ں��� FTP ���A��:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -745,7 +745,7 @@ msgid "Allow FXP"
 msgstr ""
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr "���F���\�]�w�z����������/���ں��� FTP ���A��"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
@@ -793,11 +793,11 @@ msgid ""
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:79
-msgid "The Destination directory already in use, please choose another one."
+msgid "The destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1002,17 +1002,13 @@ msgstr "�w��Ө�s�D���F"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "���ں����D���W�٥����H\"host.domain.domaintype\"���榡�R�W; �Ҧp, �p�G�z����"
 "���̬O\"provider.com\", �����ں����s�D���A�q�`�O\"news.provider.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "�s�D���A��"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1021,22 +1017,22 @@ msgstr ""
 "���̴���."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "�s�D���A���W��:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr "��ڱz�s�����ں��������O, �A�X�����߶g���i�H�O���ܤG�Q�|�p�ɤ���."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "���߶g��"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1044,7 +1040,7 @@ msgstr ""
 "�ӳs�򪺱��ߤ���."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "���߶g�� (�p��):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1061,29 +1057,28 @@ msgstr "���b�]�w���ں����s�D"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "���F������H�U�ݭn�]�w�z��\n"
 "���ں����s�D�A�Ȫ��Ѽ�:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 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��."
+"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��."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "�s�D���A��:"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "���߶��Z:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr "���F���\�]�w�z�����A�������ں����s�D�A��."
@@ -1093,7 +1088,6 @@ msgid "NFS Wizard"
 msgstr "NFS ���F"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "���� - �S���ϥΦs������"
 
@@ -1106,25 +1100,22 @@ msgid "NFS Server Configuration Wizard"
 msgstr "NFS ���A���]�w���F"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr "�o���F�|���U�z�]�w�z�������� NFS ���A��."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "NFS ���A��"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "�ؿ�:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
 msgstr "�s���v����"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "��ܾA�X�z�ݭn���{��. �p�G�z�����D����, ���a�ݺ����{�׳q�`�|�O�̾A�X��. �`�N"
@@ -1172,7 +1163,7 @@ msgid "Netmask :"
 msgstr ""
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "���F���\�]�w�z�� NFS ���A��"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
@@ -1184,25 +1175,22 @@ msgstr ""
 "�z���n���s�վ�z������W��. ���@�� DNS ���A���Ө�, �z�ݭn�@�ӥ��T ������W"
 "��, ���P���󥻦a�ݺ���ΨS��. �o�� drakconnect �ӽվ㥦."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "�� autofs �a�Ϫ� NIS ���A��"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "NIS �Ȥ��"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "�� autofs �a�Ϫ� NIS ���A��"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 
@@ -1218,18 +1206,19 @@ msgstr ""
 msgid "You just have to put nisdomain and nisserver."
 msgstr ""
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "NIS ���A��:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "NIS ����:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
@@ -1247,11 +1236,6 @@ msgstr ""
 msgid "NIS server: name of your computer."
 msgstr "NIS ���A��: �z���q���W��."
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "NIS ���A��:"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "�a NIS:"
@@ -1270,22 +1254,6 @@ msgstr "���F���\�a�]�w�z�����������@�Ӧ� autofs �a�Ϫ� NIS ���A��."
 msgid "NIS directory:"
 msgstr "NIS �ؿ�:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "�����ɮ�:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr ""
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr ""
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
 #, fuzzy
 msgid "NIS domainname: name of NIS domain."
@@ -1299,7 +1267,7 @@ msgstr "NIS ���A��: �z���q���W��."
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
@@ -1329,11 +1297,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "���b�]�w�z���t�Φ����@�Ӧ� Autofs �a�Ϫ� NIS ���A��..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "�� Autofs �a�Ϫ� NIS ���A��"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "���b�]�w�z���t�Φ��� NIS �Ȥ�� ..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1418,7 +1386,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 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 "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "���ں����D���W�٥����H\"host.domain.domaintype\"���榡�R�W; �Ҧp, �p�G�z����"
@@ -1466,13 +1434,6 @@ msgid ""
 "external mail server:"
 msgstr "���F������H�U�ݭn�]�w�z�����ں����q�l�A�Ȫ��Ѽ�:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-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��."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1601,6 +1562,19 @@ msgid "Disk space (MB):"
 msgstr "�ϺЪŶ� (MB):"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "�s���v����"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"��ܾA�X�z�ݭn���{��. �p�G�z�����D����, ���a�ݺ����{�׳q�`�|�O�̾A�X��. �`�N"
+"�Ҧ��{�ץi��ä��w��."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr "�N�z�i�Q�]�w�ӨϥΤ��P�s������ŧO."
 
@@ -1660,6 +1634,13 @@ 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:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr "���U�@�B�����o�ǼƭȩM�]�w�z�����A��, �Ϋ��W�@�B�@�X��."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "�q�T��:"
@@ -2014,15 +1995,16 @@ msgstr "Samba ���F"
 msgid "%s does not exist."
 msgstr ""
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "���� - �S���ϥΦs������"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Samba �]�w���F"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2031,6 +2013,10 @@ msgstr ""
 "�u�@��."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Samba �]�w���F"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "�o���F�|���U�z�]�w�z�����A���� Samba �A��."
@@ -2052,7 +2038,7 @@ msgid "The Workgroup is wrong"
 msgstr "���~�u�@�s"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "���A����T."
 
 #: ../samba_wizard/Samba.pm:92
@@ -2066,20 +2052,16 @@ msgid "Banner:"
 msgstr "��T:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "���A����T�����T"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "�s���v����"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "�s������:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
@@ -2116,7 +2098,7 @@ msgid "Deny hosts:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "�ҥ� Samba �A��"
 
 #: ../samba_wizard/Samba.pm:132
@@ -2133,7 +2115,7 @@ msgid "Enable file sharing area"
 msgstr "�ҥ� /home/samba/public sharing area"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "�ҥΦ��A���W���C�L������"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2169,7 +2151,7 @@ msgid ""
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2177,7 +2159,7 @@ msgid "root, fred, @users, @wheel"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr ""
 
 #: ../samba_wizard/Samba.pm:182
@@ -2197,15 +2179,15 @@ msgid "The wizard collected the following parameters to configure Samba."
 msgstr "���F������H�U�ݭn�]�w Samba ���Ѽ�."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "���A����T:"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "�ɮפ���:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "�C�L���A��:"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2261,15 +2243,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "�q�M�椤��ܤ@�ӥD�M�����A��."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "�ɶ����A��"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "�D�ɶ����A��:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "���ɶ����A��:"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2337,15 +2319,15 @@ msgid "Web wizard"
 msgstr "�������F"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr "�o���F�|���U�z�]�w�z���������������A��."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "�������A���]�w���F"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "���n��ܥ���ﶵ�p�G�z���Q�E���z���������A��."
 
 #: ../web_wizard/Apache.pm:77
@@ -2353,21 +2335,21 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "��ܱz�Q�E���������A�Ȫ�����:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "�������A��"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr "�z�����A���ন���z����������(��������)�M���ں������������A��."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "�ҥΤ����������������A��"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "�ҥκ��ں������������A��"
 
 #: ../web_wizard/Apache.pm:90
@@ -2401,18 +2383,18 @@ msgstr ""
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
 msgstr ""
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "�]�w�������A����"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr "���F������H�U�ݭn�]�w�z���������A�����Ѽ�"
 
 #: ../web_wizard/Apache.pm:137
@@ -2423,16 +2405,12 @@ msgstr "���������������A��:"
 msgid "Internet web server:"
 msgstr "���ں����������A��:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr ""
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "�ϥΪ̥ؿ�:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr "�o���F���\�]�w�z����������/���ں����������A��"
 
 #: ../web_wizard/Apache.pm:236
@@ -2443,6 +2421,36 @@ msgstr "Apache ���A��"
 msgid "Configuring your system as Apache server ..."
 msgstr "���b�]�w�z���t���� Apache ���A�� ..."
 
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr "�p�G�z�Q�n�ҥ� PXE ��z�� dhcp ���A��, �п�����."
+
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "�o���F���\���z�����A���]�w DHCP �A��."
+
+#~ msgid "FTP Server"
+#~ msgstr "FTP ���A��"
+
+#~ msgid "News Server"
+#~ msgstr "�s�D���A��"
+
+#~ msgid "NFS Server"
+#~ msgstr "NFS ���A��"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "�� autofs �a�Ϫ� NIS ���A��"
+
+#~ msgid "NIS Server:"
+#~ msgstr "NIS ���A��:"
+
+#~ msgid "Network File:"
+#~ msgstr "�����ɮ�:"
+
+#, fuzzy
+#~ 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��."
+
 #~ msgid "Configuring the Internet Mail"
 #~ msgstr "���b�]�w���ں����q�l�l��"