46 files changed, 39581 insertions, 39066 deletions

diff --git a/dns_wizard/dns.wiz b/dns_wizard/dns.wiz
index d4274173..b4a0b3ef 100644
--- a/dns_wizard/dns.wiz
+++ b/dns_wizard/dns.wiz
@@ -40,7 +40,7 @@
 
 
 		<Info
-			helpText="DNS (Domain Name Server) is the service that puts in correspondence a machine with an internet host name."
+			helpText="DNS (Domain Name Server) is the service that maps an IP address of a machine with an internet host name."
 		>
 		</Info>
 
diff --git a/ftp_wizard/ftp.wiz b/ftp_wizard/ftp.wiz
index 5d0632d8..e34ad798 100644
--- a/ftp_wizard/ftp.wiz
+++ b/ftp_wizard/ftp.wiz
@@ -186,7 +186,7 @@
 		</Target>
 
 		<Info
-			helpText="Shared dir:"
+			helpText="Shared directory:"
 		>
 		</Info>
 
@@ -199,7 +199,7 @@
 		<Freetext
 			name="freetext_dir"
 			variableName="wiz_dir"
-			helpText="Shared dir:"
+			helpText="Shared directory:"
 			editable="true"
 			fillfunc="get_dir"
 		>
diff --git a/nfs_wizard/nfs.wiz b/nfs_wizard/nfs.wiz
index 48438853..6781d47c 100644
--- a/nfs_wizard/nfs.wiz
+++ b/nfs_wizard/nfs.wiz
@@ -161,7 +161,7 @@
 		</Info>
 
 		<Info
-			helpText="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."
+			helpText="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."
 		>
 		</Info>
 
@@ -209,7 +209,7 @@
 			name="f_wiz_squid_mynetw"
 			fillfunc="network_mask"
 			variableName="wiz_netmask"
-			helpText="Authorised network:"
+			helpText="Authorized network:"
 			editable="true"
 		>
 		</Freetext>
diff --git a/po/ar.po b/po/ar.po
index 900ef595..4324773e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-08-14 14:25+0200\n"
 "Last-Translator: <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
@@ -17,369 +17,375 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr ""
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "موافق"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "تهانينا"
+#: ../client_wizard/client.wiz_.c:4
+msgid "DNS Client Wizard"
+msgstr ""
 
 #: ../client_wizard/client.wiz_.c:5
-msgid "DNS Client Wizard"
+msgid "Press next to begin, or Cancel to leave this wizard."
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
-"The wizard collected the following parameters needed to add a client to your "
-"network:"
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
+"The wizard collected the following parameters needed to add a client to your "
+"network:"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
+msgid "The wizard successfully added the client."
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
+msgid "(you don't need to type the domain after the name)"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
+msgid "Name of the machine:"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
+msgid "Adding a new client to your network"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
+msgid "Client identification:"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
+msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr ""
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "موافق"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:21
-msgid "DNS Wizard (add client)"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "خروج"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr ""
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+msgid "DNS Wizard (add client)"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "خروج"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
+#: ../client_wizard/client.wiz_.c:28
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "تهانينا"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr ""
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
+#: ../db_wizard/db.wiz_.c:1
+msgid "User addition"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
+#: ../db_wizard/db.wiz_.c:2
+msgid ""
+"To accept this value, and configure your server, click on \\qConfirm\\q or "
+"use the Back button to correct them."
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:5
-msgid "User addition"
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:6
-msgid ""
-"To accept this value, and configure your server, click on \\qConfirm\\q or "
-"use the Back button to correct them."
+msgid "Configuring the MySQL Database Server"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr ""
+msgid "Confirm"
+msgstr "تأكيد"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "خادم قاعدة البيانات"
+msgid "Password:"
+msgstr "كلمة المرور:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
+msgid "The wizard successfully configured your MySQL Database Server"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "تأكيد"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr ""
+msgid "Username:"
+msgstr "اسم المستخدم:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "كلمة المرور:"
+msgid "Add"
+msgstr "أضف"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
+msgid "Database Server"
+msgstr "خادم قاعدة البيانات"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "اسم المستخدم:"
+msgid "Note: This user will have all permissions"
+msgstr ""
 
 #: ../db_wizard/db.wiz_.c:17
-msgid "Note: This user will have all permissions"
+msgid "MySQL Database wizard"
+msgstr ""
+
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "أضف"
+msgid "To run your server, you first need to specify a root password"
+msgstr ""
 
 #: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
+msgid "Root Password:"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:25
-msgid "To run your server, you first need to specify a root password"
+#: ../db_wizard/db.wiz_.c:24
+msgid ""
+"The wizard collected the following parameters needed to configure your MySQL "
+"Database Server"
 msgstr ""
 
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم الويب لشبكتك"
+
 #: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
+msgid "Please enter a username and password to add a user"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:27
 msgid ""
-"The wizard collected the following parameters needed to configure your MySQL "
-"Database Server"
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
-msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr ""
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
+msgid "Lowest IP Address:"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr ""
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم FTP لشبكتك."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
-msgid "The wizard successfully configured the DHCP services of your server."
+msgid "Range of addresses used by dhcp"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
+#: ../dhcp_wizard/dhcp.wiz_.c:12
+msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:16
+#: ../dhcp_wizard/dhcp.wiz_.c:13
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
-msgstr ""
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
+msgid "Highest IP Address:"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
+msgid "DHCP Configuration Wizard"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr ""
 
+#: ../dns_wizard/dns.wiz_.c:1
+msgid ""
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
+msgstr ""
+
 #: ../dns_wizard/dns.wiz_.c:2
-msgid "DNS Wizard (configuration)"
+msgid "Press next to leave these values empty, or back to enter a value."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:8
-msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:9
@@ -387,21 +393,10 @@ msgid "Configuring the DNS Server"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
+msgid "DNS Configuration Wizard"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr ""
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -409,36 +404,43 @@ msgid ""
 "by your Internet provider."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr ""
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
+#: ../dns_wizard/dns.wiz_.c:17
+msgid ""
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:20
-msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+msgid "Secondary DNS Address:"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:22
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
+msgid "DNS Wizard (configuration)"
 msgstr ""
 
 #: ../drakwizard.pl_.c:62
@@ -450,1390 +452,1397 @@ msgid "Please select a wizard"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
+msgid "Medium - web, ftp and ssh shown to outside"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
+#: ../firewall_wizard/firewall.wiz_.c:5
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
+msgid "Device"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr ""
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-#, fuzzy
-msgid "Protection Level:"
-msgstr "مستوى الحماية:"
+msgid "Internet Network Device:"
+msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
+msgid "The device name is not correct"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "خروج"
-
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr ""
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
 msgstr ""
 
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "جهاز الجدار الناري للشبكة"
+
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
+msgid "The wizard successfully configured your server firewall."
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:22
-msgid "This wizard will help you configuring your server firewall."
+msgid "Configuring the Firewall"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:23
-msgid "Low - Light filtering, standard services available"
-msgstr ""
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "خروج"
 
 #: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "جهاز الجدار الناري للشبكة"
+#, fuzzy
+msgid "This wizard will help you configuring your server firewall."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم البروكسي."
 
 #: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
+msgid "Low - Light filtering, standard services available"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
+#, fuzzy
+msgid "Protection Level:"
+msgstr "مستوى الحماية:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "اختر نوع خدمة FTP التي تريد تفعيلها:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم FTP لشبكتك."
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
+#: ../ftp_wizard/ftp.wiz_.c:3
+msgid "Public directory:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:4
 msgid "Internet FTP Server:"
 msgstr "خادم FTP للإنترنت:"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
-msgstr "قام المعالج بتهيئة خادم  FTP للإنترنت/الإنترانت بنجاح"
-
-#: ../ftp_wizard/ftp.wiz_.c:12
-msgid "Public directory:"
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:6
 msgid "Enable the FTP Server for the Intranet"
 msgstr "مكّن خادمات FTP للإنترانت"
 
-#: ../ftp_wizard/ftp.wiz_.c:17
-msgid ""
-"The wizard collected the following parameters needed to configure your FTP "
-"Server"
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:18
+#: ../ftp_wizard/ftp.wiz_.c:7
 msgid "FTP wizard"
 msgstr "معالج FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
-msgstr "هذا المعالج سيساعدك في تهيئة خادم FTP لشبكتك."
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "خادم FTP"
+
+#: ../ftp_wizard/ftp.wiz_.c:11
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr "لا تقم بالتأشير على أي صندوق اذا لم تكن ترغب في تفعيل خادم FTP."
+
+#: ../ftp_wizard/ftp.wiz_.c:12
+msgid "Configuring the FTP Server"
+msgstr "جاري تهيئة خادم FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:20
+#: ../ftp_wizard/ftp.wiz_.c:13
 #, fuzzy
 msgid "Enable the FTP Server for the Internet"
 msgstr "مكّن خادمات FTP للإنترانت"
 
-#: ../ftp_wizard/ftp.wiz_.c:21
+#: ../ftp_wizard/ftp.wiz_.c:14
 msgid "Intranet FTP Server:"
 msgstr "خادم FTP للإنترانت:"
 
-#: ../ftp_wizard/ftp.wiz_.c:22
-msgid "FTP Server Configuration Wizard"
-msgstr "معالج تهيئة خادم FTP"
+#: ../ftp_wizard/ftp.wiz_.c:15
+msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgstr "قام المعالج بتهيئة خادم  FTP للإنترنت/الإنترانت بنجاح"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "جاري تهيئة خادم FTP"
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "اختر نوع خدمة FTP التي تريد تفعيلها:"
+
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr ""
+
+#: ../ftp_wizard/ftp.wiz_.c:21
+msgid ""
+"The wizard collected the following parameters needed to configure your FTP "
+"Server"
+msgstr ""
+
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
+msgstr ""
 
 #: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "لا تقم بالتأشير على أي صندوق اذا لم تكن ترغب في تفعيل خادم FTP."
+msgid "FTP Server Configuration Wizard"
+msgstr "معالج تهيئة خادم FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "خادم FTP"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"Your server can act as an FTP Server toward your internal network (intranet) "
+"and as an FTP Server for the Internet."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:1
-#, fuzzy
-msgid "News Server Name:"
-msgstr "اسم خادم الأخبار:"
+msgid "Polling Interval:"
+msgstr "فترة التصويت:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "أهلا بك في معالج الأخبار"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "فترة التصويت (ساعة):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "خادم الأخبار"
+msgid "Polling Period"
+msgstr "فترة التصويت"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "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/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم الويب لشبكتك"
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "معالح الأخبار"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "فترة التصويت غير صحيحة"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "اسم خادم الأخبار غير صحيح"
 
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "جاري تهيئة الأخبار"
+
 #: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "فترة التصويت:"
+msgid ""
+"Depending on the kind of internet connection you have, an appropriate "
+"polling period can change between 6 and 24 hours."
+msgstr ""
 
 #: ../news_wizard/news.wiz_.c:13
 msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
+"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/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "فترة التصويت"
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr ""
 
 #: ../news_wizard/news.wiz_.c:16
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
-"polling period can change between 6 and 24 hours."
+"The wizard collected the following parameters needed to configure your "
+"Internet News Service:"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "فترة التصويت غير صحيحة"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "خادم الأخبار"
+msgid "Polling Period (Hours):"
+msgstr "فترة التصويت (ساعة):"
 
 #: ../news_wizard/news.wiz_.c:19
-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 ""
+#, fuzzy
+msgid "News Server Name:"
+msgstr "اسم خادم الأخبار:"
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"The wizard collected the following parameters needed to configure your "
-"Internet News Service:"
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:22
-msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
-msgstr ""
-
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "جاري تهيئة الأخبار"
+msgid "Welcome to the News Wizard"
+msgstr "أهلا بك في معالج الأخبار"
 
 #: ../news_wizard/news.wiz_.c:24
-msgid ""
-"The wizard successfully configured your Internet News service of your server."
-msgstr ""
+msgid "News Server"
+msgstr "خادم الأخبار"
 
 #: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "معالح الأخبار"
+msgid "News Server:"
+msgstr "خادم الأخبار"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
-msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
-"secure."
-msgstr ""
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "الشبكة المصرحة:"
 
-#: ../nfs_wizard/nfs.wiz_.c:3
-#, fuzzy
-msgid "NFS Server Configuration Wizard"
-msgstr "معالج تهيئة خادم FTP"
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "التحكم بالدخول"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
+msgid ""
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
-#, fuzzy
-msgid "NFS Server"
-msgstr "خادم FTP"
-
-#: ../nfs_wizard/nfs.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:4
 #, fuzzy
-msgid "The wizard successfully configured your NFS Server"
-msgstr "قام المعالج بتهيئة خادم Samba بنجاح."
+msgid "Access :"
+msgstr "تحكم الدخول:"
 
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
-msgid "All - No access restriction"
-msgstr "الكل - لا قيود على الدخول"
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
+msgstr "الشبكة المحلية - الدخول للشبكة المحلية (مفضل)"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
 msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "التحكم بالدخول"
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
+msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:11
+#: ../nfs_wizard/nfs.wiz_.c:9
 #, fuzzy
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr "هذا المعالج سيساعدك في تهيئة خادم FTP لشبكتك."
+msgid "The wizard collected the following parameters."
+msgstr ""
+"قام المعالج بتجميع المعاملات التالية و التي يُحتاج اليها لتهيئة البروكسي:"
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
-msgstr "الشبكة المحلية - الدخول للشبكة المحلية (مفضل)"
+#: ../nfs_wizard/nfs.wiz_.c:10
+#, fuzzy
+msgid "NFS Server Configuration Wizard"
+msgstr "معالج تهيئة خادم FTP"
 
-#: ../nfs_wizard/nfs.wiz_.c:13
+#: ../nfs_wizard/nfs.wiz_.c:11
 msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "الشبكة المصرحة:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
-msgstr ""
+#: ../nfs_wizard/nfs.wiz_.c:13
+#, fuzzy
+msgid "NFS Wizard"
+msgstr "معالح الأخبار"
 
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
 #, fuzzy
 msgid "Grant access on local network"
 msgstr "اضمن الدخول الى الشبكة المحلية"
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../nfs_wizard/nfs.wiz_.c:15
 #, fuzzy
-msgid "The wizard collected the following parameters."
+msgid "NFS Server"
+msgstr "خادم FTP"
+
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
+msgid "All - No access restriction"
+msgstr "الكل - لا قيود على الدخول"
+
+#: ../nfs_wizard/nfs.wiz_.c:18
+msgid "Netmask :"
 msgstr ""
-"قام المعالج بتجميع المعاملات التالية و التي يُحتاج اليها لتهيئة البروكسي:"
 
 #: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "تحكم الدخول:"
-
-#: ../nfs_wizard/nfs.wiz_.c:20
 msgid "Directory:"
 msgstr ""
 
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
+msgid "This wizard will help you configuring the NFS Server for your network."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم FTP لشبكتك."
+
 #: ../nfs_wizard/nfs.wiz_.c:21
 #, fuzzy
-msgid "NFS Wizard"
-msgstr "معالح الأخبار"
+msgid "The wizard successfully configured your NFS Server"
+msgstr "قام المعالج بتهيئة خادم Samba بنجاح."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
-msgid "Do It"
-msgstr "افعلها"
+#: ../postfix_wizard/postfix.wiz_.c:2
+#, fuzzy
+msgid "There seems to be a problem..."
+msgstr "يبدو أن هناك مشكلة... روح اسأل الجدع اللي واقف تحت السلم"
 
 #: ../postfix_wizard/postfix.wiz_.c:3
-msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
-msgstr ""
+msgid "Internet Mail Gateway"
+msgstr "بوابة بريد الإنترنت"
 
 #: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "جاري تهيئة البريد"
+msgid "Outgoing Mail Address"
+msgstr "عنوان البريد الصادر"
 
 #: ../postfix_wizard/postfix.wiz_.c:6
-msgid "Postfix wizard"
-msgstr "معالج Postfix"
-
-#: ../postfix_wizard/postfix.wiz_.c:7
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
-msgstr ""
-
-#: ../postfix_wizard/postfix.wiz_.c:8
-msgid ""
-"This wizard will help you configuring the Internet Mail services for your "
-"network."
+"The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "عنوان البريد الصادر"
+#: ../postfix_wizard/postfix.wiz_.c:7
+msgid "Do It"
+msgstr "افعلها"
 
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "هممم"
+
 #: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
-msgstr "يبدو أن هناك مشكلة... روح اسأل الجدع اللي واقف تحت السلم"
+msgid "You entered an empty address for the mail gateway."
+msgstr "لقد أدخلت عنواناً فارغاً لبوابة البريد."
 
 #: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "Masquerade not good!"
+msgid "Internet Mail Configuration Wizard"
+msgstr "معالج تهيئة البريد"
 
 #: ../postfix_wizard/postfix.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"POSTFIX configuration"
-msgstr ""
+msgid "Postfix wizard"
+msgstr "معالج Postfix"
 
 #: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "هيئة العنوان"
+msgid "Mail Server Name:"
+msgstr "اسم خادم البريد:"
 
 #: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet mail server is "
-"usually \\qsmtp.provider.com\\q."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet Mail services for your "
+"network."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم الويب لشبكتك"
+
 #: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "معالج تهيئة البريد"
+msgid ""
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
+msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
-"The wizard collected the following parameters needed to configure your "
-"Internet Mail Service:"
+"If you choose to configure now, you will automatically continue with the "
+"POSTFIX configuration"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:20
-msgid "Mail Address:"
-msgstr "عنوان البريد:"
+msgid ""
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet mail server is "
+"usually \\qsmtp.provider.com\\q."
+msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "لقد أدخلت عنواناً فارغاً لبوابة البريد."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "هممم"
+msgid "Configuring the Internet Mail"
+msgstr "جاري تهيئة البريد"
 
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "بوابة بريد الإنترنت"
+#: ../postfix_wizard/postfix.wiz_.c:25
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"Internet Mail Service:"
+msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "اسم خادم البريد:"
+msgid "Masquerade not good!"
+msgstr "Masquerade not good!"
 
 #: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
+msgid "Form of the Address"
+msgstr "هيئة العنوان"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr ""
+#: ../postfix_wizard/postfix.wiz_.c:29
+msgid "Mail Address:"
+msgstr "عنوان البريد:"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "منفذ البروكسي:"
-
 #: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "قام المعالج بتهيئة البروكسي بنجاح"
-
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "لقد أدخلت منفذاً قد يكون مفيداً لهذ الخدمة:"
+msgid "Proxy Configuration Wizard"
+msgstr "معالج تهيئة البروكسي"
 
 #: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "تسلسل الذاكرة المخبئية"
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "يجب عليك اختيار منفذ أكبر من 1024 و أقل من 65535"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
-msgid ""
-"Squid is a web caching proxy server, it allows faster web access for your "
-"local network."
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "تحكم الدخول:"
+
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "جاري تهيئة البروكسي"
+
+#: ../proxy_wizard/proxy.wiz_.c:13
 #, fuzzy
 msgid "Define an upper level proxy"
 msgstr "عرف أعلى مستوى للبروكسي"
 
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "نظام الملفات            الحجم  المستخدم الموجود الإستخدام% محمل في"
+
 #: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "مساحة القرص (ميغابايت):"
+msgid ""
+"Squid is a web caching proxy server, it allows faster web access for your "
+"local network."
+msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:16
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم البروكسي."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
 #, fuzzy
-msgid "Upper level proxy hostname:"
-msgstr "اسم المستضيف لأعلى مستوى بروكسي:"
+msgid "Upper level proxy port:"
+msgstr "أعلى مستوى لمنفذ البروكسي:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "للعلم, هذه مساحة /var/spool/squid على القرص:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "جاري تهيئة البروكسي"
+msgid "Proxy Port"
+msgstr "منف البروكسي"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "معالج Squid"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "المنفذ:"
-
-#: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "نظام الملفات            الحجم  المستخدم الموجود الإستخدام% محمل في"
-
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:26
 msgid ""
-"You can safely select \\qNo upper level proxy\\q if you don't need this "
-"feature."
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
+"اضغط التالي اذا كنت تريد الحفاظ على هذه القيمة أو اضغط السابق لتصحيح خياراتك."
+
+#: ../proxy_wizard/proxy.wiz_.c:24
+msgid "You have entered a port that may be useful for this service:"
+msgstr "لقد أدخلت منفذاً قد يكون مفيداً لهذ الخدمة:"
 
 #: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "الذاكرة المخبئية (ميغابايت)"
+msgid "/etc/services:"
+msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "تحكم الدخول:"
+msgid "Cache hierarchy"
+msgstr "تسلسل الذاكرة المخبئية"
 
 #: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"You can safely select \\qNo upper level proxy\\q if you don't need this "
+"feature."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "منف البروكسي"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "اضغط السابق لتغيير القيمة."
+msgid "Port:"
+msgstr "المنفذ:"
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:34
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr ""
+"قام المعالج بتجميع المعاملات التالية و التي يُحتاج اليها لتهيئة البروكسي:"
+
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "الذاكرة المخبئية (ميغابايت)"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "لا مستوى أعلى للبروكسي (مفضل)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "يجب عليك اختيار منفذ أكبر من 1024 و أقل من 65535"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "حجم الذاكرة المخبئية للبروكسي"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "اضغط السابق لتغيير القيمة."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"اضغط التالي اذا كنت تريد الحفاظ على هذه القيمة أو اضغط السابق لتصحيح خياراتك."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Localhost - الدخول مخصص فقط لهذا الخادم"
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
+msgid "Squid wizard"
+msgstr "معالج Squid"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "معالج تهيئة البروكسي"
+msgid "Proxy port:"
+msgstr "منفذ البروكسي:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "مساحة القرص (ميغابايت):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+#, fuzzy
+msgid "Upper level proxy hostname:"
+msgstr "اسم المستضيف لأعلى مستوى بروكسي:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Localhost - الدخول مخصص فقط لهذا الخادم"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"قام المعالج بتجميع المعاملات التالية و التي يُحتاج اليها لتهيئة البروكسي:"
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr "يمكن تهيئة البروكسي بدرجات مختلفة للتحكم بالدخول اليه."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-#, fuzzy
-msgid "Upper level proxy port:"
-msgstr "أعلى مستوى لمنفذ البروكسي:"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "هذا المعالج سيساعدك في تهيئة خادم البروكسي."
-
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "للعلم, هذه مساحة /var/spool/squid على القرص:"
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "قام المعالج بتهيئة البروكسي بنجاح"
 
-#: ../samba_wizard/samba.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:3
 #, fuzzy
-msgid "Enable file sharing area"
-msgstr "مكّن مشاركة الطباعة عبر الخادم"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
+msgid "Home:"
+msgstr "اسم المستضيف:"
 
-#: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr ""
+#: ../samba_wizard/samba.wiz_.c:4
+#, fuzzy
+msgid "Enable all printer"
+msgstr "مكّن خدمات Samba"
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "مجموعة العمل:"
+msgid "Make home directories available for their owners"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr ""
+msgid "Configuring Samba"
+msgstr "جاري تهيئة Samba"
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "شعار الخادم غير صحيح"
-
 #: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba يحتاج الى معرفة مجموعة عمل Windows التي سيخدمها."
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "مكّن خدمات Samba"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+msgid "The wizard successfully configured your Samba server."
+msgstr "قام المعالج بتهيئة خادم Samba بنجاح."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
+msgid "Server Banner."
+msgstr "شعار الخادم"
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "الشعار:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "خادم الطباعة:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "مجموعة العمل"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "مجموعة العمل:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:21
+#: ../samba_wizard/samba.wiz_.c:22
 msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"You have selected to allow user access their home directories via samba but "
+"you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "مشاركة الملفات:"
-
 #: ../samba_wizard/samba.wiz_.c:23
 msgid ""
-"You have selected to allow user access their home directories via samba but "
-"you/they must use smbpasswd to set a password."
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "مكّن خدمات Samba"
+msgid "Printers:"
+msgstr "خادم الطباعة:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "شعار الخادم غير صحيح"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "معالج تهيئة Samba"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
-msgstr ""
-
 #: ../samba_wizard/samba.wiz_.c:28
-msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "جاري تهيئة Samba"
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم الويب لشبكتك"
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
 msgstr "شعار الخادم"
 
+#: ../samba_wizard/samba.wiz_.c:33
+msgid "Enabled Samba Services"
+msgstr "مكّن خدمات Samba"
+
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "مكّن مشاركة الطباعة عبر الخادم"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "مجموعة العمل خطأ"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "التحكم بالدخول"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "الشعار:"
+
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "قام المعالج بتهيئة خادم Samba بنجاح."
+msgid "The Workgroup is wrong"
+msgstr "مجموعة العمل خطأ"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba يحتاج الى معرفة مجموعة عمل Windows التي سيخدمها."
+msgid "Samba wizard"
+msgstr "معالج Samba"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "شعار الخادم"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "تحكم الدخول:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "خادم الطباعة:"
-
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "معالج Samba"
-
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "معالج تهيئة Samba"
+msgid "Workgroup"
+msgstr "مجموعة العمل"
 
-#: ../samba_wizard/samba.wiz_.c:52
-msgid "Make home directories available for their owners"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:49
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
 "\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "مكّن مشاركة الطباعة عبر الخادم"
-
-#: ../samba_wizard/samba.wiz_.c:56
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "Printers:"
-msgstr "خادم الطباعة:"
+msgid "Access control"
+msgstr "التحكم بالدخول"
 
-#: ../samba_wizard/samba.wiz_.c:57
+#: ../samba_wizard/samba.wiz_.c:52
+msgid ""
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:53
 #, fuzzy
-msgid "Home:"
-msgstr "اسم المستضيف:"
+msgid "Enable file sharing area"
+msgstr "مكّن مشاركة الطباعة عبر الخادم"
 
-#: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
+#: ../samba_wizard/samba.wiz_.c:56
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:58
+msgid "File Sharing:"
+msgstr "مشاركة الملفات:"
+
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
+msgid "This wizard will set the basic networking parameters of your server."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "عنوان IP الخاص بالخادم غير صحيح"
-
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "جهاز البوابة:"
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "معالج الخادم"
-
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
+msgid "Host Name:"
+msgstr "اسم المستضيف:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "جهاز الشبكة"
+msgid "Basic Network Configuration Wizard"
+msgstr "معالج تهيئة أساسيات الشبكة"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "عنوان الخادم خطأ"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
+msgid "Server IP address:"
+msgstr "عنوان IP للخادم:"
 
 #: ../server_wizard/server.wiz_.c:10
-msgid ""
-"You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
-msgstr ""
+msgid "Network Address"
+msgstr "عنوان الشبكة"
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
+"You should not run any other applications while running this wizard and at "
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
-msgstr ""
+"The wizard successfully configured the basic networking services of your "
+"server."
+msgstr "قام المعالح بتهيئة خدمات الشبكة الأساسية للخادم الخاص بك بنجاح."
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "الجهاز"
+#, fuzzy
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
+msgstr "(تستطيع هنا تغيير القيم اذا كنت تعلم تماماً ماذا تفعل)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "تحذير"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "هذه الصفحة تحسب اسم النطاق; يجب أن تكون غير مرئية"
+msgid "Note about networking"
+msgstr "ملحوظة عن الشبكة"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "عنوان الخادم:"
+msgid "Server Address"
+msgstr "عنوان الخادم"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "اسم النظاق المحسوب"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "اسم المستضيف"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr "هذه الصفحة تحسب العنوان الإفتراضي للخادم; يجب أن تكون غير مرئية."
+msgid "The Server IP address is incorrect"
+msgstr "عنوان IP الخاص بالخادم غير صحيح"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "معالج تهيئة أساسيات الشبكة"
+msgid "Configuring your network"
+msgstr "جاري تهيئة الشبكة"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "IP البوابة:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "اسم المستضيف غير صحيح"
+msgid "This page computes the default server address; it should be invisible."
+msgstr "هذه الصفحة تحسب العنوان الإفتراضي للخادم; يجب أن تكون غير مرئية."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
+msgid "IP net address:"
+msgstr "عنوان IP net:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "بوابة خارجية"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
+msgid "Server Wizard"
+msgstr "معالج الخادم"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
+msgid ""
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "ملحوظة عن الشبكة"
+msgid ""
+"Devices are presented with the Linux name and, if known, with the card "
+"description."
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
 
 #: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"This wizard will help you in configuring the basic networking services of "
+"your server."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "خطأ في المعالج."
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
 
 #: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "اسم المستضيف غير صحيح"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
-"Devices are presented with the Linux name and, if known, with the card "
-"description."
+"The hostname is the name under which your server will be known from the "
+"other workstations in your network and maybe on the Internet (depending of "
+"your upstream configuration)."
 msgstr ""
 
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "خطأ في المعالج."
+
 #: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "عنوان الشبكة:"
+msgid "net device"
+msgstr "جهاز الشبكة"
 
 #: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "جاري تهيئة الشبكة"
+msgid "Computed domain Name"
+msgstr "اسم النظاق المحسوب"
 
 #: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "IP البوابة:"
+msgid "This page computes the domainname; it should be invisible"
+msgstr "هذه الصفحة تحسب اسم النطاق; يجب أن تكون غير مرئية"
 
 #: ../server_wizard/server.wiz_.c:40
-msgid ""
-"The hostname is the name under which your server will be known from the "
-"other workstations in your network and maybe on the Internet (depending of "
-"your upstream configuration)."
-msgstr ""
+msgid "Gateway device:"
+msgstr "جهاز البوابة:"
 
 #: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "اسم المستضيف:"
-
-#: ../server_wizard/server.wiz_.c:42
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "تحذير"
 
 #: ../server_wizard/server.wiz_.c:45
-#, fuzzy
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr "(تستطيع هنا تغيير القيم اذا كنت تعلم تماماً ماذا تفعل)"
+msgid "Device:"
+msgstr "الجهاز"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "اسم الخادم:"
+msgid "Server Address:"
+msgstr "عنوان الخادم:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "عنوان الخادم خطأ"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "عنوان الخادم"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
-msgstr "قام المعالح بتهيئة خدمات الشبكة الأساسية للخادم الخاص بك بنجاح."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
+msgstr ""
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "جهاز الشبكة"
+msgid "Host Name"
+msgstr "اسم المستضيف"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "عنوان IP net:"
+msgid "Network Address:"
+msgstr "عنوان الشبكة:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "عنوان الشبكة"
+msgid "Network Device"
+msgstr "جهاز الشبكة"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "عنوان IP للخادم:"
+msgid "Server Name:"
+msgstr "اسم الخادم:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
+msgid "University of Manchester, Manchester, England"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:3
-#, fuzzy
-msgid "Time Servers"
-msgstr "خادم الويب"
+msgid "SCI, Universite de Limoges, France"
+msgstr ""
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:5
-#, fuzzy
-msgid "Thus your server will be the local time server for your network."
-msgstr "هذا المعالج سيساعدك في تهيئة خادم FTP لشبكتك."
+msgid "Press next to start the time servers test."
+msgstr ""
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgid "(please, choose servers in your geographical area)"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
+msgid "Trinity College, Dublin, Ireland"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
+msgid "Singapore"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
+msgid "Secondary Time Server:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
+msgid "The Chinese University of Hong Kong"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
+msgid "Altea (Alicante/SPAIN)"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:18
-msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
+msgid "Select a primary and secondary server from the list."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
+msgid "CISM, Lyon, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:20
-#, fuzzy
-msgid "- no outside network"
-msgstr "ملحوظة عن الشبكة"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr ""
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
+msgid "Washington State University Tri-Cities, Richland, Wa"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
+msgid "University of Adelaide, South Australia"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
+msgid "Time zone:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
+msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgid "CRIUC, Universite de Caen, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
+msgid "- other reasons..."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
+msgid "WARNING"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
+msgid "Loria, Nancy, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
-msgstr "هذا المعالج سيساعدك في تهيئة خادم البروكسي."
+msgid "Your server can now act as a time server for your local network."
+msgstr ""
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
+msgid "Fukuoka university, Fukuoka, Japan"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr ""
+#, fuzzy
+msgid "Time Servers"
+msgstr "خادم الويب"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr ""
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم البروكسي."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
+msgid "LAAS/CNRS, Toulouse, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
+msgid "Testing the time servers availability"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr ""
-
-#: ../time_wizard/time.wiz_.c:39
-msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
+msgid "Save config without test"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
+msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:42
-#, fuzzy
-msgid "Primary Time Server:"
-msgstr "خادم الطباعة:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr ""
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
+msgid "Penn State University, University Park, PA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:45
 #, fuzzy
-msgid "Time server configuration saved"
-msgstr "معالج تهيئة خادم الويب"
+msgid "Time wizard"
+msgstr "معالج FTP"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgid "University of Oslo, Norway"
 msgstr ""
 
+#: ../time_wizard/time.wiz_.c:47
+#, fuzzy
+msgid "Thus your server will be the local time server for your network."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم FTP لشبكتك."
+
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr ""
+#, fuzzy
+msgid "- no outside network"
+msgstr "ملحوظة عن الشبكة"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr ""
+#, fuzzy
+msgid "Primary Time Server:"
+msgstr "خادم الطباعة:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr ""
+#, fuzzy
+msgid "Time server configuration saved"
+msgstr "معالج تهيئة خادم الويب"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
+msgid "Choose a time zone:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:53
-#, fuzzy
-msgid "Time wizard"
-msgstr "معالج FTP"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
+msgid "Computer Science Department, University of Wisconsin-Madison"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-msgid "Don't check any box if you don't want to activate your Web Server."
-msgstr "لا تقم بالتأشير على أي صندوق اذا لم تكن تريد تفعيل خادم الويب."
+msgid ""
+"Your server can act as a Web Server toward your internal network (intranet) "
+"and as a Web Server for the Internet."
+msgstr ""
+"خادمك يمكن أن بعمل كخادم ويب لشبكتك الداخلية (الإنترانت) أو كخادم ويب "
+"للإنترنت."
 
 #: ../web_wizard/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr "قام المعالج بتهيئة خادم الويب للإنترنت/الإنترانت بنجاح"
+#, fuzzy
+msgid "Internet web server:"
+msgstr "خادم الويب للإنترنت:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
-"قام المعالج بجمع المعاملات التالية و التي يحتاج اليها خادم الويب لتهيئته"
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "معالج الويب"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
+msgstr ""
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
-msgstr "هذا المعالج سيساعدك في تهيئة خادم الويب لشبكتك"
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "مكّن خادم الويب للإنترنت"
 
 #: ../web_wizard/web.wiz_.c:12
-#, fuzzy
-msgid "Internet web server:"
-msgstr "خادم الويب للإنترنت:"
+msgid "Configuring the Web Server"
+msgstr "جاري تهيئة خادم الويب"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "مكّن خادم الويب للإنترنت"
+msgid "Web Server"
+msgstr "خادم الويب"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
-msgstr ""
-"خادمك يمكن أن بعمل كخادم ويب لشبكتك الداخلية (الإنترانت) أو كخادم ويب "
-"للإنترنت."
-
-#: ../web_wizard/web.wiz_.c:15
 #, fuzzy
 msgid "Enable the Web Server for the Internet"
 msgstr "مكّن خادم الويب للإنترنت"
 
+#: ../web_wizard/web.wiz_.c:15
+msgid "User directory:"
+msgstr ""
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "اختر نوع خدمة الويب الذي تريد تفعيله:"
+#, fuzzy
+msgid "This wizard will help you configuring the Web Server for your network."
+msgstr "هذا المعالج سيساعدك في تهيئة خادم الويب لشبكتك"
 
 #: ../web_wizard/web.wiz_.c:17
-msgid "document root:"
-msgstr ""
+msgid "Web wizard"
+msgstr "معالج الويب"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "خادم الويب للإنترانت:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "جاري تهيئة خادم الويب"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "خادم الويب"
+msgid "Don't check any box if you don't want to activate your Web Server."
+msgstr "لا تقم بالتأشير على أي صندوق اذا لم تكن تريد تفعيل خادم الويب."
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "معالج تهيئة خادم الويب"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "اختر نوع خدمة الويب الذي تريد تفعيله:"
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr ""
+"قام المعالج بجمع المعاملات التالية و التي يحتاج اليها خادم الويب لتهيئته"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr "قام المعالج بتهيئة خادم الويب للإنترنت/الإنترانت بنجاح"
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr ""
+msgid "Web Server Configuration Wizard"
+msgstr "معالج تهيئة خادم الويب"
 
 msgid "Cancel"
 msgstr "الغاء"
diff --git a/po/bg.po b/po/bg.po
index 4876a36b..7021a761 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-09-03  02:19+0200\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian\n"
@@ -13,192 +13,193 @@ msgstr ""
 "Content-Type: text/plain; charset=windows-1251\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"������ � ������� ����� � ��������,����� � ������� � ��� � ��� ���� IP �����"
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "���� �� � �������� �����... ��������� \"�������\",�� �� ����������"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "�����"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"��������� \"�������\",��� ������� �� ��������� ���� �������������� ��������,"
-"��� \"�����\",�� �� ���������� ������ ��"
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "������������"
+"��� �������� �� ������������� ����,����������� �� ���������� � "
+"�������������� �� �������"
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "��������� �� DNS ������"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr "��������� \"�������\" �� �� ���������,��� \"�����\",�� �� ����������"
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"������ ������ ������ �� ���� ����������� �� ��� ���� ���.��������.net. ����� "
+"�������� � ������� ������ �� ��� (��������) IP �����, ������� �� ��������� "
+"�����"
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "����������� ����� �������� ���������,���������� �� �� �������� ������ � "
 "������� ��"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "�������� ������,�� �� ��������� �������������"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "��� �� �������"
+msgid "The wizard successfully added the client."
+msgstr "����������� ������� ������ �������"
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "�������� �� ��� ������ �� �������"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(�� �� ������ �� ������ ����� �� �������)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "������������"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"�������� ��������,�� �������� IP ����� ��������� ��� ������ �� �� �������� � "
+"�������"
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "������������� �� �������:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "��������������:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(�� �� ������ �� ������ ����� �� �������)"
+msgid "Name of the machine:"
+msgstr "��� �� ��������:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"��� �������� �� ������������� ����,����������� �� ���������� � "
-"�������������� �� �������"
+msgid "Adding a new client to your network"
+msgstr "�������� �� ��� ������ �� �������"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"�������� �� �������� ������,����� �������� ���,�� �� ������� ����� �� "
-"������� �������� �� ������� ������ ��� ������ �����"
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "�������� ������,�� �� ��������� �������������"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "������ ��� ��� �� ������ ��� IP �����,����� ���� ����������"
+msgid "Client identification:"
+msgstr "������������� �� �������:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "����������� ������� ������ �������"
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "��� �� ��������:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "�����"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"������ ������ ������ �� ���� ����������� �� ��� ���� ���.��������.net. ����� "
-"�������� � ������� ������ �� ��� (��������) IP �����, ������� �� ��������� "
-"�����"
+"������ � ������� ����� � ��������,����� � ������� � ��� � ��� ���� IP �����"
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"�������� ��������,�� �������� IP ����� ��������� ��� ������ �� �� �������� � "
-"�������"
 
-#: ../client_wizard/client.wiz_.c:21
-msgid "DNS Wizard (add client)"
-msgstr ""
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "���� �� � �������� �����... ��������� \"�������\",�� �� ����������"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "IP ����� �� �������:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "IP ����� �� ���������:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "������������"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "�����"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "������ �� ��� ������������,�� �� ������� ���� ���������"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "������� �� � ������������� ���"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "������ ��� ��� �� ������ ��� IP �����,����� ���� ����������"
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+msgid "DNS Wizard (add client)"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "��������� \"�������\" �� �� ���������,��� \"�����\",�� �� ����������"
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "�����"
 
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
+msgstr ""
+
+#: ../client_wizard/client.wiz_.c:28
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
+"�������� �� �������� ������,����� �������� ���,�� �� ������� ����� �� "
+"������� �������� �� ������� ������ ��� ������ �����"
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "������ �� ��� ������������,�� �� ������� ���� ���������"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "������������"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "IP ����� �� ���������:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "IP ����� �� �������:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"��������� \"�������\",��� ������� �� ��������� ���� �������������� ��������,"
+"��� \"�����\",�� �� ���������� ������ ��"
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
@@ -206,192 +207,196 @@ msgstr ""
 "������ �� ������������� ��������� ������� ���������,���� �� ������� ���� "
 "���������"
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "��������������:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "��������������� ���������"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "MySQL ������ �� ���� �����"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "����,�������� ������������� ��� � ������ �� �� �������� ����������"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "��� �� �������"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "�������� �� ����������"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr ""
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
 msgstr ""
 
+#: ../db_wizard/db.wiz_.c:7
+msgid "Confirm"
+msgstr "������������"
+
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
+msgid "Password:"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
+msgid "The wizard successfully configured your MySQL Database Server"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "������������"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
+msgid "Username:"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
+msgid "Add"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
+msgid "Database Server"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
+msgid "Note: This user will have all permissions"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:17
-msgid "Note: This user will have all permissions"
+msgid "MySQL Database wizard"
 msgstr ""
 
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "��������������� ���������"
+
 #: ../db_wizard/db.wiz_.c:20
-msgid "Add"
+msgid "To run your server, you first need to specify a root password"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
+msgid "Root Password:"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "MySQL ������ �� ���� �����"
+
+#: ../db_wizard/db.wiz_.c:24
+msgid ""
+"The wizard collected the following parameters needed to configure your MySQL "
+"Database Server"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:25
-msgid "To run your server, you first need to specify a root password"
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr ""
+msgid "Please enter a username and password to add a user"
+msgstr "����,�������� ������������� ��� � ������ �� �� �������� ����������"
 
 #: ../db_wizard/db.wiz_.c:27
 msgid ""
-"The wizard collected the following parameters needed to configure your MySQL "
-"Database Server"
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
-msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr ""
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
+msgid "Lowest IP Address:"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr ""
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
-msgid "The wizard successfully configured the DHCP services of your server."
+msgid "Range of addresses used by dhcp"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
+#: ../dhcp_wizard/dhcp.wiz_.c:12
+msgid "The wizard successfully configured the DHCP services of your server."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:16
+#: ../dhcp_wizard/dhcp.wiz_.c:13
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
-msgstr ""
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
+msgid "Highest IP Address:"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
+msgid "DHCP Configuration Wizard"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr ""
 
+#: ../dns_wizard/dns.wiz_.c:1
+msgid ""
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
+msgstr ""
+
 #: ../dns_wizard/dns.wiz_.c:2
-msgid "DNS Wizard (configuration)"
+msgid "Press next to leave these values empty, or back to enter a value."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:8
-msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:9
@@ -399,21 +404,10 @@ msgid "Configuring the DNS Server"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
+msgid "DNS Configuration Wizard"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr ""
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -421,36 +415,43 @@ msgid ""
 "by your Internet provider."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr ""
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
+#: ../dns_wizard/dns.wiz_.c:17
+msgid ""
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:20
-msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+msgid "Secondary DNS Address:"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:22
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
+msgid "DNS Wizard (configuration)"
 msgstr ""
 
 #: ../drakwizard.pl_.c:62
@@ -462,574 +463,574 @@ msgid "Please select a wizard"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
+msgid "Medium - web, ftp and ssh shown to outside"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
+#: ../firewall_wizard/firewall.wiz_.c:5
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
+msgid "Device"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr ""
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
+msgid "Internet Network Device:"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr ""
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
+msgid "The device name is not correct"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr ""
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr ""
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
+msgid "The wizard successfully configured your server firewall."
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:22
-msgid "This wizard will help you configuring your server firewall."
+msgid "Configuring the Firewall"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:23
-msgid "Low - Light filtering, standard services available"
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr ""
+#, fuzzy
+msgid "This wizard will help you configuring your server firewall."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
 
 #: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
+msgid "Low - Light filtering, standard services available"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
+msgid "Protection Level:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
+#: ../ftp_wizard/ftp.wiz_.c:3
+msgid "Public directory:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:4
 msgid "Internet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+#: ../ftp_wizard/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+#: ../ftp_wizard/ftp.wiz_.c:7
+msgid "FTP wizard"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:12
-msgid "Public directory:"
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
+#: ../ftp_wizard/ftp.wiz_.c:11
+msgid "Don't check any box if you don't want to activate your FTP Server."
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
+#: ../ftp_wizard/ftp.wiz_.c:12
+msgid "Configuring the FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:17
-msgid ""
-"The wizard collected the following parameters needed to configure your FTP "
-"Server"
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
+#: ../ftp_wizard/ftp.wiz_.c:15
+msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:22
-msgid "FTP Server Configuration Wizard"
+#: ../ftp_wizard/ftp.wiz_.c:21
+msgid ""
+"The wizard collected the following parameters needed to configure your FTP "
+"Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
 msgstr ""
 
 #: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
+msgid "FTP Server Configuration Wizard"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"Your server can act as an FTP Server toward your internal network (intranet) "
+"and as an FTP Server for the Internet."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
+msgid "Polling Interval:"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
+msgid "Polling Period"
 msgstr ""
 
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
+#: ../news_wizard/news.wiz_.c:4
+msgid ""
+"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/news.wiz_.c:6
-msgid "News Server"
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:9
-msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
-"Internet News; the polling period set the interval between two consecutive "
-"polling."
+msgid "The polling period is not correct"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr ""
 
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr ""
+
 #: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
+msgid ""
+"Depending on the kind of internet connection you have, an appropriate "
+"polling period can change between 6 and 24 hours."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:13
 msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
+"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/news.wiz_.c:15
-msgid "Polling Period"
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:16
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
-"polling period can change between 6 and 24 hours."
+"The wizard collected the following parameters needed to configure your "
+"Internet News Service:"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr ""
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
+msgid "Polling Period (Hours):"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:19
-msgid ""
-"The news server name is the name of the host providing the Internet news to "
-"your network; the name is usually provided by your provider."
+msgid "News Server Name:"
 msgstr ""
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"The wizard collected the following parameters needed to configure your "
-"Internet News Service:"
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:22
-msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
-msgstr ""
-
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
+msgid "Welcome to the News Wizard"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:24
-msgid ""
-"The wizard successfully configured your Internet News service of your server."
+msgid "News Server"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
+msgid "News Server:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
-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."
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:3
-msgid "NFS Server Configuration Wizard"
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
+msgid ""
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
-msgid "NFS Server"
+#: ../nfs_wizard/nfs.wiz_.c:4
+msgid "Access :"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
-msgid "All - No access restriction"
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
-msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
 msgstr ""
+"����������� ����� �������� ���������,���������� �� �� �������� ������ � "
+"������� ��"
 
-#: ../nfs_wizard/nfs.wiz_.c:11
-msgid "This wizard will help you configuring the NFS Server for your network."
+#: ../nfs_wizard/nfs.wiz_.c:10
+msgid "NFS Server Configuration Wizard"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
+msgid "NFS Wizard"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
 msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
+msgid "NFS Server"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
+msgid "All - No access restriction"
 msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:18
-#, fuzzy
-msgid "The wizard collected the following parameters."
+msgid "Netmask :"
 msgstr ""
-"����������� ����� �������� ���������,���������� �� �� �������� ������ � "
-"������� ��"
 
 #: ../nfs_wizard/nfs.wiz_.c:19
-msgid "Access :"
+msgid "Directory:"
 msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr ""
+#, fuzzy
+msgid "This wizard will help you configuring the NFS Server for your network."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
 
 #: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
+msgid "The wizard successfully configured your NFS Server"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:1
-msgid "Do It"
+#: ../postfix_wizard/postfix.wiz_.c:2
+msgid "There seems to be a problem..."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:3
-msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+msgid "Internet Mail Gateway"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
+msgid "Outgoing Mail Address"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:6
-msgid "Postfix wizard"
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:7
-msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+msgid "Do It"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"This wizard will help you configuring the Internet Mail services for your "
-"network."
-msgstr ""
-
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:10
-msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
+msgid "Hmmm"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
+msgid "Internet Mail Configuration Wizard"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"POSTFIX configuration"
+msgid "Postfix wizard"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
+msgid "Mail Server Name:"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet mail server is "
-"usually \\qsmtp.provider.com\\q."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet Mail services for your "
+"network."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
+
 #: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
+msgid ""
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
-"The wizard collected the following parameters needed to configure your "
-"Internet Mail Service:"
+"If you choose to configure now, you will automatically continue with the "
+"POSTFIX configuration"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:20
-msgid "Mail Address:"
+msgid ""
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet mail server is "
+"usually \\qsmtp.provider.com\\q."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr ""
-
-#: ../postfix_wizard/postfix.wiz_.c:22
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
+msgid "Configuring the Internet Mail"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
+#: ../postfix_wizard/postfix.wiz_.c:25
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"Internet Mail Service:"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
+msgid "Masquerade not good!"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
+msgid "Form of the Address"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
+#: ../postfix_wizard/postfix.wiz_.c:29
+msgid "Mail Address:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:2
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
+#: ../proxy_wizard/proxy.wiz_.c:4
+msgid "Proxy Configuration Wizard"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
+#: ../proxy_wizard/proxy.wiz_.c:8
+msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
+#: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:9
-msgid ""
-"Squid is a web caching proxy server, it allows faster web access for your "
-"local network."
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:10
+#: ../proxy_wizard/proxy.wiz_.c:13
 msgid "Define an upper level proxy"
 msgstr ""
 
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr ""
+
 #: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
+msgid ""
+"Squid is a web caching proxy server, it allows faster web access for your "
+"local network."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
+msgid "Proxy Port"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:26
-msgid ""
-"You can safely select \\qNo upper level proxy\\q if you don't need this "
-"feature."
+msgid "You have entered a port that may be useful for this service:"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
+msgid "/etc/services:"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
+msgid "Cache hierarchy"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"You can safely select \\qNo upper level proxy\\q if you don't need this "
+"feature."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
+msgid "Port:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
+#: ../proxy_wizard/proxy.wiz_.c:31
+msgid ""
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:34
-msgid "No upper level proxy (recommended)"
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
+#: ../proxy_wizard/proxy.wiz_.c:37
+msgid "No upper level proxy (recommended)"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:38
@@ -1037,341 +1038,338 @@ msgid "Proxy Cache Size"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:39
-msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+msgid "Press back to change the value."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
+#: ../proxy_wizard/proxy.wiz_.c:41
+msgid ""
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
+msgid "Squid wizard"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
+msgid "Proxy port:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:46
-msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:49
-msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+#: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:50
-msgid "The proxy can be configured to use different access control levels."
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
+#: ../proxy_wizard/proxy.wiz_.c:50
+msgid ""
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
+#: ../proxy_wizard/proxy.wiz_.c:52
+msgid ""
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
+msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:1
-msgid "Enable file sharing area"
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
+#: ../samba_wizard/samba.wiz_.c:3
+msgid "Home:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
+#: ../samba_wizard/samba.wiz_.c:4
+msgid "Enable all printer"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
+msgid "Make home directories available for their owners"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
+msgid "Configuring Samba"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
+#: ../samba_wizard/samba.wiz_.c:11
+msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
+msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
+msgid "Server Banner."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
+msgid ""
+"You have selected to allow user access their home directories via samba but "
+"you/they must use smbpasswd to set a password."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:23
 msgid ""
-"You have selected to allow user access their home directories via samba but "
-"you/they must use smbpasswd to set a password."
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
+msgid "Printers:"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:25
-msgid "Enable all printer"
+msgid "The Server Banner is incorrect"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:26
-msgid ""
-"Samba allows your server to behave as a file and print server for "
-"workstations running non-Linux systems."
+msgid "Samba Configuration Wizard"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:28
-msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr ""
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr ""
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
+msgid "Enabled Samba Services"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:40
-msgid "Access control"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
+msgid "The Workgroup is wrong"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
+msgid "Samba wizard"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:46
 msgid "Access level :"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
+msgid "Workgroup"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
-msgid "Make home directories available for their owners"
+#: ../samba_wizard/samba.wiz_.c:50
+msgid "Access control"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
+#: ../samba_wizard/samba.wiz_.c:53
+msgid "Enable file sharing area"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:56
-msgid "Printers:"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
+msgid "File Sharing:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
+msgid "This wizard will set the basic networking parameters of your server."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
+msgid "Host Name:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
+#: ../server_wizard/server.wiz_.c:7
+msgid "Basic Network Configuration Wizard"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:7
-msgid "net device"
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
+msgid "Server IP address:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:10
-msgid ""
-"You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+msgid "Network Address"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
+"You should not run any other applications while running this wizard and at "
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"The wizard successfully configured the basic networking services of your "
+"server."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
+msgid "Note about networking"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
+msgid "Server Address"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
+msgid "The Server IP address is incorrect"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
+msgid "Configuring your network"
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
+msgid "This page computes the default server address; it should be invisible."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
+msgid "IP net address:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:25
@@ -1379,438 +1377,449 @@ msgid "External gateway"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
+msgid "Server Wizard"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
+msgid ""
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
+msgid ""
+"Devices are presented with the Linux name and, if known, with the card "
+"description."
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"This wizard will help you in configuring the basic networking services of "
+"your server."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
-"Devices are presented with the Linux name and, if known, with the card "
-"description."
+"The hostname is the name under which your server will be known from the "
+"other workstations in your network and maybe on the Internet (depending of "
+"your upstream configuration)."
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
+msgid "net device"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
+msgid "Computed domain Name"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
+msgid "This page computes the domainname; it should be invisible"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:40
-msgid ""
-"The hostname is the name under which your server will be known from the "
-"other workstations in your network and maybe on the Internet (depending of "
-"your upstream configuration)."
+msgid "Gateway device:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:42
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
+msgid "Device:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
+msgid "Server Address:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
+msgid "Host Name"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
+msgid "Network Address:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
+msgid "Network Device"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
+msgid "Server Name:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
+msgid "University of Manchester, Manchester, England"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
+msgid "SCI, Universite de Limoges, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
+msgid "Press next to start the time servers test."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgid "(please, choose servers in your geographical area)"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
+msgid "Trinity College, Dublin, Ireland"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
+msgid "Singapore"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
+msgid "Secondary Time Server:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
+msgid "The Chinese University of Hong Kong"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
+msgid "Altea (Alicante/SPAIN)"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:18
-msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
+msgid "Select a primary and secondary server from the list."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
+msgid "CISM, Lyon, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
+msgid "Inet, Inc., Seoul, Korea"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
+msgid "Washington State University Tri-Cities, Richland, Wa"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
+msgid "University of Adelaide, South Australia"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
+msgid "Time zone:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
+msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgid "CRIUC, Universite de Caen, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
+msgid "- other reasons..."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
+msgid "WARNING"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
+msgid "Loria, Nancy, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:31
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
+msgid "Fukuoka university, Fukuoka, Japan"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
+msgid "Time Servers"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
+msgid "LAAS/CNRS, Toulouse, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
+msgid "Testing the time servers availability"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr ""
-
-#: ../time_wizard/time.wiz_.c:39
-msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
+msgid "Save config without test"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
+msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
+msgid "Baylor College of Medicine, Houston, Tx"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
+msgid "Penn State University, University Park, PA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
+msgid "Time wizard"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgid "University of Oslo, Norway"
+msgstr ""
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
+msgid "- no outside network"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
+msgid "Primary Time Server:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
+msgid "Time server configuration saved"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
+msgid "Choose a time zone:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr ""
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
+msgid "Computer Science Department, University of Wisconsin-Madison"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid ""
+"Your server can act as a Web Server toward your internal network (intranet) "
+"and as a Web Server for the Internet."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "Internet web server:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:12
-msgid "Internet web server:"
+msgid "Configuring the Web Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
+msgid "Web Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+msgid "Enable the Web Server for the Internet"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:15
-msgid "Enable the Web Server for the Internet"
-msgstr ""
+#, fuzzy
+msgid "User directory:"
+msgstr "�������� �� ����������"
 
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr ""
+#, fuzzy
+msgid "This wizard will help you configuring the Web Server for your network."
+msgstr "���� ��������� �� �� ������� �� �������� ��� ������ � �������� �� DNS"
 
 #: ../web_wizard/web.wiz_.c:17
-msgid "document root:"
+msgid "Web wizard"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr ""
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
+msgid "Don't check any box if you don't want to activate your Web Server."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
+msgid "Select the kind of Web service you want to activate:"
+msgstr ""
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr ""
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
+msgid "Web Server Configuration Wizard"
 msgstr ""
 
 msgid "Cancel"
diff --git a/po/bs.po b/po/bs.po
index b455416f..b401874d 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizaed\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-09-07 12:13+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -14,228 +14,216 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Klijent vaše lokalne mreže je neka mašina koja je spojena na mrežu i koja "
-"ima svoje vlastito ime i IP broj."
+"Pritisnite Dalje da podesite sada ove parametre, ili Odustani da izađete iz "
+"čarobnjaka."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "Ovo nije ispravna adresa... pritisnite Dalje za nastavak"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "U redu"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"Pritisnite Dalje ako želite da promjenite već postojeću vrijednost, ili "
-"Nazad ako želite ispraviti vaš izbor."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Čestitam"
+"Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
+"klijenta"
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "DNS klijent čarobnjak"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr "Pritisnite Dalje za početak, ili Odustani za izlaz iz čarobnjaka."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"Vaš klijent na mreži će biti identificiran imenom, kao što je imeklijenta."
+"preduzeće.ba. Svaki računar u mreži mora imati (jedinstvenu) IP adresu, u "
+"uobičajenom obliku sa tačkama."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni da bi dodali "
 "klijenta vašoj mreži:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Sistemska greška, nije izvršeno podešavanje"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "Ime klijenta"
+msgid "The wizard successfully added the client."
+msgstr "Čarobnjak je uspješno dodao klijenta."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Dodajem novog klijenta vašoj mreži"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(ne morate unositi domen nakon imena)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Podesi"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"Obratite pažnju da dati IP broj i ime klijenta moraju biti jedinstveni u "
+"ovoj mreži."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Identifikacija klijenta:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Upozorenje:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(ne morate unositi domen nakon imena)"
+msgid "Name of the machine:"
+msgstr "Ime računara:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
-"klijenta"
+msgid "Adding a new client to your network"
+msgstr "Dodajem novog klijenta vašoj mreži"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Server će koristiti informacije koje unesete ovdje kako bi učinio da ime "
-"klijenta bude dostupno drugim računarima u vašoj mreži."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Sistemska greška, nije izvršeno podešavanje"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Unijeli ste ime računara ili IP broj koji se već koriste."
+msgid "Client identification:"
+msgstr "Identifikacija klijenta:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "Čarobnjak je uspješno dodao klijenta."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr ""
+"Ovaj čarobnjak će vam pomoći u dodavanju novog klijenta u vaš lokalni DNS."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "Ime računara:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "U redu"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"Vaš klijent na mreži će biti identificiran imenom, kao što je imeklijenta."
-"preduzeće.ba. Svaki računar u mreži mora imati (jedinstvenu) IP adresu, u "
-"uobičajenom obliku sa tačkama."
+"Klijent vaše lokalne mreže je neka mašina koja je spojena na mrežu i koja "
+"ima svoje vlastito ime i IP broj."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"Obratite pažnju da dati IP broj i ime klijenta moraju biti jedinstveni u "
-"ovoj mreži."
+"Da prihvatite ove vrijednosti i dodate klijenta, kliknite na dugme Dalje ili "
+"koristite dugme Nazad da ih ispravite."
 
-#: ../client_wizard/client.wiz_.c:21
-#, fuzzy
-msgid "DNS Wizard (add client)"
-msgstr "DNS čarobnjak"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "Ovo nije ispravna adresa... pritisnite Dalje za nastavak"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Upozorenje\\nNalazite se u dhcp-u, server možda neće raditi sa ovom "
-"konfiguracijom."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "IP klijenta:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "IP broj računara:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Podesi"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Izlaz"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "Morate biti root da biste pokrenuli ovaj čarobnjak"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Mreža još nije podešena"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr ""
-"Ovaj čarobnjak će vam pomoći u dodavanju novog klijenta u vaš lokalni DNS."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Unijeli ste ime računara ili IP broj koji se već koriste."
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+#, fuzzy
+msgid "DNS Wizard (add client)"
+msgstr "DNS čarobnjak"
+
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Izlaz"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"Da prihvatite ove vrijednosti i dodate klijenta, kliknite na dugme Dalje ili "
-"koristite dugme Nazad da ih ispravite."
+"Upozorenje\\nNalazite se u dhcp-u, server možda neće raditi sa ovom "
+"konfiguracijom."
 
 #: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Pritisnite Dalje za početak, ili Odustani za izlaz iz čarobnjaka."
-
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Pritisnite Dalje da podesite sada ove parametre, ili Odustani da izađete iz "
-"čarobnjaka."
+"Server će koristiti informacije koje unesete ovdje kako bi učinio da ime "
+"klijenta bude dostupno drugim računarima u vašoj mreži."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "Morate biti root da biste pokrenuli ovaj čarobnjak"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Čestitam"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "IP broj računara:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "IP klijenta:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Pritisnite Dalje ako želite da promjenite već postojeću vrijednost, ili "
+"Nazad ako želite ispraviti vaš izbor."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
 msgstr "Morate podesiti osnovne mrežne parametre prije pokretanja čarobnjaka."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Upozorenje:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Čarobnjak za podešavanje"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "MySQL database server"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Molim unesite korisničko ime i šifru da dodate korisnika"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "Ime klijenta"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Dodavanje korisnika"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -243,75 +231,68 @@ msgstr ""
 "Da prihvatite ove vrijednosti i podesite server, kliknite na \\qPotvrdi\\q "
 "ili koristite dugme Nazad da ih ispravite."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Molim unesite šifru za root korisnika:"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "Podešavanje MySQL servera"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "Čarobnjak je uspješno podesio vaš MySQL server bazu podataka"
+msgid "Confirm"
+msgstr "Potvrdi"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Server baze podataka"
+msgid "Password:"
+msgstr "Šifra:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Root šifra:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "Čarobnjak je uspješno podesio vaš MySQL server bazu podataka"
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Potvrdi"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "Žalim, morate biti root da uradite ovo..."
+msgid "Username:"
+msgstr "Korisničko ime:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Šifra:"
+msgid "Add"
+msgstr "Dodaj"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
-"MySQL baze podataka."
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "Žalim, morate biti root da uradite ovo..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
-"Ovaj čarobnjak će vam pomoći u podešavanju MySQL servera za vašu mrežu."
+msgid "Database Server"
+msgstr "Server baze podataka"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Korisničko ime:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Napomena: Ovaj korisnik će imati sve dozvole"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Molim unesite šifru za root korisnika:"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "MySQL čarobnjak"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "Podešavanje MySQL servera"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Čarobnjak za podešavanje"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr "Da pokrenete server, morate prvo navesti root šifru"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "MySQL čarobnjak"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Root šifra:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "MySQL database server"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -319,34 +300,58 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "MySQL servera"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
-msgstr "IP adrese su u vidu četiri broja manja od 256 razdvojena tačkama."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
+msgstr ""
+"Ovaj čarobnjak će vam pomoći u podešavanju MySQL servera za vašu mrežu."
+
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Molim unesite korisničko ime i šifru da dodate korisnika"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../db_wizard/db.wiz_.c:27
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
+msgstr ""
+"Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
+"MySQL baze podataka."
+
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr ""
+"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
+"DHCP servisa:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Popravi"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
-"Izaberite raspon adresa koje će biti dodjeljene radnim stanicama putem DHCP "
-"servisa; osim ako imate neke posebne potrebe, možete slobodno prihvatiti "
-"predložene vrijednosti."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Najveća IP adresa:"
+msgid "Lowest IP Address:"
+msgstr "Najmanja IP adresa:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "Raspon adresa koje koristi DHCP"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr "IP adrese su u vidu četiri broja manja od 256 razdvojena tačkama."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -354,96 +359,84 @@ msgstr ""
 "Da prihvatite ove vrijednosti i podesite server, kliknite na dugme Dalje ili "
 "koristite dugme Nazad da ih ispravite."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"DHCP je servis koji automatski dodjeljuje mrežne adrese vašim radnim "
-"stanicama."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "DHCP čarobnjak"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Popravi"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "Ovaj čarobnjak će vam pomoći da podesite DHCP servis na ovom serveru."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "Raspon adresa koje koristi DHCP"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Čarobnjak je uspješno podesio DHCP servis na ovom serveru."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Ovaj čarobnjak će vam pomoći da podesite DHCP servis na ovom serveru."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
-"DHCP servisa:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Najmanja IP adresa:"
+"Izaberite raspon adresa koje će biti dodjeljene radnim stanicama putem DHCP "
+"servisa; osim ako imate neke posebne potrebe, možete slobodno prihvatiti "
+"predložene vrijednosti."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "DHCP čarobnjak"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "IP raspon koji ste unijeli nije ispravan"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
+"DHCP je servis koji automatski dodjeljuje mrežne adrese vašim radnim "
+"stanicama."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "IP raspon koji ste unijeli nije ispravan"
+msgid "Highest IP Address:"
+msgstr "Najveća IP adresa:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
+msgid "DHCP Configuration Wizard"
 msgstr "DHCP čarobnjak"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "Podešavanje DHCP servera"
 
-#: ../dns_wizard/dns.wiz_.c:2
-#, fuzzy
-msgid "DNS Wizard (configuration)"
-msgstr "DNS čarobnjak"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje DNS "
-"servisa:"
+"Ova postavka može biti prihvaćena, ali nećete biti u mogućnosti da "
+"identificirate imena računara izvan vaše lokalne mreže."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr ""
+"Pritisnite Dalje da ostavite ove vrijednosti praznim, ili Nazad da unesete "
+"nešto."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Primarna DNS adresa:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "Podešavanje DNS servera"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Sekundarna DNS adresa:"
+msgid "DNS Configuration Wizard"
+msgstr "DNS čarobnjak"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "Adrese DNS servera"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Ovaj čarobnjak će vam pomoći da podesite DNS servis na ovom serveru. "
-"Podešavajući ga pružićete lokalni DNS servis za imena lokalnih računara, pri "
-"čemu su svi ne-lokalni zahtjevi preusmjereni na neki vanjski DNS."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -455,43 +448,53 @@ msgstr ""
 "IP adrese primarnog i sekundarnog DNS servera; obično ove adrese dobivate od "
 "vašeg Internet provajdera."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "Čarobnjak je uspješno podesio DNS servis na ovom serveru."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Unijeli ste praznu adresu za DNS server."
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
-"Pritisnite Dalje da ostavite ove vrijednosti praznim, ili Nazad da unesete "
-"nešto."
-
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "DNS čarobnjak"
+"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje DNS "
+"servisa:"
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Primarna DNS adresa:"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
+msgstr "Adrese DNS servera"
 
-#: ../dns_wizard/dns.wiz_.c:20
+#: ../dns_wizard/dns.wiz_.c:17
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Ova postavka može biti prihvaćena, ali nećete biti u mogućnosti da "
-"identificirate imena računara izvan vaše lokalne mreže."
+"DNS (Domain Name Server) je servis koji ostvaruje relaciju između internet "
+"imena i stvarnog računara."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Sekundarna DNS adresa:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"DNS (Domain Name Server) je servis koji ostvaruje relaciju između internet "
-"imena i stvarnog računara."
+"Ovaj čarobnjak će vam pomoći da podesite DNS servis na ovom serveru. "
+"Podešavajući ga pružićete lokalni DNS servis za imena lokalnih računara, pri "
+"čemu su svi ne-lokalni zahtjevi preusmjereni na neki vanjski DNS."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "Čarobnjak je uspješno podesio DNS servis na ovom serveru."
+#, fuzzy
+msgid "DNS Wizard (configuration)"
+msgstr "DNS čarobnjak"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -502,62 +505,68 @@ msgid "Please select a wizard"
 msgstr "Molim odaberite čarobnjaka"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Uređaj"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "Srednji - web, ftp i ssh se vide izvana"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr "Visoki - nema vidljivosti izvana, korisnici su ograničeni na web"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Nešto grozno se desilo"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Čarobnjak za podešavanje firewalla"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
+"firewalla:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr ""
+"Firewall štiti vašu internu mrežu od neautorizovanog pristupa sa Interneta."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "Internet mrežni uređaj:"
+msgid "Device"
+msgstr "Uređaj"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Popravi"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Firewall čarobnjak"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Nema - Bez zaštite"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "Nivo zaštite:"
+msgid "Internet Network Device:"
+msgstr "Internet mrežni uređaj:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Firewall čarobnjak"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Firewall može biti podešen da bi pružio različite nivoe zaštite; izaberite "
+"nivo koji odgovara vašim potrebama.  Ako ne znate, Srednji nivo je obično "
+"najpogodniji."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "Čarobnjak je uspješno podesio firewall na ovom serveru."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "Srednji - web, ftp i ssh se vide izvana"
+msgid "The device name is not correct"
+msgstr "Ime uređaja nije ispravno"
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "Nivo zaštite"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Popravi"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Izlaz"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Čarobnjak za podešavanje firewalla"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "Ime uređaja nije ispravno"
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -565,90 +574,101 @@ msgstr ""
 "Firewall mora znati kako je vaš server spojen na Internet; odaberite uređaj "
 "koji koristite za vanjsku vezu."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr ""
-"Firewall štiti vašu internu mrežu od neautorizovanog pristupa sa Interneta."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "Nivo zaštite"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "Podešavanje firewall-a"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Nešto grozno se desilo"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "Firewall mrežni uređaj"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Nema - Bez zaštite"
+msgid "The wizard successfully configured your server firewall."
+msgstr "Čarobnjak je uspješno podesio firewall na ovom serveru."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
-msgid "This wizard will help you configuring your server firewall."
-msgstr "Ovaj čarobnjak će vam pomoći da podesite firewall na ovom serveru."
+msgid "Configuring the Firewall"
+msgstr "Podešavanje firewall-a"
 
-#: ../firewall_wizard/firewall.wiz_.c:23
-msgid "Low - Light filtering, standard services available"
-msgstr "Niski - Lagano filtriranje, standardni servisi su dostupni"
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Izlaz"
 
 #: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "Firewall mrežni uređaj"
+#, fuzzy
+msgid "This wizard will help you configuring your server firewall."
+msgstr "Ovaj čarobnjak će vam pomoći da podesite firewall na ovom serveru."
 
 #: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
-msgstr ""
-"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
-"firewalla:"
+msgid "Low - Light filtering, standard services available"
+msgstr "Niski - Lagano filtriranje, standardni servisi su dostupni"
 
 #: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Firewall može biti podešen da bi pružio različite nivoe zaštite; izaberite "
-"nivo koji odgovara vašim potrebama.  Ako ne znate, Srednji nivo je obično "
-"najpogodniji."
+msgid "Protection Level:"
+msgstr "Nivo zaštite:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "Izaberite vrstu FTP servisa koji želite pokrenuti:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
+msgstr "Ovaj čarobnjak će vam pomoći da podesite FTP server za vašu mrežu."
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:3
+#, fuzzy
+msgid "Public directory:"
+msgstr "Direktorij:"
 
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:4
 msgid "Internet FTP Server:"
 msgstr "Internet FTP server:"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "Uključi FTP server za Intranet"
+
+#: ../ftp_wizard/ftp.wiz_.c:7
+msgid "FTP wizard"
+msgstr "FTP čarobnjak"
+
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "FTP server"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
-msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet FTP server"
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr "Nemojte uključivati nijednu opciju ako ne želite pokrenuti FTP server."
 
 #: ../ftp_wizard/ftp.wiz_.c:12
-#, fuzzy
-msgid "Public directory:"
-msgstr "Direktorij:"
+msgid "Configuring the FTP Server"
+msgstr "Podešavanje FTP servera"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "Uključi FTP server za Internet"
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "Intranet FTP server:"
 
 #: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "Uključi FTP server za Intranet"
+msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet FTP server"
+
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "Izaberite vrstu FTP servisa koji želite pokrenuti:"
+
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
@@ -656,59 +676,36 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje FTP "
 "servera"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "FTP čarobnjak"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
-msgstr "Ovaj čarobnjak će vam pomoći da podesite FTP server za vašu mrežu."
-
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "Uključi FTP server za Internet"
-
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "Intranet FTP server:"
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "Čarobnjak za podešavanje FTP servera"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "Podešavanje FTP servera"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Nemojte uključivati nijednu opciju ako ne želite pokrenuti FTP server."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "FTP server"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Ime news servera:"
+msgid "Polling Interval:"
+msgstr "Polling interval:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "Dobro došli u News čarobnjak"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Polling period (sati):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "News server"
+msgid "Polling Period"
+msgstr "Polling period"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -718,29 +715,31 @@ msgstr ""
 "Internet News-a; polling period određuje interval između dva uzastopna "
 "kontakta."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+"Čarobnjak će vam pomoći da podesite Internet news servis na vašoj mreži."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "News čarobnjak"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "Polling period nije ispravan"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "Naziv news servera nije ispravan"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Polling interval:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Internet imena računara moraju biti oblika \\qračunar.domen.tipdomene\\q; na "
-"primjer, ako je vaš provajder \\qprovajder.ba\\q, internet news server je "
-"obično \\qnews.provajder.ba\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Polling period"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Podešavanje Internet news-a"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -748,15 +747,7 @@ msgstr ""
 "Ovisno o tipu internet veze koju imate, odgovarajući polling period može "
 "varirati između 6 i 24 sata."
 
-#: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "Polling period nije ispravan"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "News server:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -764,7 +755,12 @@ msgstr ""
 "Naziv news servera je ime računara koji pruža Internet news vašoj mrežu; ime "
 "obično dobivate od vašeg provajdera."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr "Čarobnjak je uspješno podesio Internet news servis na ovom serveru."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -772,169 +768,199 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Internet news servisa:"
 
-#: ../news_wizard/news.wiz_.c:22
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Polling period (sati):"
+
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Ime news servera:"
+
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Čarobnjak će vam pomoći da podesite Internet news servis na vašoj mreži."
+"Internet imena računara moraju biti oblika \\qračunar.domen.tipdomene\\q; na "
+"primjer, ako je vaš provajder \\qprovajder.ba\\q, internet news server je "
+"obično \\qnews.provajder.ba\\q."
 
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Podešavanje Internet news-a"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "Dobro došli u News čarobnjak"
 
 #: ../news_wizard/news.wiz_.c:24
-msgid ""
-"The wizard successfully configured your Internet News service of your server."
-msgstr "Čarobnjak je uspješno podesio Internet news servis na ovom serveru."
+msgid "News Server"
+msgstr "News server"
 
 #: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "News čarobnjak"
+msgid "News Server:"
+msgstr "News server:"
+
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Autorizovana mreža:"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Kontrola pristupa"
+
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
+msgstr ""
+"Pristup će biti dozvoljen računarima na mreži. Ovdje su informacije koje su "
+"otrkivene o vašoj lokalnoj mreži, možete ih izmjeniti po potrebi."
+
+#: ../nfs_wizard/nfs.wiz_.c:4
+#, fuzzy
+msgid "Access :"
+msgstr "Kontrola pristupa:"
+
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
+msgstr "Lokalna mreža - pristup samo s lokalne mreže (preporučeno)"
+
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+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."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
+msgstr ""
+"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
+"Sambe."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "Čarobnjak za podešavanje NFS servera"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "NFS čarobnjak"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
+msgstr "Dozvoli pristup sa lokalne mreže"
+
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "NFS server"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "Čarobnjak je uspješno podesio NFS server"
-
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "Sve - Bez ograničenja pristupa"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
-msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+#: ../nfs_wizard/nfs.wiz_.c:18
+msgid "Netmask :"
 msgstr ""
-"Pristup će biti dozvoljen računarima na mreži. Ovdje su informacije koje su "
-"otrkivene o vašoj lokalnoj mreži, možete ih izmjeniti po potrebi."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Kontrola pristupa"
+#: ../nfs_wizard/nfs.wiz_.c:19
+msgid "Directory:"
+msgstr "Direktorij:"
 
-#: ../nfs_wizard/nfs.wiz_.c:11
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 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.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
-msgstr "Lokalna mreža - pristup samo s lokalne mreže (preporučeno)"
-
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "Autorizovana mreža:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
-msgstr "Dozvoli pristup sa lokalne mreže"
+#: ../nfs_wizard/nfs.wiz_.c:21
+msgid "The wizard successfully configured your NFS Server"
+msgstr "Čarobnjak je uspješno podesio NFS server"
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:2
 #, fuzzy
-msgid "The wizard collected the following parameters."
+msgid "There seems to be a problem..."
 msgstr ""
-"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
-"Sambe."
+"Izgleda da postoji problem... pitaj Rasima na adresu rasim-kuci.army.mil.ba"
 
-#: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "Kontrola pristupa:"
+#: ../postfix_wizard/postfix.wiz_.c:3
+msgid "Internet Mail Gateway"
+msgstr "Internet mail gateway"
 
-#: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr "Direktorij:"
+#: ../postfix_wizard/postfix.wiz_.c:5
+msgid "Outgoing Mail Address"
+msgstr "Izlazna mail adresa"
 
-#: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "NFS čarobnjak"
+#: ../postfix_wizard/postfix.wiz_.c:6
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr "Čarobnjak je uspješno podesio Internet mail servis za ovaj server."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "Uradi"
 
-#: ../postfix_wizard/postfix.wiz_.c:3
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
-"Možete izabrati tip adrese koju će izlazna pošta prikazivati u \\qFrom:\\q i "
-"\\qReply-to\\q poljima."
+"Ovo trebate izabrati tako da bude konzistentno za adresom koju koristite za "
+"dolaznu poštu."
 
-#: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "Podešavanje Internet Mail-a"
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:11
+msgid "You entered an empty address for the mail gateway."
+msgstr "Unijeli ste praznu adresu za mail gateway."
+
+#: ../postfix_wizard/postfix.wiz_.c:12
+msgid "Internet Mail Configuration Wizard"
+msgstr "Čarobnjak za podešavanje Internet mail-a"
+
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Postfix čarobnjak"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Ime mail servera:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"Vaš server će poslati izlazni mail kroz mail gateway, koji će se zatim "
-"pobrinuti za krajnju dostavu."
+"Vaš izbor može biti prihvaćen, ali to će onemogućiti slanje maila izvan vaše "
+"lokalne mreže. Pritisnite Dalje za nastavak, ili Nazad da unesete nešto."
 
-#: ../postfix_wizard/postfix.wiz_.c:8
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
 msgstr ""
 "Ovaj čarobnjak će vam pomoći da podesite Internet Mail servis za vašu mrežu."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Izlazna mail adresa"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr ""
-"Ovo trebate izabrati tako da bude konzistentno za adresom koju koristite za "
-"dolaznu poštu."
-
-#: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
-"Izgleda da postoji problem... pitaj Rasima na adresu rasim-kuci.army.mil.ba"
-
-#: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "Masquerade nije dobar!"
+"Vaš server će poslati izlazni mail kroz mail gateway, koji će se zatim "
+"pobrinuti za krajnju dostavu."
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -942,11 +968,7 @@ msgstr ""
 "Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
 "POSTFIX-a"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Oblik adrese"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -956,11 +978,19 @@ msgstr ""
 "primjer, ako je vaš provajder \\qprovajder.ba\\q, internet mail server je "
 "obično \\qsmtp.provajder.ba\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Čarobnjak za podešavanje Internet mail-a"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Možete izabrati tip adrese koju će izlazna pošta prikazivati u \\qFrom:\\q i "
+"\\qReply-to\\q poljima."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "Podešavanje Internet Mail-a"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -968,89 +998,76 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "Internet mail servisa:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
-msgid "Mail Address:"
-msgstr "Mail adresa:"
-
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Unijeli ste praznu adresu za mail gateway."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
-msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
-msgstr "Čarobnjak je uspješno podesio Internet mail servis za ovaj server."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Internet mail gateway"
-
 #: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Ime mail servera:"
+msgid "Masquerade not good!"
+msgstr "Masquerade nije dobar!"
 
 #: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"Vaš izbor može biti prihvaćen, ali to će onemogućiti slanje maila izvan vaše "
-"lokalne mreže. Pritisnite Dalje za nastavak, ili Nazad da unesete nešto."
+msgid "Form of the Address"
+msgstr "Oblik adrese"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../postfix_wizard/postfix.wiz_.c:29
+msgid "Mail Address:"
+msgstr "Mail adresa:"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"Memory Cache je količina RAMa koju ste postvetili cache memorijskim "
-"operacijama (obratite pažnju da je stvarna upotreba memorije cijelog squid "
-"procesa veća)."
-
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Proxy port:"
+"Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
+"Proxy-ja"
 
 #: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "Čarobnjak je uspješno podesio proxy server."
-
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "Unijeli ste port koji može biti korišten za ovaj servis:"
+msgid "Proxy Configuration Wizard"
+msgstr "Čarobnjak za podešavanje proxija"
 
 #: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Hijerarhija keša"
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "Morate izabrati port veći od 1024, a manji od 65535"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
-msgid ""
-"Squid is a web caching proxy server, it allows faster web access for your "
-"local network."
-msgstr ""
-"Squid je web keširajući proxy server, on omogućuje brži pristup webu za vašu "
-"lokalnu mrežu."
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Ovaj čarobnjak mora biti pokrenut kao root"
 
 #: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Kontrola pristupa:"
+
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "Podešavanje proxy-ja"
+
+#: ../proxy_wizard/proxy.wiz_.c:13
 msgid "Define an upper level proxy"
 msgstr "Definiši proxy većeg nivoa"
 
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "Filesystem            Vel.  Zauz Slob U % Montiran na"
+
 #: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Disk prostor (MB):"
+msgid ""
+"Squid is a web caching proxy server, it allows faster web access for your "
+"local network."
+msgstr ""
+"Squid je web keširajući proxy server, on omogućuje brži pristup webu za vašu "
+"lokalnu mrežu."
 
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "Ime računara proxy-ja gornjeg nivoa:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Ovaj čarobnjak će vam pomoći da podesite proxy server."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Port proxija višeg nivoa:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Za informaciju, ovo je prostor /var/spool/squid na disku:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
@@ -1058,37 +1075,37 @@ msgstr ""
 "disku."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "Podešavanje proxy-ja"
+msgid "Proxy Port"
+msgstr "Proxy port"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"Proxy vrijednost porta određuje na kojem će portu proxy slušati za http "
-"zahtjeve. Podrazumjevan je 3128, druga uobičajena vrijednost je 8080. "
-"Vrijednost porta mora biti veća od 1024."
+"Možete koristiti numerički format kao što je \\q192.168.1.0/255.255.255.0\\q "
+"ili tekstualni format kao \\q.domen.ba\\q"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Squid čarobnjak"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Port:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"Pritisnite Dalje ako želite sačuvati ovu vrijednost, ili Nazad da ispravite "
+"svoj izbor."
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "Filesystem            Vel.  Zauz Slob U % Montiran na"
+msgid "You have entered a port that may be useful for this service:"
+msgstr "Unijeli ste port koji može biti korišten za ovaj servis:"
 
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Ovaj čarobnjak mora biti pokrenut kao root"
+#: ../proxy_wizard/proxy.wiz_.c:27
+msgid "/etc/services:"
+msgstr "/etc/services:"
+
+#: ../proxy_wizard/proxy.wiz_.c:28
+msgid "Cache hierarchy"
+msgstr "Hijerarhija keša"
 
-#: ../proxy_wizard/proxy.wiz_.c:26
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
@@ -1096,186 +1113,159 @@ msgstr ""
 "Slobodno možete izabrati \\qNema proxija višeg nivoa\\q ako vam nije "
 "potrebna ova mogućnost."
 
-#: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Memorijski cache (MB):"
-
-#: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Kontrola pristupa:"
+#: ../proxy_wizard/proxy.wiz_.c:30
+msgid "Port:"
+msgstr "Port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
-"Proxy-ja"
-
-#: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Proxy port"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Pritisnite Nazad da promjenite vrijednost."
+"Kao opcija, Squid može biti podešen za kaskadni proxy. Možete dodati novi "
+"proxy višeg nivoa navodeći njegovo ime i port."
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
-"Unesite kvalificirano ime računara (kao što je \\qcache.domen.ba\\q) i port "
-"koji će proxy koristiti."
+"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
+"proxy-ja:"
 
-#: ../proxy_wizard/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Memorijski cache (MB):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Nema proxija višeg nivoa (preporučeno)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Morate izabrati port veći od 1024, a manji od 65535"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Veličina proxy keša"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Pritisnite Nazad da promjenite vrijednost."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Pritisnite Dalje ako želite sačuvati ovu vrijednost, ili Nazad da ispravite "
-"svoj izbor."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Localhost - pristup ograničen samo na ovaj računar"
+"Proxy vrijednost porta određuje na kojem će portu proxy slušati za http "
+"zahtjeve. Podrazumjevan je 3128, druga uobičajena vrijednost je 8080. "
+"Vrijednost porta mora biti veća od 1024."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Možete koristiti numerički format kao što je \\q192.168.1.0/255.255.255.0\\q "
-"ili tekstualni format kao \\q.domen.ba\\q"
+msgid "Squid wizard"
+msgstr "Squid čarobnjak"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Čarobnjak za podešavanje proxija"
+msgid "Proxy port:"
+msgstr "Proxy port:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Disk prostor (MB):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "Ime računara proxy-ja gornjeg nivoa:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Localhost - pristup ograničen samo na ovaj računar"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"Kao opcija, Squid može biti podešen za kaskadni proxy. Možete dodati novi "
-"proxy višeg nivoa navodeći njegovo ime i port."
+"Memory Cache je količina RAMa koju ste postvetili cache memorijskim "
+"operacijama (obratite pažnju da je stvarna upotreba memorije cijelog squid "
+"procesa veća)."
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
-"proxy-ja:"
+"Unesite kvalificirano ime računara (kao što je \\qcache.domen.ba\\q) i port "
+"koji će proxy koristiti."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 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."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Port proxija višeg nivoa:"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Ovaj čarobnjak će vam pomoći da podesite proxy server."
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "Čarobnjak je uspješno podesio proxy server."
 
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Za informaciju, ovo je prostor /var/spool/squid na disku:"
+#: ../samba_wizard/samba.wiz_.c:3
+msgid "Home:"
+msgstr "Home:"
 
-#: ../samba_wizard/samba.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:4
 #, fuzzy
-msgid "Enable file sharing area"
-msgstr "Uključi /home/samba/public oblast za dijeljenje"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr ""
+msgid "Enable all printer"
+msgstr "Uključeni Samba servisi"
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Radna grupa:"
+#, fuzzy
+msgid "Make home directories available for their owners"
+msgstr "Učini home direktorije dostupnim njihovim vlasnicima"
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr ""
-"Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
-"Sambe"
+msgid "Configuring Samba"
+msgstr "Podešavanje Sambe"
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "Server Banner je neispravan"
-
 #: ../samba_wizard/samba.wiz_.c:11
-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."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba mora znati koju Windows radnu grupu će opsluživati."
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Uključeni Samba servisi"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+"Samba može pružiti zajedničku oblast za dijeljenje datoteka sa vašim Windows "
+"radnim stanicama, a također može omogućiti dijeljenje štampača za štampače "
+"koji su spojeni na vaš server."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+msgid "The wizard successfully configured your Samba server."
+msgstr "Čarobnjak je uspješno podesio Samba server."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
-"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
-"Sambe."
+msgid "Server Banner."
+msgstr "Server Banner."
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Banner:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Print server:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Radna grupa"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Radna grupa:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"Banner je način na koji će ovaj računar biti opisan na Windows radnim "
-"stanicama."
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Dijeljenje datoteka:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1283,12 +1273,26 @@ msgstr ""
 "Izabrali ste da dozvolite pristup korisnika svojim home direktorijima preko "
 "Sambe, ali oni moraju koristiti smbpasswd da bi postavili šifru."
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "Uključeni Samba servisi"
+msgid "Printers:"
+msgstr "Print server:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "Server Banner je neispravan"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Čarobnjak za podešavanje Sambe"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1296,279 +1300,251 @@ msgstr ""
 "Samba omogućuje vašem serveru da se ponaša kao file i print server za radne "
 "stanice na kojima se koriste ne-Linux sistemi."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
-msgstr ""
-
 #: ../samba_wizard/samba.wiz_.c:28
-msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "Podešavanje Sambe"
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr "Ovaj čarobnjak će vam pomoći da podesite Samba servis na ovom serveru."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr "Server banner:"
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
-msgstr "Server Banner."
+msgid "Enabled Samba Services"
+msgstr "Uključeni Samba servisi"
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "Uključi dijeljenje štampača"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "Radna grupa je pogrešna"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Ako izaberete podešavanje sada, automatski ćete nastaviti sa podešavanjem "
+"Sambe"
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
+"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
+"Sambe."
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "Kontrola pristupa"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"Banner je način na koji će ovaj računar biti opisan na Windows radnim "
+"stanicama."
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
 msgstr ""
-"Samba može pružiti zajedničku oblast za dijeljenje datoteka sa vašim Windows "
-"radnim stanicama, a također može omogućiti dijeljenje štampača za štampače "
-"koji su spojeni na vaš server."
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Banner:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "Čarobnjak je uspješno podesio Samba server."
+msgid "The Workgroup is wrong"
+msgstr "Radna grupa je pogrešna"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba mora znati koju Windows radnu grupu će opsluživati."
+msgid "Samba wizard"
+msgstr "Samba čarobnjak"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Server banner:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "Kontrola pristupa:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Print server:"
+msgid "Workgroup"
+msgstr "Radna grupa"
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Samba čarobnjak"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Čarobnjak za podešavanje Sambe"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "Make home directories available for their owners"
-msgstr "Učini home direktorije dostupnim njihovim vlasnicima"
+msgid "Access control"
+msgstr "Kontrola pristupa"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Uključi dijeljenje štampača"
-
-#: ../samba_wizard/samba.wiz_.c:56
+#: ../samba_wizard/samba.wiz_.c:53
 #, fuzzy
-msgid "Printers:"
-msgstr "Print server:"
+msgid "Enable file sharing area"
+msgstr "Uključi /home/samba/public oblast za dijeljenje"
 
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Home:"
+#: ../samba_wizard/samba.wiz_.c:56
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr ""
+msgid "File Sharing:"
+msgstr "Dijeljenje datoteka:"
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
-msgstr ""
-"Izaberite mrežni uređaj (obično kartica) koji će server koristiti za "
-"spajanje na mrežu. To je uređaj za lokalnu mrežu, dakle vjerovatno ne isti "
-"uređaj kao onaj koji koristite za internet pristup."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "IP adresa servera je neispravna"
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "Ovaj čarobnjak će podesiti osnovne mrežne parametre vašeg servera."
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "Gateway uređaj:"
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Server čarobnjak"
-
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
-"Mrežne adrese su lista četiri broja manja od 256, odvojena tačkama; zadnji "
-"broj na listi mora biti nula."
+msgid "Host Name:"
+msgstr "Ime računara:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "net uređaj"
+msgid "Basic Network Configuration Wizard"
+msgstr "Čarobnjak za osnovno podešavanje mreže"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "Mrežna adresa je pogrešna"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Dakle, veoma je moguće da su ime domene i IP adresa za ovu lokalnu mrežu "
-"RAZLIČITI od serverske \\qvanjske\\q konekcije."
+msgid "Server IP address:"
+msgstr "IP adresa servera:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Mrežna adresa"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "Ne biste smjeli pokretati druge aplikacije dok je ovaj čarobnjak u funkciji, "
 "a nakon završetka rada trebali biste zatvoriti svoju sesiju i ponovo se "
 "logirati."
 
-#: ../server_wizard/server.wiz_.c:11
-msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
-msgstr ""
-"Ovdje je vaša trenutna vrijednost za vanjski gateway (vrijednost navedena "
-"tokom prvobitne instalacije). Uređaj (mrežna kartica ili modem) bi trebao "
-"biti različit od onog koji koristite za internu mrežu."
-
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
-msgstr ""
-"Što se tiče ovih čarobnjaka, vaš računar se tretira kao server koji upravlja "
-"vlastitom lokalnom mrežom (mreža C klase)."
+"The wizard successfully configured the basic networking services of your "
+"server."
+msgstr "Čarobnjak je uspješno podesio osnovne mrežne servise na ovom serveru."
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Uređaj:"
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
+msgstr "(ovdje možete promjeniti ove vrijednosti ako znate tačno šta radite)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Upozorenje"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"Mrežna adresa je broj koji identificira vašu mrežu; predložena vrijednost je "
+"pogodna za mreže koje nisu spojene na Internet, ili su spojene korištenjem "
+"IP masquerading; ako niste sigurni šta želite, koristite ponuđenu vrijednost."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Ova stranica određuje ime domena; trebala bi biti nevidljiva"
+msgid "Note about networking"
+msgstr "Napomena o mrežama"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Adresa servera:"
+msgid "Server Address"
+msgstr "Adresa servera"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Određeno ime domena"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"Mrežne adrese su lista četiri broja manja od 256, odvojena tačkama; zadnji "
+"broj na listi mora biti nula."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "Ime računara"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Napomena: gateway IP adresa ne bi trebala biti prazna ako želite pristup "
+"vanjskom svijetu."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-"Ova stranica određuje default adresu servera; trebala bi biti nevidljiva."
+msgid "The Server IP address is incorrect"
+msgstr "IP adresa servera je neispravna"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Čarobnjak za osnovno podešavanje mreže"
+msgid "Configuring your network"
+msgstr "Podešavanje mreže"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "Gateway IP:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "Ime računara je neispravno"
+msgid "This page computes the default server address; it should be invisible."
+msgstr ""
+"Ova stranica određuje default adresu servera; trebala bi biti nevidljiva."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"Internet imena računara moraju biti oblika \\qračunar.domen.tipdomene\\q; "
-"ako će vaš računar biti Internet server, ime domena treba biti ono ime koje "
-"ste registrovali kod vašeg provajdera. Ako ćete imati samo intranet, bilo "
-"koje ispravno ime je OK, npr. \\qpreduzeće.ba\\q."
+msgid "IP net address:"
+msgstr "IP net adresa:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Vanjski gateway"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"Mrežna adresa je broj koji identificira vašu mrežu; predložena vrijednost je "
-"pogodna za mreže koje nisu spojene na Internet, ili su spojene korištenjem "
-"IP masquerading; ako niste sigurni šta želite, koristite ponuđenu vrijednost."
+msgid "Server Wizard"
+msgstr "Server čarobnjak"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
-"Ovaj čarobnjak će vam pomoći da podesite osnovne mrežne servise na ovom "
-"serveru."
+"Dakle, veoma je moguće da su ime domene i IP adresa za ovu lokalnu mrežu "
+"RAZLIČITI od serverske \\qvanjske\\q konekcije."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "Ovaj čarobnjak će podesiti osnovne mrežne parametre vašeg servera."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Napomena o mrežama"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Napomena: gateway IP adresa ne bi trebala biti prazna ako želite pristup "
-"vanjskom svijetu."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Greška u čarobnjaku."
+"Izaberite mrežni uređaj (obično kartica) koji će server koristiti za "
+"spajanje na mrežu. To je uređaj za lokalnu mrežu, dakle vjerovatno ne isti "
+"uređaj kao onaj koji koristite za internet pristup."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1576,19 +1552,41 @@ msgstr ""
 "Uređaji su predstavljeni svojim Linux imenom i opisom kartice, ako je "
 "dostupan."
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Mrežna adresa:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Ovdje je vaša trenutna vrijednost za vanjski gateway (vrijednost navedena "
+"tokom prvobitne instalacije). Uređaj (mrežna kartica ili modem) bi trebao "
+"biti različit od onog koji koristite za internu mrežu."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "Podešavanje mreže"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr ""
+"Ovaj čarobnjak će vam pomoći da podesite osnovne mrežne servise na ovom "
+"serveru."
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "Gateway IP:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"IP adresa servera je broj koji identificira vaš server u mreži; predložena "
+"vrijednost je dizajnirana za privatne mreže, koje nemaju vidljivost na "
+"Internetu, ili su spojene putem IP masquerading; ako niste sigurni šta "
+"želite, koristite ponuđenu vrijednost."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "Ime računara je neispravno"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1598,11 +1596,27 @@ msgstr ""
 "stanicama u mreži, a moguće i na Internetu (ovisno o konfiguraciji vaše veze "
 "prema vani)."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "Ime računara:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Greška u čarobnjaku."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "net uređaj"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "Određeno ime domena"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Ova stranica određuje ime domena; trebala bi biti nevidljiva"
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "Gateway uređaj:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
@@ -1610,395 +1624,394 @@ msgstr ""
 "Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje "
 "vaše mreže"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"Vanjska veza je mreža na kojoj je ovaj računar klijent (Internet ili "
-"upstream mreža), koji se spaja koristeći drugu mrežnu karticu ili modem."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Upozorenje"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr "(ovdje možete promjeniti ove vrijednosti ako znate tačno šta radite)"
+msgid "Device:"
+msgstr "Uređaj:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"IP adresa servera je broj koji identificira vaš server u mreži; predložena "
-"vrijednost je dizajnirana za privatne mreže, koje nemaju vidljivost na "
-"Internetu, ili su spojene putem IP masquerading; ako niste sigurni šta "
-"želite, koristite ponuđenu vrijednost."
+"Što se tiče ovih čarobnjaka, vaš računar se tretira kao server koji upravlja "
+"vlastitom lokalnom mrežom (mreža C klase)."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Ime servera:"
+msgid "Server Address:"
+msgstr "Adresa servera:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "Mrežna adresa je pogrešna"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"Vanjska veza je mreža na kojoj je ovaj računar klijent (Internet ili "
+"upstream mreža), koji se spaja koristeći drugu mrežnu karticu ili modem."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Adresa servera"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
-msgstr "Čarobnjak je uspješno podesio osnovne mrežne servise na ovom serveru."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
+msgstr ""
+"Internet imena računara moraju biti oblika \\qračunar.domen.tipdomene\\q; "
+"ako će vaš računar biti Internet server, ime domena treba biti ono ime koje "
+"ste registrovali kod vašeg provajdera. Ako ćete imati samo intranet, bilo "
+"koje ispravno ime je OK, npr. \\qpreduzeće.ba\\q."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "Mrežni uređaj"
+msgid "Host Name"
+msgstr "Ime računara"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "IP net adresa:"
+msgid "Network Address:"
+msgstr "Mrežna adresa:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Mrežna adresa"
+msgid "Network Device"
+msgstr "Mrežni uređaj"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "IP adresa servera:"
+msgid "Server Name:"
+msgstr "Ime servera:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "University of Adelaide, South Australia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Universite Paris Sud, France"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Pritisnite Dalje da pokrenete test time servera."
+msgid "University of Manchester, Manchester, England"
+msgstr "University of Manchester, Manchester, England"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Time serveri"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Universite de Limoges, France"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Sekundarni Time server:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr "Dakle vaš server će biti lokalni time server za vašu mrežu."
+msgid "Press next to start the time servers test."
+msgstr "Pritisnite Dalje da pokrenete test time servera."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
-"Vaš server se sada može ponašati kao time server za vašu lokalnu mrežu."
+"Možete ponovo pokušati kontaktirati time servere, ili sačuvati postavke bez "
+"podešavanja vremena."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(molim, izaberite servere u vašem geografskom području)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylor College of Medicine, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "University of Oklahoma, Norman, Oklahoma, USA"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Izaberite vremensku zonu:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "University of Regina, Regina, Saskatchewan, Canada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr "pritisnite Dalje za početak, ili Odustani da napustite ovaj čarobnjak"
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Trinity College, Dublin, Ireland"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, France"
+msgid "Singapore"
+msgstr "Singapore"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Universite de Limoges, France"
+msgid "Secondary Time Server:"
+msgstr "Sekundarni Time server:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
+msgstr "Pokušaj ponovo"
 
 #: ../time_wizard/time.wiz_.c:14
-#, fuzzy
-msgid "Select a primary and secondary server from the list."
-msgstr "Izaberite primarni i sekundarni server sa liste, ili ga unesite:"
+msgid "The Chinese University of Hong Kong"
+msgstr "The Chinese University of Hong Kong"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(molim, izaberite servere u vašem geografskom području)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV College of Engineering, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, France"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante/SPAIN)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "National Research Council of Canada, Ottawa, Ontario, Canada"
 
+#: ../time_wizard/time.wiz_.c:18
+#, fuzzy
+msgid "Select a primary and secondary server from the list."
+msgstr "Izaberite primarni i sekundarni server sa liste, ili ga unesite:"
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "University of Manchester, Manchester, England"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, France"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- nema vanjske mreže"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Inc., Seoul, Korea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Ako time server nije trenutno dostupan (mreža ili neki drugi razlog), "
-"sačekaćete nekih 30 sekundi."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Scientific Center in Chernogolovka, Moscow region, Russia"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Testiram dostupnost time servera"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washington State University Tri-Cities, Richland, Wa"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "University of Oslo, Norway"
+msgid "University of Adelaide, South Australia"
+msgstr "University of Adelaide, South Australia"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "Computer Science Department, University of Wisconsin-Madison"
+msgid "Time zone:"
+msgstr "Vremenska zona:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Trinity College, Dublin, Ireland"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Time serveri ne odgovaraju. Razlozi mogu biti:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "University of Regina, Regina, Saskatchewan, Canada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Universite de Caen, France"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Time serveri ne odgovaraju. Razlozi mogu biti:"
+msgid "- other reasons..."
+msgstr "- ostali razlozi..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Swiss Fed. Inst. of Technology"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Ako time server nije trenutno dostupan (mreža ili neki drugi razlog), "
+"sačekaćete nekih 30 sekundi."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Universite de Caen, France"
+msgid "WARNING"
+msgstr "UPOZORENJE"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, France"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, France"
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
-"Ovaj čarobnjak će vam pomoći da podesite vrijeme na vašem serveru, ili "
-"lokalno ili sinhronizirano sa vanjskim time serverom."
+"Vaš server se sada može ponašati kao time server za vašu lokalnu mrežu."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "UPOZORENJE"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Fukuoka university, Fukuoka, Japan"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Inc., Seoul, Korea"
+msgid "Time Servers"
+msgstr "Time serveri"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "University of Oklahoma, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Swiss Fed. Inst. of Technology"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "The Chinese University of Hong Kong"
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Ovaj čarobnjak će vam pomoći da podesite vrijeme na vašem serveru, ili "
+"lokalno ili sinhronizirano sa vanjskim time serverom."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- ostali razlozi..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, France"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- nepostojeći time serveri"
+msgid "Testing the time servers availability"
+msgstr "Testiram dostupnost time servera"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Vremenska zona:"
+msgid "Save config without test"
+msgstr "Sačuvaj postavke bez testa"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Možete ponovo pokušati kontaktirati time servere, ili sačuvati postavke bez "
-"podešavanja vremena."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT Information Systems, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Primarni time server:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylor College of Medicine, Houston, Tx"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Pokušaj ponovo"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn State University, University Park, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
+msgstr "- nepostojeći time serveri"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Konfiguracija time servera sačuvana"
+msgid "Time wizard"
+msgstr "Time čarobnjak"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgid "University of Oslo, Norway"
+msgstr "University of Oslo, Norway"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr "Dakle vaš server će biti lokalni time server za vašu mrežu."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Sačuvaj postavke bez testa"
+msgid "- no outside network"
+msgstr "- nema vanjske mreže"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapore"
+msgid "Primary Time Server:"
+msgstr "Primarni time server:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Fukuoka university, Fukuoka, Japan"
+msgid "Time server configuration saved"
+msgstr "Konfiguracija time servera sačuvana"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr "pritisnite Dalje za početak, ili Odustani da napustite ovaj čarobnjak"
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante/SPAIN)"
+msgid "Choose a time zone:"
+msgstr "Izaberite vremensku zonu:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Time čarobnjak"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr ""
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr "Computer Science Department, University of Wisconsin-Madison"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-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."
+msgid ""
+"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/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet Web server."
+#, fuzzy
+msgid "Internet web server:"
+msgstr "Internet Web server:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
-"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje Web "
-"servera"
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Web čarobnjak"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
+msgstr ""
 
-#: ../web_wizard/web.wiz_.c:11
-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/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Uključi Web server za Intranet"
 
 #: ../web_wizard/web.wiz_.c:12
-#, fuzzy
-msgid "Internet web server:"
-msgstr "Internet Web server:"
+msgid "Configuring the Web Server"
+msgstr "Podešavanje Web servera"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Uključi Web server za Intranet"
+msgid "Web Server"
+msgstr "Web server"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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/web.wiz_.c:15
 #, fuzzy
 msgid "Enable the Web Server for the Internet"
 msgstr "Uključi Web server za Intranet"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Direktorij:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "Izaberite vrstu Web servisa koji želite aktivirati:"
+#, fuzzy
+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/web.wiz_.c:17
-msgid "document root:"
-msgstr ""
+msgid "Web wizard"
+msgstr "Web čarobnjak"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Intranet Web server:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "Podešavanje Web servera"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "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/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Čarobnjak za podešavanje Web servera"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "Izaberite vrstu Web servisa koji želite aktivirati:"
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr ""
+"Čarobnjak je prikupio sljedeće parametre koji su potrebni za podešavanje Web "
+"servera"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr "Čarobnjak je uspješno podesio vaš Intranet/Internet Web server."
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr ""
+msgid "Web Server Configuration Wizard"
+msgstr "Čarobnjak za podešavanje Web servera"
 
 msgid "Cancel"
 msgstr "Odustani"
diff --git a/po/ca.po b/po/ca.po
index 8b21afb9..9d1e7843 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-09-23 03:25+0200\n"
 "Last-Translator: Ra�l Cambeiro <rulet@menta.net>\n"
 "Language-Team: CATALAN <LL@li.org>\n"
@@ -14,200 +14,201 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Un client de la xarxa local �s una m�quina connectada a la xarxa que t� el "
-"seu propi nom i adre�a IP."
+"Premeu Seg�ent per configurar aquests par�metres ara, o Cancel�la per sortir "
+"de l'auxiliar."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "Aquesta adre�a no �s v�lida... Premeu Seg�ent per continuar"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "D'acord"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"Premeu Seg�ent si voleu canviar el valor actual, o Anterior percorregir la "
-"vostra elecci�."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Felicitats"
+"Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
+"del client"
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "Auxiliar del client DNS"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr "Premeu Seg�ent per comen�ar, o Cancel�la per sortir de l'auxiliar."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"El client s'identificar� a la xarxa amb un nom, com en nomdelclient.empresa."
+"netCadascuna de les m�quines de la xarxa ha de tenir una adre�a IP (�nica), "
+"amb la sintaxi habitual de punts (x.x.x.x)."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "L'auxiliar ha recollit els par�metres seg�ents necessaris per afegir un "
 "client a la vostra xarxa:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "S'ha produ�t un error de sistema. No s'ha fet cap configuraci�"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "Nom del client"
+msgid "The wizard successfully added the client."
+msgstr "L'auxiliar ha afegit el client amb �xit."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "S'est� afegint un client nou a la vostra xarxa"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(no cal que escrigueu el domini despr�s del nom)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Configura"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"Noteu que l'adre�a IP i el nom del client introdu�ts han de ser �nicsa la "
+"xarxa."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Identificaci� del client:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Av�s:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(no cal que escrigueu el domini despr�s del nom)"
+msgid "Name of the machine:"
+msgstr "Nom de la m�quina:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
-"del client"
+msgid "Adding a new client to your network"
+msgstr "S'est� afegint un client nou a la vostra xarxa"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"El servidor emprar� la informaci� que introdu�u aqu� perqu� el nom del "
-"client estigui disponible per a les altres m�quines de la xarxa."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "S'ha produ�t un error de sistema. No s'ha fet cap configuraci�"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Heu introdu�t un nom de m�quina o una adre�a IP que ja est� en �s."
+msgid "Client identification:"
+msgstr "Identificaci� del client:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "L'auxiliar ha afegit el client amb �xit."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr "Aquest auxiliar us ajudar� a afegir un client nou al DNS local."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "Nom de la m�quina:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "D'acord"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"El client s'identificar� a la xarxa amb un nom, com en nomdelclient.empresa."
-"netCadascuna de les m�quines de la xarxa ha de tenir una adre�a IP (�nica), "
-"amb la sintaxi habitual de punts (x.x.x.x)."
+"Un client de la xarxa local �s una m�quina connectada a la xarxa que t� el "
+"seu propi nom i adre�a IP."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"Noteu que l'adre�a IP i el nom del client introdu�ts han de ser �nicsa la "
-"xarxa."
+"Per acceptar aquests valors i afegir el client feu clic al bot� Seg�ent, o "
+"premeu el bot� Anterior per corregir-los."
 
-#: ../client_wizard/client.wiz_.c:21
-#, fuzzy
-msgid "DNS Wizard (add client)"
-msgstr "Auxiliar del DNS"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "Aquesta adre�a no �s v�lida... Premeu Seg�ent per continuar"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Av�s\\nEsteu sobre dhcp; �s possible que el servidor no funcioni amb aquesta "
-"configuraci�."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "IP del client:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "Adre�a IP de la m�quina:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Configura"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Surt"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "Cal que sigueu root per executar aquest auxiliar"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Encara no s'ha configurat la xarxa"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Aquest auxiliar us ajudar� a afegir un client nou al DNS local."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Heu introdu�t un nom de m�quina o una adre�a IP que ja est� en �s."
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+#, fuzzy
+msgid "DNS Wizard (add client)"
+msgstr "Auxiliar del DNS"
+
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Surt"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"Per acceptar aquests valors i afegir el client feu clic al bot� Seg�ent, o "
-"premeu el bot� Anterior per corregir-los."
+"Av�s\\nEsteu sobre dhcp; �s possible que el servidor no funcioni amb aquesta "
+"configuraci�."
 
 #: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Premeu Seg�ent per comen�ar, o Cancel�la per sortir de l'auxiliar."
-
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Premeu Seg�ent per configurar aquests par�metres ara, o Cancel�la per sortir "
-"de l'auxiliar."
+"El servidor emprar� la informaci� que introdu�u aqu� perqu� el nom del "
+"client estigui disponible per a les altres m�quines de la xarxa."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "Cal que sigueu root per executar aquest auxiliar"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Felicitats"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "Adre�a IP de la m�quina:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "IP del client:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Premeu Seg�ent si voleu canviar el valor actual, o Anterior percorregir la "
+"vostra elecci�."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
@@ -215,28 +216,15 @@ msgstr ""
 "Heu de configurar els par�metres b�sics de la xarxa abans d'executar aquest "
 "auxiliar."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Av�s:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Auxiliar de configuraci�"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "Servidor de bases de dades MySQL"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Per afegir un usuari, introdu�u un nom d'usuari i una contrasenya"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "Nom del client"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Afegiment d'un usuari"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -244,77 +232,69 @@ msgstr ""
 "Per acceptar aquest valor i configurar el servidor feu clic a \\qConfirma"
 "\\q, o premeu el bot� Anterior per corregir-lo."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Introdu�u una contrasenya per a l'usuari root:"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "S'est� configurant el servidor de bases de dades MySQL"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "L'auxiliar ha configurat el servidor de bases de dades MySQL amb �xit"
+msgid "Confirm"
+msgstr "Confirma"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Servidor de bases de dades"
+msgid "Password:"
+msgstr "Contrasenya:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Contrasenya de root:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "L'auxiliar ha configurat el servidor de bases de dades MySQL amb �xit"
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Confirma"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "Heu de ser root per fer aix�..."
+msgid "Username:"
+msgstr "Nom d'usuari:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Contrasenya:"
+msgid "Add"
+msgstr "Afegeix"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
-"de la base de dades MySQL"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "Heu de ser root per fer aix�..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
-"Aquest auxiliar us ajudar� a configurar el servidor de bases de dades MySQL "
-"per a la vostra xarxa"
+msgid "Database Server"
+msgstr "Servidor de bases de dades"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Nom d'usuari:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Nota: Aquest usuari tindr� tots els permisos"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Afegeix"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Introdu�u una contrasenya per a l'usuari root:"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "Auxiliar de les bases de dades MySQL"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "S'est� configurant el servidor de bases de dades MySQL"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Auxiliar de configuraci�"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr ""
 "Per executar el servidor, cal que primer especifiqueu una contrasenya de root"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "Auxiliar de les bases de dades MySQL"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Contrasenya de root:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "Servidor de bases de dades MySQL"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -322,36 +302,61 @@ msgstr ""
 "L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
 "servidor de bases de dades MySQL"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
 msgstr ""
-"Les adreces IP s�n un grup de quatre nombres menors de 256 separats per "
-"punts."
+"Aquest auxiliar us ajudar� a configurar el servidor de bases de dades MySQL "
+"per a la vostra xarxa"
+
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Per afegir un usuari, introdu�u un nom d'usuari i una contrasenya"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../db_wizard/db.wiz_.c:27
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
+msgstr ""
+"Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
+"de la base de dades MySQL"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr ""
+"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
+"servei DHCP:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Arregla-ho"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
-"Seleccioneu el rang d'adreces assignat pel servei DHCP a les estacions de "
-"treball. Si no teniu cap requeriment especial, podeu acceptar amb "
-"tranquil�litat els valors que es proposen."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Adre�a IP m�s alta:"
+msgid "Lowest IP Address:"
+msgstr "Adre�a IP m�s baixa:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "Rang d'adreces emprades pel DHCP"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr ""
+"Les adreces IP s�n un grup de quatre nombres menors de 256 separats per "
+"punts."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -359,96 +364,84 @@ msgstr ""
 "Per acceptar aquests valors i configurar el servidor feu clic al bot� "
 "Seg�ent, o premeu el bot� Anterior per corregir-los."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"El DHCP �s un servei que assigna autom�ticament adreces de xarxa a les "
-"vostres estacions de treball."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "Auxiliar del DHCP"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Arregla-ho"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "Aquest auxiliar us ajudar� a configurar els serveis DHCP del servidor."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "Rang d'adreces emprades pel DHCP"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "L'auxiliar ha configurat els serveis DHCP del servidor amb �xit."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Aquest auxiliar us ajudar� a configurar els serveis DHCP del servidor."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
-"servei DHCP:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Adre�a IP m�s baixa:"
+"Seleccioneu el rang d'adreces assignat pel servei DHCP a les estacions de "
+"treball. Si no teniu cap requeriment especial, podeu acceptar amb "
+"tranquil�litat els valors que es proposen."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "Auxiliar de configuraci� del DHCP"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "El rang d'adreces IP especificat no �s correcte"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
+"El DHCP �s un servei que assigna autom�ticament adreces de xarxa a les "
+"vostres estacions de treball."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "El rang d'adreces IP especificat no �s correcte"
+msgid "Highest IP Address:"
+msgstr "Adre�a IP m�s alta:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
-msgstr "Auxiliar del DHCP"
+msgid "DHCP Configuration Wizard"
+msgstr "Auxiliar de configuraci� del DHCP"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "S'est� configurant el servidor DHCP"
 
-#: ../dns_wizard/dns.wiz_.c:2
-#, fuzzy
-msgid "DNS Wizard (configuration)"
-msgstr "Auxiliar de configuraci� del DNS"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
-"servei de DNS"
+"Aquesta configuraci� pot ser acceptada, per� no podreu identificar els noms "
+"de les m�quines fora de la xarxa local."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr ""
+"Premeu Seg�ent per deixar aquests valors buits, o Anterior per introduir un "
+"valor."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Adre�a del DNS primari:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "S'est� configurant el servidor DNS"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Adre�a del DNS secundari:"
+msgid "DNS Configuration Wizard"
+msgstr "Auxiliar de configuraci� del DNS"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "Adreces del servidor DNS"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Aquest auxiliar us ajudar� a configurar els serveis DNS del servidor. "
-"Aquesta configuraci� proporcionar� un servei DNS per als noms dels "
-"ordinadors locals, i les peticions no locals es reenviaran a un DNS exterior."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -460,43 +453,53 @@ msgstr ""
 "d'introduir les adreces IP dels servidors DNS primari i secundari; "
 "generalment aquestes adreces us les dona el vostre prove�dor d'Internet."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "L'auxiliar ha configurat els serveis DNS del servidor amb �xit."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Heu introdu�t una adre�a buida per al servidor DNS."
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
-"Premeu Seg�ent per deixar aquests valors buits, o Anterior per introduir un "
-"valor."
-
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "Auxiliar de configuraci� del DNS"
+"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
+"servei de DNS"
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Adre�a del DNS primari:"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
+msgstr "Adreces del servidor DNS"
 
-#: ../dns_wizard/dns.wiz_.c:20
+#: ../dns_wizard/dns.wiz_.c:17
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Aquesta configuraci� pot ser acceptada, per� no podreu identificar els noms "
-"de les m�quines fora de la xarxa local."
+"El DNS (Servidor de Noms de Domini) �s el servei que relaciona una m�quina "
+"amb un nom d'ordinador d'internet."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Adre�a del DNS secundari:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"El DNS (Servidor de Noms de Domini) �s el servei que relaciona una m�quina "
-"amb un nom d'ordinador d'internet."
+"Aquest auxiliar us ajudar� a configurar els serveis DNS del servidor. "
+"Aquesta configuraci� proporcionar� un servei DNS per als noms dels "
+"ordinadors locals, i les peticions no locals es reenviaran a un DNS exterior."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "L'auxiliar ha configurat els serveis DNS del servidor amb �xit."
+#, fuzzy
+msgid "DNS Wizard (configuration)"
+msgstr "Auxiliar de configuraci� del DNS"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -507,62 +510,69 @@ msgid "Please select a wizard"
 msgstr "Seleccioneu un auxiliar"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Dispositiu"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "Mitj�: web, ftp i ssh s�n vistos des de l'exterior"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr "Alt: cap visibilitat des de l'exterior, usuaris limitats a la web"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Ha passat una cosa terrible!"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Auxiliar de configuraci� del tallafoc"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
+"tallafoc:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr ""
+"El tallafoc protegeix la xarxa interna d'accessos no autoritzats des "
+"d'Internet."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "Dispositiu de xarxa per a Internet:"
+msgid "Device"
+msgstr "Dispositiu"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Arregla-ho"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Auxiliar del tallafoc"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Cap: sense protecci�"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "Nivell de protecci�:"
+msgid "Internet Network Device:"
+msgstr "Dispositiu de xarxa per a Internet:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Auxiliar del tallafoc"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"El tallafoc es pot configurar de manera que ofereixi diferents nivells de "
+"protecci�; trieu el nivell que es correspongui amb les vostres necessitats. "
+"Si no ho sabeu, el nivell mitj� �s generalment el m�s adequat."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "L'auxiliar ha configurat el tallafoc del servidor amb �xit."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "Mitj�: web, ftp i ssh s�n vistos des de l'exterior"
+msgid "The device name is not correct"
+msgstr "El nom del dispositiu no �s correcte"
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "Nivell de protecci�"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Arregla-ho"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Surt"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Auxiliar de configuraci� del tallafoc"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "El nom del dispositiu no �s correcte"
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -570,92 +580,103 @@ msgstr ""
 "El tallafoc necessita saber com es connecta el vostre servidor a Internet; "
 "trieu el dispositiu que feu servir per a la connexi� amb l'exterior."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr ""
-"El tallafoc protegeix la xarxa interna d'accessos no autoritzats des "
-"d'Internet."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "Nivell de protecci�"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "S'est� configurant el tallafoc"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Ha passat una cosa terrible!"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "Dispositiu de xarxa del tallafoc"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Cap: sense protecci�"
+msgid "The wizard successfully configured your server firewall."
+msgstr "L'auxiliar ha configurat el tallafoc del servidor amb �xit."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
+msgid "Configuring the Firewall"
+msgstr "S'est� configurant el tallafoc"
+
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Surt"
+
+#: ../firewall_wizard/firewall.wiz_.c:24
+#, fuzzy
 msgid "This wizard will help you configuring your server firewall."
 msgstr "Aquest auxiliar us ajudar� a configurar el tallafoc del servidor."
 
-#: ../firewall_wizard/firewall.wiz_.c:23
+#: ../firewall_wizard/firewall.wiz_.c:25
 msgid "Low - Light filtering, standard services available"
 msgstr "Baix: filtrat lleuger, serveis est�ndard disponibles"
 
-#: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "Dispositiu de xarxa del tallafoc"
+#: ../firewall_wizard/firewall.wiz_.c:26
+msgid "Protection Level:"
+msgstr "Nivell de protecci�:"
 
-#: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
-"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
-"tallafoc:"
+"Aquest auxiliar us ajudar� a configurar el servidor FTP per la vostra xarxa."
 
-#: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"El tallafoc es pot configurar de manera que ofereixi diferents nivells de "
-"protecci�; trieu el nivell que es correspongui amb les vostres necessitats. "
-"Si no ho sabeu, el nivell mitj� �s generalment el m�s adequat."
+#: ../ftp_wizard/ftp.wiz_.c:3
+#, fuzzy
+msgid "Public directory:"
+msgstr "Directori:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "Seleccioneu el tipus de servei FTP que voleu activar:"
+#: ../ftp_wizard/ftp.wiz_.c:4
+msgid "Internet FTP Server:"
+msgstr "Servidor FTP per a Internet:"
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "Habilita el servidor FTP per a la Intranet"
 
 #: ../ftp_wizard/ftp.wiz_.c:7
-msgid "Internet FTP Server:"
-msgstr "Servidor FTP per a Internet:"
+msgid "FTP wizard"
+msgstr "Auxiliar de l'FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "Servidor FTP"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr "No marqueu cap opci� si no voleu activar el servidor FTP."
+
+#: ../ftp_wizard/ftp.wiz_.c:12
+msgid "Configuring the FTP Server"
+msgstr "S'est� configurant el servidor FTP"
+
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "Habilita el servidor FTP per a Internet"
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "Servidor FTP per a la Intranet:"
+
+#: ../ftp_wizard/ftp.wiz_.c:15
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "L'auxiliar ha configurat el servidor FTP per a Intranet/Internet amb �xit"
 
-#: ../ftp_wizard/ftp.wiz_.c:12
-#, fuzzy
-msgid "Public directory:"
-msgstr "Directori:"
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "Seleccioneu el tipus de servei FTP que voleu activar:"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "Habilita el servidor FTP per a la Intranet"
-
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
@@ -663,60 +684,36 @@ msgstr ""
 "L'auxiliar ha recollit els par�metes seg�ents necessaris per configurar el "
 "servidor FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "Auxiliar de l'FTP"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
 msgstr ""
-"Aquest auxiliar us ajudar� a configurar el servidor FTP per la vostra xarxa."
 
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "Habilita el servidor FTP per a Internet"
-
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "Servidor FTP per a la Intranet:"
-
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "Auxiliar de configuraci� del servidor FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "S'est� configurant el servidor FTP"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "No marqueu cap opci� si no voleu activar el servidor FTP."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "Servidor FTP"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Nom del servidor de not�cies:"
+msgid "Polling Interval:"
+msgstr "Interval de sondeig:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "Benvingut a l'auxiliar per a les not�cies"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Per�ode de sondeig (en hores):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "Servidor de not�cies"
+msgid "Polling Period"
+msgstr "Per�ode de sondeig"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -726,29 +723,32 @@ msgstr ""
 "les darreres not�cies d'Internet; el per�ode de sondeig �s l'interval de "
 "temps entre dos sondejos consecutius."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+"Aquest auxiliar us ajudar� a configurar els serveis de not�cies d'Internet "
+"per a la vostra xarxa."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "Auxiliar de les not�cies"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "El per�ode de sondeig no �s correcte"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "El nom del servidor de not�cies no �s correcte"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Interval de sondeig:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Els noms de m�quina d'Internet han de tenir la forma \\qm�quina.domini."
-"tipusdedomini; per exemple, si el vostre prove�dor �s \\qprove�dor.com\\q, "
-"el servidor de not�cies generalment ser� \\qnews.prove�dor.com\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Per�ode de sondeig"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "S'estan configurant les not�cies d'Internet"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -756,15 +756,7 @@ 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/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "El per�ode de sondeig no �s correcte"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "Servidor de not�cies:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -773,7 +765,14 @@ msgstr ""
 "not�ciesd'Internet a la vostra xarxa; aquest nom l'acostuma a donar el "
 "vostre prove�dor."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr ""
+"L'auxiliar ha configurat el servei de not�cies d'Internet del servidor amb "
+"�xit."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -781,32 +780,64 @@ msgstr ""
 "L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
 "servei de not�cies d'Internet:"
 
-#: ../news_wizard/news.wiz_.c:22
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Per�ode de sondeig (en hores):"
+
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Nom del servidor de not�cies:"
+
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Aquest auxiliar us ajudar� a configurar els serveis de not�cies d'Internet "
-"per a la vostra xarxa."
+"Els noms de m�quina d'Internet han de tenir la forma \\qm�quina.domini."
+"tipusdedomini; per exemple, si el vostre prove�dor �s \\qprove�dor.com\\q, "
+"el servidor de not�cies generalment ser� \\qnews.prove�dor.com\\q."
 
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "S'estan configurant les not�cies d'Internet"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "Benvingut a l'auxiliar per a les not�cies"
 
 #: ../news_wizard/news.wiz_.c:24
+msgid "News Server"
+msgstr "Servidor de not�cies"
+
+#: ../news_wizard/news.wiz_.c:25
+msgid "News Server:"
+msgstr "Servidor de not�cies:"
+
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Xarxa autoritzada:"
+
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Control d'acc�s"
+
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
-"The wizard successfully configured your Internet News service of your server."
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr ""
-"L'auxiliar ha configurat el servei de not�cies d'Internet del servidor amb "
-"�xit."
+"Es permetr� l'acc�s de les m�quines de la xarxa. Aqu� teniu la informaci� "
+"trobada sobre la xarxa local actual, podeu modificar-ho si calgu�s."
 
-#: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "Auxiliar de les not�cies"
+#: ../nfs_wizard/nfs.wiz_.c:4
+#, fuzzy
+msgid "Access :"
+msgstr "Control d'acc�s:"
+
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
+msgstr "Xarxa local: acc�s per a la xarxa local (recomanat)"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
 msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
+"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 ""
@@ -814,114 +845,126 @@ msgstr ""
 "nivellde xarxa local �s generalment el m�s adequat. Teniu en compte que el "
 "nivell Tot pot no ser segur."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
+msgstr ""
+"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar "
+"Samba."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "Auxiliar de configuraci� del servidor NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "Auxiliar de l'NFS"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
+msgstr "Garanteix l'acc�s per a la xarxa local"
+
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "Servidor NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "L'auxiliar ha configurat el servidor NFS amb �xit"
-
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "Tot: sense restriccions d'acc�s"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
-msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+#: ../nfs_wizard/nfs.wiz_.c:18
+msgid "Netmask :"
 msgstr ""
-"Es permetr� l'acc�s de les m�quines de la xarxa. Aqu� teniu la informaci� "
-"trobada sobre la xarxa local actual, podeu modificar-ho si calgu�s."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Control d'acc�s"
+#: ../nfs_wizard/nfs.wiz_.c:19
+msgid "Directory:"
+msgstr "Directori:"
 
-#: ../nfs_wizard/nfs.wiz_.c:11
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 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.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
-msgstr "Xarxa local: acc�s per a la xarxa local (recomanat)"
-
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "Xarxa autoritzada:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
-msgstr "Garanteix l'acc�s per a la xarxa local"
+#: ../nfs_wizard/nfs.wiz_.c:21
+msgid "The wizard successfully configured your NFS Server"
+msgstr "L'auxiliar ha configurat el servidor NFS amb �xit"
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:2
 #, fuzzy
-msgid "The wizard collected the following parameters."
+msgid "There seems to be a problem..."
 msgstr ""
-"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar "
-"Samba."
+"Sembla que hi ha un problema... Aneu a preguntar-li a l'homen�s negre de la "
+"porta"
 
-#: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "Control d'acc�s:"
+#: ../postfix_wizard/postfix.wiz_.c:3
+msgid "Internet Mail Gateway"
+msgstr "Passarel�la del correu d'Internet"
 
-#: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr "Directori:"
+#: ../postfix_wizard/postfix.wiz_.c:5
+msgid "Outgoing Mail Address"
+msgstr "Adre�a del correu de sortida"
 
-#: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "Auxiliar de l'NFS"
+#: ../postfix_wizard/postfix.wiz_.c:6
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr ""
+"L'auxiliar ha configurat el servei de correu d'Internet del servidor amb "
+"�xit."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "Fes-ho"
 
-#: ../postfix_wizard/postfix.wiz_.c:3
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
-"Podeu triar el tipus d'adre�a que el correu de sortida mostrar� en els camps "
-"\\qDe:\\q i \\qRespon a:\\q."
+"Haur�eu de triar conseq�entment amb l'adre�a que feu servir per al correu "
+"d'entrada."
 
-#: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "S'est� configurant el correu d'Internet"
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:11
+msgid "You entered an empty address for the mail gateway."
+msgstr "Heu introdu�t una adre�a buida per a la passarel�la de correu."
+
+#: ../postfix_wizard/postfix.wiz_.c:12
+msgid "Internet Mail Configuration Wizard"
+msgstr "Auxiliar de configuraci� del correu d'Internet"
+
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Auxiliar del postfix"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Nom del servidor de correu:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"El vostre servidor enviar� el correu de sortida a trav�s d'una passarel�la, "
-"que s'encarregar� de lliurar-lo finalment."
+"Aquesta configuraci� pot ser acceptada, per� no permetr� que envieu correu "
+"fora de la xarxa local. Premeu Seg�ent per continuar, o Anterior per "
+"introduir un valor."
 
-#: ../postfix_wizard/postfix.wiz_.c:8
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
@@ -929,29 +972,15 @@ msgstr ""
 "Aquest auxiliar us ajudar� a configurar els serveis de correu d'Internet per "
 "a la vostra xarxa."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Adre�a del correu de sortida"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr ""
-"Haur�eu de triar conseq�entment amb l'adre�a que feu servir per al correu "
-"d'entrada."
-
-#: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
-"Sembla que hi ha un problema... Aneu a preguntar-li a l'homen�s negre de la "
-"porta"
-
-#: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "L'emmascarament no �s correcte"
+"El vostre servidor enviar� el correu de sortida a trav�s d'una passarel�la, "
+"que s'encarregar� de lliurar-lo finalment."
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -959,11 +988,7 @@ msgstr ""
 "Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
 "del POSTFIX"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Format de l'adre�a"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -973,11 +998,19 @@ msgstr ""
 "tipusdedomini\\q;per exemple, si el vostre prove�dor �s \\qprove�dor.com\\q, "
 "el servidor de correu d'internet generalment ser� \\qsmtp.prove�dor.com\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Auxiliar de configuraci� del correu d'Internet"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Podeu triar el tipus d'adre�a que el correu de sortida mostrar� en els camps "
+"\\qDe:\\q i \\qRespon a:\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "S'est� configurant el correu d'Internet"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -985,72 +1018,56 @@ msgstr ""
 "L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
 "servei de correu d'Internet:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
+#: ../postfix_wizard/postfix.wiz_.c:26
+msgid "Masquerade not good!"
+msgstr "L'emmascarament no �s correcte"
+
+#: ../postfix_wizard/postfix.wiz_.c:28
+msgid "Form of the Address"
+msgstr "Format de l'adre�a"
+
+#: ../postfix_wizard/postfix.wiz_.c:29
 msgid "Mail Address:"
 msgstr "Adre�a de correu:"
 
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Heu introdu�t una adre�a buida per a la passarel�la de correu."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"L'auxiliar ha configurat el servei de correu d'Internet del servidor amb "
-"�xit."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Passarel�la del correu d'Internet"
-
-#: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Nom del servidor de correu:"
+"Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
+"del servidor intermediari (proxy)."
 
-#: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"Aquesta configuraci� pot ser acceptada, per� no permetr� que envieu correu "
-"fora de la xarxa local. Premeu Seg�ent per continuar, o Anterior per "
-"introduir un valor."
+#: ../proxy_wizard/proxy.wiz_.c:4
+msgid "Proxy Configuration Wizard"
+msgstr "Auxiliar de configuraci� del servidor intermediari (proxy)"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../proxy_wizard/proxy.wiz_.c:8
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "Heu de triar un port m�s gran que 1024 i menor que 65535"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
-msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
-msgstr ""
-"La mem�ria cau �s la quantitat de mem�ria RAM dedicada a les operacions "
-"d'intercanvi (teniu en compte que l'�s de la mem�ria per part de tot proc�s "
-"Squid �s m�s gran)."
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Aquest auxiliar s'ha d'executar com a root"
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Port del servidor intermediari:"
+#: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Control d'acc�s:"
 
-#: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "L'auxiliar ha configurat el servidor intermediari amb �xit."
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "S'est� configurant el servidor intermediari"
 
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "Heu introdu�t un port que pot ser �til per a aquest servei:"
+#: ../proxy_wizard/proxy.wiz_.c:13
+msgid "Define an upper level proxy"
+msgstr "Definiu un servidor intermediari de nivell superior"
 
-#: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Jerarquia de la mem�ria cau"
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "Sistema de fitxers            Mida  Usat Lliure �s% Muntat a"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -1058,19 +1075,20 @@ msgstr ""
 "L'Squid �s un servidor intermediari per a web (proxy), permet un acc�s m�s "
 "r�pid a la web per a la xarxa local."
 
-#: ../proxy_wizard/proxy.wiz_.c:10
-msgid "Define an upper level proxy"
-msgstr "Definiu un servidor intermediari de nivell superior"
-
-#: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Espai de disc (MB):"
-
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "Nom del servidor intermediari de nivell superior:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Aquest auxiliar us ajudar� a configurar el servidor intermediari."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Port del servidor intermediari de nivell superior:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr ""
+"A caire informatiu, aqu� teniu l'espai al disc ocupat per /var/spool/squid:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
@@ -1078,37 +1096,37 @@ msgstr ""
 "l'intercanvi al disc."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "S'est� configurant el servidor intermediari"
+msgid "Proxy Port"
+msgstr "Port del servidor intermediari"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"El valor del port del servidor intermediari especifica quin port escoltar� "
-"el servidor per a les peticions http. Per defecte �s el 3128, un altre valor "
-"habitual �s 8080. El valor de port ha de ser m�s gran de 1024."
+"Podeu emprar o b� un format num�ric com \\q192.168.1.0/255.255.255.0\\q o b� "
+"un format de text com \\q.domini.net\\q"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Auxiliar de l'Squid"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Port:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"Premeu Seg�ent si voleu mantenir aquest valor, o Anterior per corregir la "
+"vostra elecci�."
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "Sistema de fitxers            Mida  Usat Lliure �s% Muntat a"
+msgid "You have entered a port that may be useful for this service:"
+msgstr "Heu introdu�t un port que pot ser �til per a aquest servei:"
 
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Aquest auxiliar s'ha d'executar com a root"
+#: ../proxy_wizard/proxy.wiz_.c:27
+msgid "/etc/services:"
+msgstr "/etc/services:"
+
+#: ../proxy_wizard/proxy.wiz_.c:28
+msgid "Cache hierarchy"
+msgstr "Jerarquia de la mem�ria cau"
 
-#: ../proxy_wizard/proxy.wiz_.c:26
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
@@ -1116,191 +1134,162 @@ msgstr ""
 "Podeu seleccionar \\qNo usar un servidor intermediari de nivell superior\\q "
 "amb tranquil�litat si no necessiteu aquesta caracter�stica."
 
-#: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Mem�ria cau (MB):"
-
-#: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Control d'acc�s:"
+#: ../proxy_wizard/proxy.wiz_.c:30
+msgid "Port:"
+msgstr "Port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
-"del servidor intermediari (proxy)."
-
-#: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Port del servidor intermediari"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Premeu Anterior per canviar el valor."
+"Opcionalment, l'Squid pot configurar-se per ser un intermediari en cascada. "
+"Podeu afegir un nivell d'intermediari superior especificant el nom de "
+"m�quina i el port."
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
-"Introdu�u un nom de m�quina v�lid (com ara \\qcache.domini.net\\q) i el port "
-"que far� servir el servidor intermediari."
+"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
+"servidor intermediari:"
 
-#: ../proxy_wizard/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Mem�ria cau (MB):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "No usar un servidor intermediari de nivell superior (recomanat)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Heu de triar un port m�s gran que 1024 i menor que 65535"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Mida de la mem�ria cau del servidor intermediari"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Premeu Anterior per canviar el valor."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Premeu Seg�ent si voleu mantenir aquest valor, o Anterior per corregir la "
-"vostra elecci�."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "M�quina local - acc�s perm�s �nicament des d'aquest servidor"
+"El valor del port del servidor intermediari especifica quin port escoltar� "
+"el servidor per a les peticions http. Per defecte �s el 3128, un altre valor "
+"habitual �s 8080. El valor de port ha de ser m�s gran de 1024."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Podeu emprar o b� un format num�ric com \\q192.168.1.0/255.255.255.0\\q o b� "
-"un format de text com \\q.domini.net\\q"
+msgid "Squid wizard"
+msgstr "Auxiliar de l'Squid"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Auxiliar de configuraci� del servidor intermediari (proxy)"
+msgid "Proxy port:"
+msgstr "Port del servidor intermediari:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Espai de disc (MB):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "Nom del servidor intermediari de nivell superior:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "M�quina local - acc�s perm�s �nicament des d'aquest servidor"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"Opcionalment, l'Squid pot configurar-se per ser un intermediari en cascada. "
-"Podeu afegir un nivell d'intermediari superior especificant el nom de "
-"m�quina i el port."
+"La mem�ria cau �s la quantitat de mem�ria RAM dedicada a les operacions "
+"d'intercanvi (teniu en compte que l'�s de la mem�ria per part de tot proc�s "
+"Squid �s m�s gran)."
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
-"servidor intermediari:"
+"Introdu�u un nom de m�quina v�lid (com ara \\qcache.domini.net\\q) i el port "
+"que far� servir el servidor intermediari."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 "El servidor intermediari pot configurar-se per usar diferents nivells de "
 "control d'acc�s."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Port del servidor intermediari de nivell superior:"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Aquest auxiliar us ajudar� a configurar el servidor intermediari."
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "L'auxiliar ha configurat el servidor intermediari amb �xit."
 
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr ""
-"A caire informatiu, aqu� teniu l'espai al disc ocupat per /var/spool/squid:"
+#: ../samba_wizard/samba.wiz_.c:3
+msgid "Home:"
+msgstr "Inici:"
 
-#: ../samba_wizard/samba.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:4
 #, fuzzy
-msgid "Enable file sharing area"
-msgstr "Habilita la zona compartida /home/samba/public"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr ""
+msgid "Enable all printer"
+msgstr "Serveis Samba habilitats"
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Grup de treball:"
+#, fuzzy
+msgid "Make home directories available for their owners"
+msgstr "Permet l'acc�s dels usuaris als seus directoris d'usuari"
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr ""
-"Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
-"de SAMBA"
+msgid "Configuring Samba"
+msgstr "S'est� configurant Samba"
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "El descriptor del servidor no �s correcte"
-
 #: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba necessita con�ixer el grup de treball Windows al qual servir�."
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
-"Aquest auxiliar us ajudar� a configurar els serveis Samba del servidor."
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Serveis Samba habilitats"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+"Samba pot proporcionar una zona comuna de compartici� de fitxers per a "
+"l'estaci� de treball Windows, aix� com compartir les impressores connectades "
+"a aquest servidor."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+msgid "The wizard successfully configured your Samba server."
+msgstr "L'auxiliar ha configurat el servidor Samba amb �xit."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
-"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar "
-"Samba."
+msgid "Server Banner."
+msgstr "Descriptor del servidor."
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Descriptor:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Servidor d'impressi�:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Grup de treball"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Grup de treball:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"El descriptor determina la manera en qu� aquest servidor es descriur� a les "
-"estacions de treball Windows."
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Fitxers compartits:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1308,12 +1297,26 @@ msgstr ""
 "Heu seleccionat permetre l'acc�s dels usuaris al seu directori d'usuari "
 "mitjan�ant Samba, per� s'haur� d'usar smbpasswd per definir les contrasenyes."
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "Serveis Samba habilitats"
+msgid "Printers:"
+msgstr "Servidor d'impressi�:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "El descriptor del servidor no �s correcte"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Auxiliar de configuraci� de Samba"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1321,282 +1324,256 @@ msgstr ""
 "Samba permet que el servidor es comporti com un servidor de fitxers i "
 "d'impressi� per a estacions de treball que no funcionen sobre sistemes Linux."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
+#: ../samba_wizard/samba.wiz_.c:28
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:28
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "S'est� configurant Samba"
+"Aquest auxiliar us ajudar� a configurar els serveis Samba del servidor."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr "Descriptor del servidor:"
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
-msgstr "Descriptor del servidor."
+msgid "Enabled Samba Services"
+msgstr "Serveis Samba habilitats"
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "Habilita el servidor d'impressi� compartida"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "El grup de treball �s erroni"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Si trieu configurar-ho ara, continuareu autom�ticament amb la configuraci� "
+"de SAMBA"
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
+"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar "
+"Samba."
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "Control d'acc�s"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"El descriptor determina la manera en qu� aquest servidor es descriur� a les "
+"estacions de treball Windows."
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
 msgstr ""
-"Samba pot proporcionar una zona comuna de compartici� de fitxers per a "
-"l'estaci� de treball Windows, aix� com compartir les impressores connectades "
-"a aquest servidor."
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Descriptor:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "L'auxiliar ha configurat el servidor Samba amb �xit."
+msgid "The Workgroup is wrong"
+msgstr "El grup de treball �s erroni"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba necessita con�ixer el grup de treball Windows al qual servir�."
+msgid "Samba wizard"
+msgstr "Auxiliar del Samba"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Descriptor del servidor:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "Control d'acc�s:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Servidor d'impressi�:"
+msgid "Workgroup"
+msgstr "Grup de treball"
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Auxiliar del Samba"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Auxiliar de configuraci� de Samba"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "Make home directories available for their owners"
-msgstr "Permet l'acc�s dels usuaris als seus directoris d'usuari"
+msgid "Access control"
+msgstr "Control d'acc�s"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Habilita el servidor d'impressi� compartida"
-
-#: ../samba_wizard/samba.wiz_.c:56
+#: ../samba_wizard/samba.wiz_.c:53
 #, fuzzy
-msgid "Printers:"
-msgstr "Servidor d'impressi�:"
+msgid "Enable file sharing area"
+msgstr "Habilita la zona compartida /home/samba/public"
 
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Inici:"
+#: ../samba_wizard/samba.wiz_.c:56
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr ""
+msgid "File Sharing:"
+msgstr "Fitxers compartits:"
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
-msgstr ""
-"Trieu el dispositiu de xarxa (generalment una targeta) que el servidor "
-"necessita per connectar-se a la vostra xarxa. Es tracta del dispositiu per a "
-"la xarxa local, que probablement no sigui el mateix dispositiu que feu "
-"servir per connectar-vos a internet."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "L'adre�a IP del servidor no �s correcta"
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "Aquest auxiliar establir� els par�metes b�sics de xarxa del servidor."
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "Dispositiu de passarel�la:"
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Auxiliar del servidor"
-
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
-"Les adreces de xarxa s�n un grup de quatre nombres menors de 256 separats "
-"per punts; l'�ltim nombre del grup ha de ser zero."
+msgid "Host Name:"
+msgstr "Nom de la m�quina:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "dispositiu de xarxa"
+msgid "Basic Network Configuration Wizard"
+msgstr "Auxiliar de la configuraci� b�sica de xarxa"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "L'adre�a de xarxa �s err�nia"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Per tant, �s molt probable que el nom de domini i les adreces IP de la xarxa "
-"local siguin DIFERENTS de les de la connexi� \\qexterna\\q del servidor."
+msgid "Server IP address:"
+msgstr "Adre�a IP del servidor:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Adre�a de xarxa"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "�s recomanable que no tingueu altres aplicacions obertes mentre executeu "
 "aquest auxiliar. En finalitzar, cal que tanqueu la vostra sessi� i torneu a "
 "entrar. "
 
-#: ../server_wizard/server.wiz_.c:11
-msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
-msgstr ""
-"Aquest �s el valor actual per a la passarel�la externa (que es va "
-"especificar durant la instal�laci�). El dispositiu (targeta de xarxa o "
-"m�dem) hauria de ser diferent de l'emprat per a la xarxa interna."
-
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"The wizard successfully configured the basic networking services of your "
+"server."
 msgstr ""
-"Pel que respecta a aquests auxiliars, aquest ordinador representa un "
-"servidor que configura la seva pr�pia xarxa local (xarxa de classe C)."
+"L'auxiliar ha configurat els serveis b�sics de xarxa del servidor amb �xit."
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Dispositiu:"
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
+msgstr "(ara podeu modificar aquests valors si sabeu exactament qu� feu)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Av�s"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"L'adre�a de xarxa �s un nombre que identifica la vostra xarxa; el valor que "
+"es proposa �s adequat per a una configuraci� no connectada a Internet o "
+"connectada mitjan�ant emmascarament d'IP; tret que sapigueu de qu� es "
+"tracta, accepteu el valor per defecte."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Aquesta p�gina calcula el nom de domini; no hauria de ser visible"
+msgid "Note about networking"
+msgstr "Nota quant a les xarxes"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Adre�a del servidor:"
+msgid "Server Address"
+msgstr "Adre�a del servidor"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Nom de domini calculat"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"Les adreces de xarxa s�n un grup de quatre nombres menors de 256 separats "
+"per punts; l'�ltim nombre del grup ha de ser zero."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "Nom de la m�quina"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Nota: l'adre�a IP de la passarel�la no pot quedar buida si voleu connectar-"
+"vos amb l'exterior."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-"Aquesta p�gina calcula l'adre�a del servidor per defecte; no hauria de ser "
-"visible"
+msgid "The Server IP address is incorrect"
+msgstr "L'adre�a IP del servidor no �s correcta"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Auxiliar de la configuraci� b�sica de xarxa"
+msgid "Configuring your network"
+msgstr "S'est� configurant la xarxa local"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "IP de la passarel�la:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "El nom de la m�quina no �s correcte"
+msgid "This page computes the default server address; it should be invisible."
+msgstr ""
+"Aquesta p�gina calcula l'adre�a del servidor per defecte; no hauria de ser "
+"visible"
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"Els noms de m�quina han de tenir la forma \\qnomdem�quina.domini."
-"tipusdedomini\\q; si el servidor ser� un servidor d'Internet, el nom de "
-"domini ha d'estar registrat amb el vostre prove�dor. Si nom�s ser� un "
-"servidor d'intranet qualsevol nom v�lid serveix, com \\qempresa.net\\q."
+msgid "IP net address:"
+msgstr "Adre�a IP de la xarxa:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Passarel�la externa"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"L'adre�a de xarxa �s un nombre que identifica la vostra xarxa; el valor que "
-"es proposa �s adequat per a una configuraci� no connectada a Internet o "
-"connectada mitjan�ant emmascarament d'IP; tret que sapigueu de qu� es "
-"tracta, accepteu el valor per defecte."
+msgid "Server Wizard"
+msgstr "Auxiliar del servidor"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
-"Aquest auxiliar us ajudar� a configurar els serveis b�sics de xarxa del "
-"servidor."
+"Per tant, �s molt probable que el nom de domini i les adreces IP de la xarxa "
+"local siguin DIFERENTS de les de la connexi� \\qexterna\\q del servidor."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "Aquest auxiliar establir� els par�metes b�sics de xarxa del servidor."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Nota quant a les xarxes"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Nota: l'adre�a IP de la passarel�la no pot quedar buida si voleu connectar-"
-"vos amb l'exterior."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Error de l'auxiliar."
+"Trieu el dispositiu de xarxa (generalment una targeta) que el servidor "
+"necessita per connectar-se a la vostra xarxa. Es tracta del dispositiu per a "
+"la xarxa local, que probablement no sigui el mateix dispositiu que feu "
+"servir per connectar-vos a internet."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1604,19 +1581,41 @@ msgstr ""
 "Els dispoditius es presenten amb el nom Linux i, si es coneix, amb la "
 "descripci� de la targeta."
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Adre�a de xarxa:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Aquest �s el valor actual per a la passarel�la externa (que es va "
+"especificar durant la instal�laci�). El dispositiu (targeta de xarxa o "
+"m�dem) hauria de ser diferent de l'emprat per a la xarxa interna."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "S'est� configurant la xarxa local"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr ""
+"Aquest auxiliar us ajudar� a configurar els serveis b�sics de xarxa del "
+"servidor."
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "IP de la passarel�la:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"L'adre�a IP del servidor �s un nombre que identifica el servidor a la xarxa; "
+"el valor proposat �s adequat per a una xarxa privada, no visible des "
+"d'internet o connectada mitjan�ant emmascarament d'IP; tret que sapigueu de "
+"qu� es tracta, accepteu el valor per defecte."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "El nom de la m�quina no �s correcte"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1626,11 +1625,27 @@ msgstr ""
 "d'altres estacions de treball dins la vostra xarxa i potser tamb� a Internet "
 "(segons la configuraci� de sortida a l'exterior)."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "Nom de la m�quina:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Error de l'auxiliar."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "dispositiu de xarxa"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "Nom de domini calculat"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Aquesta p�gina calcula el nom de domini; no hauria de ser visible"
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "Dispositiu de passarel�la:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
@@ -1638,404 +1653,402 @@ msgstr ""
 "L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar la "
 "xarxa"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"La connexi� externa �s una xarxa de la qual l'ordinador n'�s client (xarxa "
-"d'Internet o de sortida a l'exterior), i s'hi connecta amb una altra targeta "
-"de xarxa o un m�dem."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Av�s"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr "(ara podeu modificar aquests valors si sabeu exactament qu� feu)"
+msgid "Device:"
+msgstr "Dispositiu:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"L'adre�a IP del servidor �s un nombre que identifica el servidor a la xarxa; "
-"el valor proposat �s adequat per a una xarxa privada, no visible des "
-"d'internet o connectada mitjan�ant emmascarament d'IP; tret que sapigueu de "
-"qu� es tracta, accepteu el valor per defecte."
+"Pel que respecta a aquests auxiliars, aquest ordinador representa un "
+"servidor que configura la seva pr�pia xarxa local (xarxa de classe C)."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Nom del servidor:"
+msgid "Server Address:"
+msgstr "Adre�a del servidor:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "L'adre�a de xarxa �s err�nia"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"La connexi� externa �s una xarxa de la qual l'ordinador n'�s client (xarxa "
+"d'Internet o de sortida a l'exterior), i s'hi connecta amb una altra targeta "
+"de xarxa o un m�dem."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Adre�a del servidor"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
 msgstr ""
-"L'auxiliar ha configurat els serveis b�sics de xarxa del servidor amb �xit."
+"Els noms de m�quina han de tenir la forma \\qnomdem�quina.domini."
+"tipusdedomini\\q; si el servidor ser� un servidor d'Internet, el nom de "
+"domini ha d'estar registrat amb el vostre prove�dor. Si nom�s ser� un "
+"servidor d'intranet qualsevol nom v�lid serveix, com \\qempresa.net\\q."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "Dispositiu de xarxa"
+msgid "Host Name"
+msgstr "Nom de la m�quina"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "Adre�a IP de la xarxa:"
+msgid "Network Address:"
+msgstr "Adre�a de xarxa:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Adre�a de xarxa"
+msgid "Network Device"
+msgstr "Dispositiu de xarxa"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "Adre�a IP del servidor:"
+msgid "Server Name:"
+msgstr "Nom del servidor:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "Universitat d'Adelaida, Austr�lia del Sud"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Universitat Par�s Sud, Fran�a"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Premeu Seg�ent per comen�ar el test de servidors horaris."
+msgid "University of Manchester, Manchester, England"
+msgstr "Universitat de Manchester, Manchester, Anglaterra"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Servidors horaris"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Universitat de Limotges, Fran�a"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Servidor horari secundari:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Centre Meteorol�gic Canadenc, Dorval, Quebec, Canad�"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr ""
-"Aix�, el vostre servidor ser� el servidor horari local per a la vostra xarxa."
+msgid "Press next to start the time servers test."
+msgstr "Premeu Seg�ent per comen�ar el test de servidors horaris."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
-"El vostre servidor ja pot funcionar com a un servidor horari per a la xarxa "
-"local."
+"Podeu intentar de nou contactar amb els servidors horaris, o desar la "
+"configuraci� sense realment configurar l'hora."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Centre Cient�fic de Chernogolovka, regi� de Moscou, R�ssia"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(trieu servidors de la vostra zona geogr�fica)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Col�legi Baylor de Medicina, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "Universitat d'Oklahoma, Norman, Oklahoma, EEUU"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Trieu un fus horari:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "Universitat de Regina, Regina, Saskatchewan, Canad�"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr "premeu Seg�ent per comen�ar, o Cancel�la per sortir de l'auxiliar"
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Col�legi Trinity, Dubl�, Irlanda"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Tolossa, Fran�a"
+msgid "Singapore"
+msgstr "Singapur"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Universitat de Limotges, Fran�a"
+msgid "Secondary Time Server:"
+msgstr "Servidor horari secundari:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "Sistemes d'informaci� del MIT, Cambridge, MA"
+msgid "Try again"
+msgstr "Torneu-ho a provar"
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
-msgstr "Seleccioneu un servidor primari i un de secundari de la llista."
+msgid "The Chinese University of Hong Kong"
+msgstr "Universitat Xinesa de Hong Kong"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(trieu servidors de la vostra zona geogr�fica)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV Col�legi d'Enginyeria, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, Fran�a"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alacant, Espanya)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Centre Meteorol�gic Canadenc, Dorval, Quebec, Canad�"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "Consell Nacional de Recerca de Canad�, Ottawa, Ontario, Canad�"
 
+#: ../time_wizard/time.wiz_.c:18
+msgid "Select a primary and secondary server from the list."
+msgstr "Seleccioneu un servidor primari i un de secundari de la llista."
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "Universitat de Manchester, Manchester, Anglaterra"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Li�, Fran�a"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- cap xarxa exterior"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet Inc., Se�l, Corea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Si el servidor horari no est� disponible immediatament (per la xarxa o "
-"qualsevol altre motiu), haureu d'esperar uns 30 segons."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Centre Cient�fic de Chernogolovka, regi� de Moscou, R�ssia"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "S'est� comprovant la disponibilitat dels servidors horaris"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Universitat de Washington State Tri-Cities, Richland, Wa"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "Universitat d'Oslo, Noruega"
+msgid "University of Adelaide, South Australia"
+msgstr "Universitat d'Adelaida, Austr�lia del Sud"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr ""
-"Departament de Ci�ncies Inform�tiques, Universitat de Wisconsin-Madison"
+msgid "Time zone:"
+msgstr "Fus horari:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Col�legi Trinity, Dubl�, Irlanda"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Els servidors horaris no responen. Les causes possibles s�n:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "Universitat de Regina, Regina, Saskatchewan, Canad�"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Universitat de Caen, Fran�a"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Els servidors horaris no responen. Les causes possibles s�n:"
+msgid "- other reasons..."
+msgstr "- altres motius..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Institut Federal Su�s de Tecnologia"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Si el servidor horari no est� disponible immediatament (per la xarxa o "
+"qualsevol altre motiu), haureu d'esperar uns 30 segons."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Universitat de Caen, Fran�a"
+msgid "WARNING"
+msgstr "AV�S"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Li�, Fran�a"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, Fran�a"
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
-"Aquest auxiliar us ajudar� a configurar l'hora del servidor, localment o "
-"sincronitzant-lo amb un servidor horari extern."
+"El vostre servidor ja pot funcionar com a un servidor horari per a la xarxa "
+"local."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "AV�S"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Universitat de Fukuoka, Fukuoka, Jap�"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet Inc., Se�l, Corea"
+msgid "Time Servers"
+msgstr "Servidors horaris"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "Universitat d'Oklahoma, Norman, Oklahoma, EEUU"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Institut Federal Su�s de Tecnologia"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "Universitat Xinesa de Hong Kong"
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Aquest auxiliar us ajudar� a configurar l'hora del servidor, localment o "
+"sincronitzant-lo amb un servidor horari extern."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- altres motius..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Tolossa, Fran�a"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- els servidors horaris no existeixen"
+msgid "Testing the time servers availability"
+msgstr "S'est� comprovant la disponibilitat dels servidors horaris"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Fus horari:"
+msgid "Save config without test"
+msgstr "Desa la configuraci� sense comprovar-ho"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr ""
 "Departament de Ci�ncies Inform�tiques, Universitat d'Strathclyde, Glasgow, "
 "Esc�cia"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Podeu intentar de nou contactar amb els servidors horaris, o desar la "
-"configuraci� sense realment configurar l'hora."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Universitat de Penn State, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "Sistemes d'informaci� del MIT, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Servidor horari primari:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Col�legi Baylor de Medicina, Houston, Tx"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Torneu-ho a provar"
+msgid "Penn State University, University Park, PA"
+msgstr "Universitat de Penn State, University Park, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Universitat de Washington State Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
+msgstr "- els servidors horaris no existeixen"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "S'ha desat la configuraci� del servidor horari"
+msgid "Time wizard"
+msgstr "Auxiliar horari"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Universitat Par�s Sud, Fran�a"
+msgid "University of Oslo, Norway"
+msgstr "Universitat d'Oslo, Noruega"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr ""
+"Aix�, el vostre servidor ser� el servidor horari local per a la vostra xarxa."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Desa la configuraci� sense comprovar-ho"
+msgid "- no outside network"
+msgstr "- cap xarxa exterior"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapur"
+msgid "Primary Time Server:"
+msgstr "Servidor horari primari:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Universitat de Fukuoka, Fukuoka, Jap�"
+msgid "Time server configuration saved"
+msgstr "S'ha desat la configuraci� del servidor horari"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV Col�legi d'Enginyeria, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr "premeu Seg�ent per comen�ar, o Cancel�la per sortir de l'auxiliar"
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alacant, Espanya)"
+msgid "Choose a time zone:"
+msgstr "Trieu un fus horari:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Auxiliar horari"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
+msgid "Computer Science Department, University of Wisconsin-Madison"
 msgstr ""
+"Departament de Ci�ncies Inform�tiques, Universitat de Wisconsin-Madison"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-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."
+msgid ""
+"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/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr ""
-"L'auxiliar ha configurat el servidor Web per a Intranet/Internet amb �xit"
+#, fuzzy
+msgid "Internet web server:"
+msgstr "Servidor Web d'Internet:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
-"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
-"servidor Web"
-
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Auxiliar de Web"
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
 msgstr ""
-"Aquest auxiliar us ajudar� a configurar el servidor Web per a la vostra "
-"xarxa."
+
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Habilita el servidor Web per a la Intranet"
 
 #: ../web_wizard/web.wiz_.c:12
-#, fuzzy
-msgid "Internet web server:"
-msgstr "Servidor Web d'Internet:"
+msgid "Configuring the Web Server"
+msgstr "S'est� configurant el servidor Web"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Habilita el servidor Web per a la Intranet"
+msgid "Web Server"
+msgstr "Servidor Web"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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/web.wiz_.c:15
 #, fuzzy
 msgid "Enable the Web Server for the Internet"
 msgstr "Habilita el servidor Web per a la Intranet"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Directori:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "Selecciona el tipus de servei Web que voleu activar:"
+#, fuzzy
+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/web.wiz_.c:17
-msgid "document root:"
-msgstr ""
+msgid "Web wizard"
+msgstr "Auxiliar de Web"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Servidor Web d'Intranet:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "S'est� configurant el servidor Web"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Servidor Web"
+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/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Auxiliar de configuraci� del servidor Web"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "Selecciona el tipus de servei Web que voleu activar:"
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr ""
+"L'auxiliar ha recollit els par�metres seg�ents necessaris per configurar el "
+"servidor Web"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr ""
+"L'auxiliar ha configurat el servidor Web per a Intranet/Internet amb �xit"
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr ""
+msgid "Web Server Configuration Wizard"
+msgstr "Auxiliar de configuraci� del servidor Web"
 
 msgid "Cancel"
 msgstr "Cancel�la"
diff --git a/po/cs.po b/po/cs.po
index d0deb897..83e85cb0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-09-14 17:34GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -20,231 +20,219 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Klienta va�� lok�ln� s�t� p�edstavuje po��ta�, kter� je p�ipojen� k s�ti a "
-"m� p�i�azen� vlastn� n�zev a IP adresu."
+"Pokud chcete nastavit tyto parametry nyn�, klepn�te na tla��tko Dal��, nebo "
+"klepnut�m na tla��tko Zru�it ukon��te tohoto pr�vodce."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "Toto nen� platn� adresa... pokra�ujte stisknut�m tla��tka Dal��"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "OK"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"Chcete-li zm�nit ji� existuj�c� �daj, stiskn�te tla��tko Dal��, nebo "
-"stiskn�te tla��tko Zp�t a opravte va�i volbu."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Gratulujeme"
+"Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m "
+"klienta."
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "Pr�vodce nastaven�m klienta DNS"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr ""
+"Za�n�te klepnut�m na tla��tko Dal��, nebo pr�vodce ukon�ete klepnut�m na "
+"tla��tko Zru�it."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"V� klient bude na s�ti ozna�ov�n n�zvem, jako nap��klad pocitac.firma.net. "
+"Ka�d� po��ta� na s�ti mus� m�t p�i�azenou (unik�tn�) IP adresu, v obvykl�m "
+"tvaru odd�len�m te�kami."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro p�id�n� klienta do "
 "va�� s�t�:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Syst�mov� chyba, nebylo provedeno ��dn� nastaven�"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "N�zev klienta"
+msgid "The wizard successfully added the client."
+msgstr "Pr�vodce �sp�n� p�idal klienta."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "P�id�v�m nov�ho klienta do va�� s�t�"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(za n�zvem nemus�te zad�vat dom�nu)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Nastavit"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"Vezm�te pros�m na v�dom�, �e dan� IP adresa a n�zev klienta by m�ly b�t v "
+"r�mci s�t� unik�tn�."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Identifikace klienta:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Varov�n�:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(za n�zvem nemus�te zad�vat dom�nu)"
+msgid "Name of the machine:"
+msgstr "N�zev po��ta�e:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m "
-"klienta."
+msgid "Adding a new client to your network"
+msgstr "P�id�v�m nov�ho klienta do va�� s�t�"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Server pou�ije zde zadan� informace k vytvo�en� n�zvu klienta, kter� bude k "
-"dispozici ostatn�m po��ta��m ve va�� s�ti."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Syst�mov� chyba, nebylo provedeno ��dn� nastaven�"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Zadal jste n�zev po��ta�e nebo IP adresu, kter� je ji� pou�ita."
+msgid "Client identification:"
+msgstr "Identifikace klienta:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "Pr�vodce �sp�n� p�idal klienta."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr ""
+"Tento pr�vodce v�m pom��e p�idat nov�ho klienta do va�� lok�ln� slu�by DNS."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "N�zev po��ta�e:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "OK"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"V� klient bude na s�ti ozna�ov�n n�zvem, jako nap��klad pocitac.firma.net. "
-"Ka�d� po��ta� na s�ti mus� m�t p�i�azenou (unik�tn�) IP adresu, v obvykl�m "
-"tvaru odd�len�m te�kami."
+"Klienta va�� lok�ln� s�t� p�edstavuje po��ta�, kter� je p�ipojen� k s�ti a "
+"m� p�i�azen� vlastn� n�zev a IP adresu."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"Vezm�te pros�m na v�dom�, �e dan� IP adresa a n�zev klienta by m�ly b�t v "
-"r�mci s�t� unik�tn�."
+"Chcete-li p�ijmout tyto hodnoty, a p�idat va�eho klienta, stiskn�te tla��tko "
+"Dal��, nebo pou�ijte tla��tko Zp�t a hodnoty opravte."
 
-#: ../client_wizard/client.wiz_.c:21
-#, fuzzy
-msgid "DNS Wizard (add client)"
-msgstr "Pr�vodce pro DNS"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "Toto nen� platn� adresa... pokra�ujte stisknut�m tla��tka Dal��"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Varov�n�\\nM�te s�� nastavenou v re�imu DHCP, server nemus� s va�im "
-"nastaven�m spr�vn� fungovat."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "IP klienta:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "IP adresa po��ta�e:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Nastavit"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Ukon�it"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "Tohoto pr�vodce lze spustit pouze jako u�ivatel root"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "S�� nen� zat�m nastavena"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr ""
-"Tento pr�vodce v�m pom��e p�idat nov�ho klienta do va�� lok�ln� slu�by DNS."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Zadal jste n�zev po��ta�e nebo IP adresu, kter� je ji� pou�ita."
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
-msgstr ""
-"Chcete-li p�ijmout tyto hodnoty, a p�idat va�eho klienta, stiskn�te tla��tko "
-"Dal��, nebo pou�ijte tla��tko Zp�t a hodnoty opravte."
+#: ../client_wizard/client.wiz_.c:25
+#, fuzzy
+msgid "DNS Wizard (add client)"
+msgstr "Pr�vodce pro DNS"
 
-#: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Ukon�it"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"Za�n�te klepnut�m na tla��tko Dal��, nebo pr�vodce ukon�ete klepnut�m na "
-"tla��tko Zru�it."
+"Varov�n�\\nM�te s�� nastavenou v re�imu DHCP, server nemus� s va�im "
+"nastaven�m spr�vn� fungovat."
 
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
+#: ../client_wizard/client.wiz_.c:28
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Pokud chcete nastavit tyto parametry nyn�, klepn�te na tla��tko Dal��, nebo "
-"klepnut�m na tla��tko Zru�it ukon��te tohoto pr�vodce."
+"Server pou�ije zde zadan� informace k vytvo�en� n�zvu klienta, kter� bude k "
+"dispozici ostatn�m po��ta��m ve va�� s�ti."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "Tohoto pr�vodce lze spustit pouze jako u�ivatel root"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Gratulujeme"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "IP adresa po��ta�e:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "IP klienta:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Chcete-li zm�nit ji� existuj�c� �daj, stiskn�te tla��tko Dal��, nebo "
+"stiskn�te tla��tko Zp�t a opravte va�i volbu."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
 msgstr ""
 "P�ed spu�t�n�m tohoto pr�vodce mus�te nastavit z�kladn� s��ov� parametry."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Varov�n�:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Pr�vodce pro nastaven�"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "Datab�zov� server MySQL"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "P�idejte pros�m u�ivatele uveden�m jm�na u�ivatele a hesla"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "N�zev klienta"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "P�id�n� u�ivatele"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -252,76 +240,69 @@ msgstr ""
 "Stiskem tla��tka \\qPotvrdit\\q p�ijmete tyto �daje a nastav�te v� server, "
 "stiskem tla��tka Zp�t m��ete �daje opravit."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Zadejte pros�m heslo u�ivatele root:"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "Nastavuji datab�zov� server MySQL"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "Pr�vodce �sp�n� nastavil v� datab�zov� server MySQL"
+msgid "Confirm"
+msgstr "Potvrdit"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Datab�zov� server"
+msgid "Password:"
+msgstr "Heslo:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Heslo u�ivatele root:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "Pr�vodce �sp�n� nastavil v� datab�zov� server MySQL"
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Potvrdit"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "Promi�te, ale na tohle mus�te b�t u�ivatel root..."
+msgid "Username:"
+msgstr "U�ivatelsk� jm�no:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Heslo:"
+msgid "Add"
+msgstr "P�idat"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m "
-"datab�zov�ho serveru MySQL."
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "Promi�te, ale na tohle mus�te b�t u�ivatel root..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
-"Tento pr�vodce v�m pom��e nastavit datab�zov� server MySQL pro va�i s��."
+msgid "Database Server"
+msgstr "Datab�zov� server"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "U�ivatelsk� jm�no:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Pozn�mka: Tento u�ivatel bude m�t ve�ker� pr�va"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "P�idat"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Zadejte pros�m heslo u�ivatele root:"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "Pr�vodce pro datab�zi MySQL"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "Nastavuji datab�zov� server MySQL"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Pr�vodce pro nastaven�"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr ""
 "Chcete-li spustit v� server, mus�te nejprve zadat heslo u�ivatele root"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "Pr�vodce pro datab�zi MySQL"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Heslo u�ivatele root:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "Datab�zov� server MySQL"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -329,35 +310,59 @@ msgstr ""
 "Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�eho "
 "datab�zov�ho serveru MySQL:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
 msgstr ""
-"IP adresy jsou skupiny �ty� ��sel odd�len�ch te�kami, ka�d� men�� ne� 256."
+"Tento pr�vodce v�m pom��e nastavit datab�zov� server MySQL pro va�i s��."
+
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "P�idejte pros�m u�ivatele uveden�m jm�na u�ivatele a hesla"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../db_wizard/db.wiz_.c:27
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
+msgstr ""
+"Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m "
+"datab�zov�ho serveru MySQL."
+
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr ""
+"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�� slu�by "
+"DHCP:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Opravit"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
-"Vyberte rozsah adres, kter� budou slu�bou DHCP p�i�azovan� pracovn�m "
-"stanic�m; pokud nem�te zvl�tn� po�adavky, m��ete bez starost� p�ijmout "
-"nab�zen� hodnoty."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Nejvy��� IP adresa:"
+msgid "Lowest IP Address:"
+msgstr "Nejni��� IP adresa:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "Rozsah adres pou�it�ch slu�bou DHCP"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr ""
+"IP adresy jsou skupiny �ty� ��sel odd�len�ch te�kami, ka�d� men�� ne� 256."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -365,96 +370,84 @@ msgstr ""
 "Chcete-li p�ijmout tyto hodnoty a nastavit v� server, klikn�te na tla��tko "
 "Dal��, nebo pou�ijte tla��tko Zp�t a opravte je."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"DHCP je slu�ba, kter� automaticky p�i�azuje s��ov� adresy va�im pracovn�m "
-"stanic�m."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "Pr�vodce pro DHCP"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Opravit"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+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.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "Rozsah adres pou�it�ch slu�bou DHCP"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Pr�vodce �sp�n� nastavil slu�by DHCP na va�em serveru."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-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.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�� slu�by "
-"DHCP:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Nejni��� IP adresa:"
+"Vyberte rozsah adres, kter� budou slu�bou DHCP p�i�azovan� pracovn�m "
+"stanic�m; pokud nem�te zvl�tn� po�adavky, m��ete bez starost� p�ijmout "
+"nab�zen� hodnoty."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "Pr�vodce nastaven�m DHCP"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "Zadan� rozsah IP adres nen� spr�vn�"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
+"DHCP je slu�ba, kter� automaticky p�i�azuje s��ov� adresy va�im pracovn�m "
+"stanic�m."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "Zadan� rozsah IP adres nen� spr�vn�"
+msgid "Highest IP Address:"
+msgstr "Nejvy��� IP adresa:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
-msgstr "Pr�vodce pro DHCP"
+msgid "DHCP Configuration Wizard"
+msgstr "Pr�vodce nastaven�m DHCP"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "Nastavuji server DHCP"
 
-#: ../dns_wizard/dns.wiz_.c:2
-#, fuzzy
-msgid "DNS Wizard (configuration)"
-msgstr "Pr�vodce nastaven�m DNS"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�� slu�by "
-"DNS:"
+"Va�e nastaven� lze p�ijmout, ale nebude mo�n� identifikovat n�zvy po��ta�� "
+"mimo va�i lok�ln� s��."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr ""
+"Stisknut�m tla��tka Dal�� ponech�te tyto hodnoty pr�zdn�, nebo stiskn�te "
+"tla��tko Zp�t a n�co zadejte."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Adresa prim�rn�ho DNS:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "Nastavuji DNS server"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Adresa sekund�rn�ho DNS:"
+msgid "DNS Configuration Wizard"
+msgstr "Pr�vodce nastaven�m DNS"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "Adresy DNS server�"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Tento pr�vodce v�m pom��e nastavit slu�by DNS na va�em serveru. Toto "
-"nastaven� poskytne lok�ln� slu�bu DNS pro lok�ln� n�zvy po��ta��, po�adavky "
-"mimo lok�ln� s�� budou p�epos�l�ny na extern� DNS servery."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -466,43 +459,53 @@ msgstr ""
 "zadat adresu prim�rn�ho a sekund�rn�ho DNS serveru; tyto adresy v�m obvykle "
 "sd�l� v� poskytovatel Internetu."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "Pr�vodce �sp�n� nastavil slu�by DNS pro v� server."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Zadali jste pr�zdnou adresu pro DNS server."
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
-"Stisknut�m tla��tka Dal�� ponech�te tyto hodnoty pr�zdn�, nebo stiskn�te "
-"tla��tko Zp�t a n�co zadejte."
-
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "Pr�vodce nastaven�m DNS"
+"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�� slu�by "
+"DNS:"
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Adresa prim�rn�ho DNS:"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
+msgstr "Adresy DNS server�"
 
-#: ../dns_wizard/dns.wiz_.c:20
+#: ../dns_wizard/dns.wiz_.c:17
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Va�e nastaven� lze p�ijmout, ale nebude mo�n� identifikovat n�zvy po��ta�� "
-"mimo va�i lok�ln� s��."
+"DNS (Domain Name Server) je slu�ba, kter� spojuje po��ta� s jeho jm�nem pro "
+"s�� Internet."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Adresa sekund�rn�ho DNS:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"DNS (Domain Name Server) je slu�ba, kter� spojuje po��ta� s jeho jm�nem pro "
-"s�� Internet."
+"Tento pr�vodce v�m pom��e nastavit slu�by DNS na va�em serveru. Toto "
+"nastaven� poskytne lok�ln� slu�bu DNS pro lok�ln� n�zvy po��ta��, po�adavky "
+"mimo lok�ln� s�� budou p�epos�l�ny na extern� DNS servery."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "Pr�vodce �sp�n� nastavil slu�by DNS pro v� server."
+#, fuzzy
+msgid "DNS Wizard (configuration)"
+msgstr "Pr�vodce nastaven�m DNS"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -513,62 +516,69 @@ msgid "Please select a wizard"
 msgstr "Vyberte si pros�m pr�vodce"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Za��zen�"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "St�edn� - ven jsou zp��stupn�ny slu�by HTTP, FTP a SSH"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr "Siln� - ��dn� viditelnost zvn�j�ku, u�ivatel� jsou omezeni na web"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Stalo se n�co hrozn�ho"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Pr�vodce nastaven�m firewallu"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�eho "
+"firewallu:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr ""
+"Firewall (ohniv� ze�) chr�n� va�i intern� s�� p�ed neopr�vn�n�mi p��stupy ze "
+"s�t� Internet."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "S��ov� za��zen� pro Internet:"
+msgid "Device"
+msgstr "Za��zen�"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Opravit"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Pr�vodce pro firewall"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "��dn� - bez ochrany"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "�rove� ochrany:"
+msgid "Internet Network Device:"
+msgstr "S��ov� za��zen� pro Internet:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Pr�vodce pro firewall"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Firewall m��e b�t nastaven tak, aby nab�zel r�zn� �rovn� ochrany; vyberte "
+"�rove�, kter� nejv�ce odpov�d� va�im po�adavk�m. Pokud si nejste jisti, pak "
+"je obvykle St�edn� �rove� pro v�s nejlep��."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "Pr�vodce �sp�n� nastavil v� server pro firewall."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "St�edn� - ven jsou zp��stupn�ny slu�by HTTP, FTP a SSH"
+msgid "The device name is not correct"
+msgstr "N�zev za��zen� je �patn�"
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "�rove� ochrany"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Opravit"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Ukon�it"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Pr�vodce nastaven�m firewallu"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "N�zev za��zen� je �patn�"
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -576,91 +586,101 @@ msgstr ""
 "Pro firewall je t�eba zn�t zp�sob, jak�m je v� server p�ipojen k s�ti "
 "Internet; vyberte za��zen�, kter� pou��v�te pro extern� p�ipojen�."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr ""
-"Firewall (ohniv� ze�) chr�n� va�i intern� s�� p�ed neopr�vn�n�mi p��stupy ze "
-"s�t� Internet."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "�rove� ochrany"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "Nastavuji firewall"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Stalo se n�co hrozn�ho"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "S��ov� za��zen� pro firewall"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "��dn� - bez ochrany"
+msgid "The wizard successfully configured your server firewall."
+msgstr "Pr�vodce �sp�n� nastavil v� server pro firewall."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
-msgid "This wizard will help you configuring your server firewall."
-msgstr "Tento pr�vodce v�m pom��e nastavit v� server pro firewall."
+msgid "Configuring the Firewall"
+msgstr "Nastavuji firewall"
 
-#: ../firewall_wizard/firewall.wiz_.c:23
-msgid "Low - Light filtering, standard services available"
-msgstr "N�zk� - slab� filtrov�n�, standardn� slu�by jsou k dispozici"
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Ukon�it"
 
 #: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "S��ov� za��zen� pro firewall"
+#, fuzzy
+msgid "This wizard will help you configuring your server firewall."
+msgstr "Tento pr�vodce v�m pom��e nastavit v� server pro firewall."
 
 #: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
-msgstr ""
-"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�eho "
-"firewallu:"
+msgid "Low - Light filtering, standard services available"
+msgstr "N�zk� - slab� filtrov�n�, standardn� slu�by jsou k dispozici"
 
 #: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Firewall m��e b�t nastaven tak, aby nab�zel r�zn� �rovn� ochrany; vyberte "
-"�rove�, kter� nejv�ce odpov�d� va�im po�adavk�m. Pokud si nejste jisti, pak "
-"je obvykle St�edn� �rove� pro v�s nejlep��."
+msgid "Protection Level:"
+msgstr "�rove� ochrany:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "Vyberte po�adovan� druh slu�by FTP, kterou chcete aktivovat:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
+msgstr "Tento pr�vodce v�m pom��e nastavit FTP server pro va�i s��."
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:3
+#, fuzzy
+msgid "Public directory:"
+msgstr "Adres��:"
 
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:4
 msgid "Internet FTP Server:"
 msgstr "FTP server pro Internet:"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "Povolit FTP server pro Intranet"
+
+#: ../ftp_wizard/ftp.wiz_.c:7
+msgid "FTP wizard"
+msgstr "Pr�vodce pro FTP"
+
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "FTP server"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
-msgstr "Tento pr�vodce �sp�n� nastavil v� FTP server pro Internet/Intranet"
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr "Pokud nechcete aktivovat v� FTP server, neza�krt�vejte ��dn� pol��ko."
 
 #: ../ftp_wizard/ftp.wiz_.c:12
-#, fuzzy
-msgid "Public directory:"
-msgstr "Adres��:"
+msgid "Configuring the FTP Server"
+msgstr "Nastavuji FTP server"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "Povolit FTP server pro Internet"
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "FTP server pro Intranet:"
 
 #: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "Povolit FTP server pro Intranet"
+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/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "Vyberte po�adovan� druh slu�by FTP, kterou chcete aktivovat:"
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr ""
+
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
@@ -668,59 +688,36 @@ msgstr ""
 "Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�eho FTP "
 "serveru"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "Pr�vodce pro FTP"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
-msgstr "Tento pr�vodce v�m pom��e nastavit FTP server pro va�i s��."
-
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "Povolit FTP server pro Internet"
-
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "FTP server pro Intranet:"
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "Pr�vodce nastaven�m FTP serveru"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "Nastavuji FTP server"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Pokud nechcete aktivovat v� FTP server, neza�krt�vejte ��dn� pol��ko."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "FTP server"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Server diskusn�ch skupin:"
+msgid "Polling Interval:"
+msgstr "Interval aktualizace:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "V�tejte v Pr�vodci pro nastaven� diskusn�ch skupin"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Interval aktualizace (hodiny):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "Server diskusn�ch skupin"
+msgid "Polling Period"
+msgstr "Interval aktualizace"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -730,29 +727,32 @@ msgstr ""
 "nov� p��sp�vky do diskusn�ch skupin. Interval aktualizace p�edstavuje dobu "
 "mezi dv�ma po sob� jdouc�mi dotazy."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+"Tento pr�vodce v�m pom��e nastavit slu�by diskusn�ch skupin z Internetu pro "
+"va�i s��."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "Pr�vodce pro diskusn� skupiny"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "Interval aktualizace je �patn�"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "N�zev serveru diskus�ch skupin je �patn�"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Interval aktualizace:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"N�zvy po��ta�� pro Internet mus� b�t ve tvaru \\qpocitac.domena.typdomeny"
-"\\q; pokud se nap��klad v� poskytovatel jmenuje \\qposkytovatel.cz\\q, pak "
-"je obvykle n�zev jeho serveru diskusn�ch skupin \\qnews.poskytovatel.cz\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Interval aktualizace"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Nastavuji diskusn� skupiny"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -760,15 +760,7 @@ 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/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "Interval aktualizace je �patn�"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "Server diskusn�ch skupin:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -777,7 +769,12 @@ msgstr ""
 "diskusn� skupiny na Internetu pro va�i s��; tento n�zev v�m obvykle sd�l� "
 "v� poskytovatel p�ipojen� na Internet."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+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."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -785,30 +782,64 @@ msgstr ""
 "Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�� slu�by "
 "pro diskusn� skupiny z Internetu:"
 
-#: ../news_wizard/news.wiz_.c:22
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Interval aktualizace (hodiny):"
+
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Server diskusn�ch skupin:"
+
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Tento pr�vodce v�m pom��e nastavit slu�by diskusn�ch skupin z Internetu pro "
-"va�i s��."
+"N�zvy po��ta�� pro Internet mus� b�t ve tvaru \\qpocitac.domena.typdomeny"
+"\\q; pokud se nap��klad v� poskytovatel jmenuje \\qposkytovatel.cz\\q, pak "
+"je obvykle n�zev jeho serveru diskusn�ch skupin \\qnews.poskytovatel.cz\\q."
 
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Nastavuji diskusn� skupiny"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "V�tejte v Pr�vodci pro nastaven� diskusn�ch skupin"
 
 #: ../news_wizard/news.wiz_.c:24
-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."
+msgid "News Server"
+msgstr "Server diskusn�ch skupin"
 
 #: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "Pr�vodce pro diskusn� skupiny"
+msgid "News Server:"
+msgstr "Server diskusn�ch skupin:"
+
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Opr�vn�n� s��:"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Kontrola p��stupu"
+
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
+msgstr ""
+"P��stup bude povolen po��ta��m na s�ti. Zde jsou informace o va�� sou�asn� "
+"lok�ln� s�ti; pokud je to pot�eba, m��ete je zm�nit."
+
+#: ../nfs_wizard/nfs.wiz_.c:4
+#, fuzzy
+msgid "Access :"
+msgstr "Kontrola p��stupu:"
+
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
+msgstr "Lok�ln� s�� - p��stup pro lok�ln� s�� (doporu�eno)"
+
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+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 ""
@@ -816,141 +847,139 @@ msgstr ""
 "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�."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
+msgstr ""
+"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� serveru "
+"Samba."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "Pr�vodce nastaven�m serveru NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "Pr�vodce pro NFS"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
+msgstr "Umo�nit p��stup na lok�ln� s�ti"
+
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "NFS server"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "Pr�vodce �sp�n� nastavil v� server NFS."
-
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "V�ichni - bez omezen� p��stupu"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
-msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+#: ../nfs_wizard/nfs.wiz_.c:18
+msgid "Netmask :"
 msgstr ""
-"P��stup bude povolen po��ta��m na s�ti. Zde jsou informace o va�� sou�asn� "
-"lok�ln� s�ti; pokud je to pot�eba, m��ete je zm�nit."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Kontrola p��stupu"
+#: ../nfs_wizard/nfs.wiz_.c:19
+msgid "Directory:"
+msgstr "Adres��:"
 
-#: ../nfs_wizard/nfs.wiz_.c:11
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 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.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
-msgstr "Lok�ln� s�� - p��stup pro lok�ln� s�� (doporu�eno)"
-
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "Opr�vn�n� s��:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
-msgstr "Umo�nit p��stup na lok�ln� s�ti"
+#: ../nfs_wizard/nfs.wiz_.c:21
+msgid "The wizard successfully configured your NFS Server"
+msgstr "Pr�vodce �sp�n� nastavil v� server NFS."
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:2
 #, fuzzy
-msgid "The wizard collected the following parameters."
+msgid "There seems to be a problem..."
 msgstr ""
-"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� serveru "
-"Samba."
+"Zd� se, �e se vyskytl probl�m... jd�te a zeptejte se velk�ch �ern�ch mu�� "
+"dole"
 
-#: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "Kontrola p��stupu:"
+#: ../postfix_wizard/postfix.wiz_.c:3
+msgid "Internet Mail Gateway"
+msgstr "Br�na pro po�tu na Internet"
 
-#: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr "Adres��:"
+#: ../postfix_wizard/postfix.wiz_.c:5
+msgid "Outgoing Mail Address"
+msgstr "Odchoz� po�tovn� adresa"
 
-#: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "Pr�vodce pro NFS"
+#: ../postfix_wizard/postfix.wiz_.c:6
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr ""
+"Pr�vodce �sp�n� nastavil slu�bu pro elektronickou po�tu na Internetu na "
+"va�em serveru."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "Prov�st"
 
-#: ../postfix_wizard/postfix.wiz_.c:3
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
-"M��ete vybrat adresu, kter� se bude objevovat v odchoz�ch dopisech v "
-"polo�k�ch\\qFrom:\\q (odes�latel) a \\qReply-To:\\q (komu poslat odpov��)."
+"Tato by m�la b�t zvolena konzistentn� s adresou, kterou pou��v�te pro "
+"p��choz� po�tu."
 
-#: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "Nastavuji elektronickou po�tu pro s�� Internet"
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:11
+msgid "You entered an empty address for the mail gateway."
+msgstr "Zadal jste pr�zdnou adresu pro po�tovn� br�nu."
+
+#: ../postfix_wizard/postfix.wiz_.c:12
+msgid "Internet Mail Configuration Wizard"
+msgstr "Pr�vodce nastaven�m po�ty pro Internet"
+
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Pr�vodce pro server Postfix"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "N�zev po�tovn�ho serveru:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"V� server bude odes�lat odchoz� po�tu skrze po�tovn� br�nu, kter� se "
-"postar� o kone�n� doru�en�."
+"Va�i volbu lze p�ijmout, ale nebude pak mo�n� pos�lat po�tu mimo va�i "
+"lok�ln� s��. Chcete-li pokra�ovat, stiskn�te tla��tko Dal��, jinak stiskn�te "
+"tla��tko Zp�t a zadejte n�jakou hodnotu."
 
-#: ../postfix_wizard/postfix.wiz_.c:8
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
 msgstr ""
 "Tento pr�vodce v�m pom��e nastavit slu�by po�ty pro Internet pro va�i s��."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Odchoz� po�tovn� adresa"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr ""
-"Tato by m�la b�t zvolena konzistentn� s adresou, kterou pou��v�te pro "
-"p��choz� po�tu."
-
-#: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
-"Zd� se, �e se vyskytl probl�m... jd�te a zeptejte se velk�ch �ern�ch mu�� "
-"dole"
-
-#: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "Ma�kar�da nen� v po��dku!"
+"V� server bude odes�lat odchoz� po�tu skrze po�tovn� br�nu, kter� se "
+"postar� o kone�n� doru�en�."
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -958,11 +987,7 @@ msgstr ""
 "Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m "
 "serveru Postfix."
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Tvar adresy"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -973,11 +998,19 @@ msgstr ""
 "je obvykle n�zev jeho po�tovn�ho serveru pro Internet \\qsmtp.poskytovatel.cz"
 "\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Pr�vodce nastaven�m po�ty pro Internet"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"M��ete vybrat adresu, kter� se bude objevovat v odchoz�ch dopisech v "
+"polo�k�ch\\qFrom:\\q (odes�latel) a \\qReply-To:\\q (komu poslat odpov��)."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "Nastavuji elektronickou po�tu pro s�� Internet"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -985,72 +1018,56 @@ msgstr ""
 "Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�� slu�by "
 "pro po�tu na Internetu:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
+#: ../postfix_wizard/postfix.wiz_.c:26
+msgid "Masquerade not good!"
+msgstr "Ma�kar�da nen� v po��dku!"
+
+#: ../postfix_wizard/postfix.wiz_.c:28
+msgid "Form of the Address"
+msgstr "Tvar adresy"
+
+#: ../postfix_wizard/postfix.wiz_.c:29
 msgid "Mail Address:"
 msgstr "Po�tovn� adresa:"
 
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Zadal jste pr�zdnou adresu pro po�tovn� br�nu."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"Pr�vodce �sp�n� nastavil slu�bu pro elektronickou po�tu na Internetu na "
-"va�em serveru."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Br�na pro po�tu na Internet"
-
-#: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "N�zev po�tovn�ho serveru:"
+"Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m proxy "
+"serveru."
 
-#: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"Va�i volbu lze p�ijmout, ale nebude pak mo�n� pos�lat po�tu mimo va�i "
-"lok�ln� s��. Chcete-li pokra�ovat, stiskn�te tla��tko Dal��, jinak stiskn�te "
-"tla��tko Zp�t a zadejte n�jakou hodnotu."
+#: ../proxy_wizard/proxy.wiz_.c:4
+msgid "Proxy Configuration Wizard"
+msgstr "Pr�vodce nastaven�m proxy serveru"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../proxy_wizard/proxy.wiz_.c:8
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "Mus�te vybrat ��slo portu vy��� ne� 1024 a ni��� ne� 65535"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
-msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
-msgstr ""
-"Vyrovn�vac� pam� p�edstavuje mno�stv� pam�ti RAM vyhrazen� pro urychlovac� "
-"operace prov�d�n� v opera�n� pam�ti (tud�� skute�n� velikost pou�it� pam�ti "
-"cel�ho procesu serveru Squid je v�t��)."
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Tento pr�vodce mus� b�t spu�t�n s pr�vy u�ivatele root."
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Port proxy serveru:"
+#: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Kontrola p��stupu:"
 
-#: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "Tento pr�vodce �sp�n� nastavil v� proxy server."
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "Nastavuji proxy server"
 
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "Zadali jste ��slo portu, kter� m��e b�t u�ite�n� pro tuto slu�bu:"
+#: ../proxy_wizard/proxy.wiz_.c:13
+msgid "Define an upper level proxy"
+msgstr "Definujte proxy server vy��� �rovn�"
 
-#: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Hierarchie vyrovn�vac� pam�ti"
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "Souborov� syst�m      Vel.  Pou�. Disp. Pou�.% P�ipojeno na"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -1058,19 +1075,19 @@ msgstr ""
 "Squid je proxy server pro urychlen� webov�ch po�adavk�. Umo��uje rychlej�� "
 "p��stup na str�nky WWW z va�� lok�ln� s�t�."
 
-#: ../proxy_wizard/proxy.wiz_.c:10
-msgid "Define an upper level proxy"
-msgstr "Definujte proxy server vy��� �rovn�"
-
-#: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Prostor na disku (MB):"
-
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "N�zev proxy vy��� �rovn�:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Tento pr�vodce v�m pom��e nastavit v� proxy server."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Port proxy vy��� �rovn�:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Pro va�i informaci, zde je m�sto na disku pro /var/spool/squid:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
@@ -1078,37 +1095,37 @@ msgstr ""
 "pou��t pro vyrovn�vac� pam�."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "Nastavuji proxy server"
+msgid "Proxy Port"
+msgstr "Port proxy serveru"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"Hodnota proxy portu ur�uje, na kter�m portu bude proxy server naslouchat "
-"po�adavk�m HTTP protokolu. V�choz� hodnota je 3128, dal�� b�n� se "
-"vyskytuj�c� hodnota je 8080. ��slo portu mus� b�t vy��� ne� 1024."
+"M��ete pou��t bu� numerick� form�t jako \\q192.168.1.0/255.255.255.0\\q nebo "
+"textov� form�t typu \\q.domena.net\\q"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Pr�vodce pro server Squid"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Port:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"Chcete-li ponechat tuto hodnotu, stiskn�te tla��tko Dal��, nebo tla��tkem "
+"Zp�t va�i volbu opravte."
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "Souborov� syst�m      Vel.  Pou�. Disp. Pou�.% P�ipojeno na"
+msgid "You have entered a port that may be useful for this service:"
+msgstr "Zadali jste ��slo portu, kter� m��e b�t u�ite�n� pro tuto slu�bu:"
 
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Tento pr�vodce mus� b�t spu�t�n s pr�vy u�ivatele root."
+#: ../proxy_wizard/proxy.wiz_.c:27
+msgid "/etc/services:"
+msgstr "/etc/services:"
+
+#: ../proxy_wizard/proxy.wiz_.c:28
+msgid "Cache hierarchy"
+msgstr "Hierarchie vyrovn�vac� pam�ti"
 
-#: ../proxy_wizard/proxy.wiz_.c:26
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
@@ -1116,188 +1133,161 @@ msgstr ""
 "M��ete bez starost� zvolit \\q��dn� proxy server vy��� �rovn�\\q, pokud tuto "
 "vlastnost nepot�ebujete."
 
-#: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Vyrovn�vac� pam� (MB):"
-
-#: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Kontrola p��stupu:"
+#: ../proxy_wizard/proxy.wiz_.c:30
+msgid "Port:"
+msgstr "Port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m proxy "
-"serveru."
-
-#: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Port proxy serveru"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Chcete-li zm�nit tuto hodnotu, stiskn�te tla��tko Zp�t."
+"V� proxy server Squid m��e b�t voliteln� nastaven jako kask�dov� proxy "
+"server. Zad�n�m n�zvu po��ta�e a portu m��ete p�idat nov� proxy server vy��� "
+"�rovn�."
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
-"Zadejte pln� n�zev po��ta�e (nap�. \\qcache.domena.net\\q) a ��slo portu "
-"proxy serveru, kter� se m� pou��t."
+"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�eho "
+"proxy serveru:"
 
-#: ../proxy_wizard/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Vyrovn�vac� pam� (MB):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "��dn� proxy server vy��� �rovn� (doporu�eno)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Mus�te vybrat ��slo portu vy��� ne� 1024 a ni��� ne� 65535"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Velikost proxy cache"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Chcete-li zm�nit tuto hodnotu, stiskn�te tla��tko Zp�t."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Chcete-li ponechat tuto hodnotu, stiskn�te tla��tko Dal��, nebo tla��tkem "
-"Zp�t va�i volbu opravte."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Localhost - p��stup omezen� pouze na tento server"
+"Hodnota proxy portu ur�uje, na kter�m portu bude proxy server naslouchat "
+"po�adavk�m HTTP protokolu. V�choz� hodnota je 3128, dal�� b�n� se "
+"vyskytuj�c� hodnota je 8080. ��slo portu mus� b�t vy��� ne� 1024."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"M��ete pou��t bu� numerick� form�t jako \\q192.168.1.0/255.255.255.0\\q nebo "
-"textov� form�t typu \\q.domena.net\\q"
+msgid "Squid wizard"
+msgstr "Pr�vodce pro server Squid"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Pr�vodce nastaven�m proxy serveru"
+msgid "Proxy port:"
+msgstr "Port proxy serveru:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Prostor na disku (MB):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "N�zev proxy vy��� �rovn�:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Localhost - p��stup omezen� pouze na tento server"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"V� proxy server Squid m��e b�t voliteln� nastaven jako kask�dov� proxy "
-"server. Zad�n�m n�zvu po��ta�e a portu m��ete p�idat nov� proxy server vy��� "
-"�rovn�."
+"Vyrovn�vac� pam� p�edstavuje mno�stv� pam�ti RAM vyhrazen� pro urychlovac� "
+"operace prov�d�n� v opera�n� pam�ti (tud�� skute�n� velikost pou�it� pam�ti "
+"cel�ho procesu serveru Squid je v�t��)."
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�eho "
-"proxy serveru:"
+"Zadejte pln� n�zev po��ta�e (nap�. \\qcache.domena.net\\q) a ��slo portu "
+"proxy serveru, kter� se m� pou��t."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 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."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Port proxy vy��� �rovn�:"
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "Tento pr�vodce �sp�n� nastavil v� proxy server."
 
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Tento pr�vodce v�m pom��e nastavit v� proxy server."
+#: ../samba_wizard/samba.wiz_.c:3
+msgid "Home:"
+msgstr "Domovsk� adres��:"
 
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Pro va�i informaci, zde je m�sto na disku pro /var/spool/squid:"
+#: ../samba_wizard/samba.wiz_.c:4
+#, fuzzy
+msgid "Enable all printer"
+msgstr "Povolit slu�by serveru Samba"
 
-#: ../samba_wizard/samba.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:5
 #, fuzzy
-msgid "Enable file sharing area"
-msgstr "Povolit prostor pro sd�len� /home/samba/public"
+msgid "Make home directories available for their owners"
+msgstr "Zp��stupnit domovsk� adres��e jejich vlastn�k�m"
 
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
+#: ../samba_wizard/samba.wiz_.c:6
+msgid "Configuring Samba"
+msgstr "Nastavuji server Samba"
 
-#: ../samba_wizard/samba.wiz_.c:3
+#: ../samba_wizard/samba.wiz_.c:9
 msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Pracovn� skupina:"
-
-#: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
+#: ../samba_wizard/samba.wiz_.c:11
+msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
-"Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m "
-"serveru Samba."
+"Server Samba pot�ebuje zn�t pracovn� skupinu Windows, kterou bude obsluhovat."
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "Titulek serveru je �patn�"
-
-#: ../samba_wizard/samba.wiz_.c:11
+#: ../samba_wizard/samba.wiz_.c:13
 msgid ""
-"This wizard will help you configuring the Samba services of your server."
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
 msgstr ""
-"Tento pr�vodce v�m pom��e nastavit slu�by serveru Samba na va�em po��ta�i."
-
-#: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Povolit slu�by serveru Samba"
+"Server Samba m��e poskytovat prostor pro spole�n� sd�len� soubor� pro va�e "
+"pracovn� stanice s Windows, a tak� m��e poskytovat sd�len� tisk�ren "
+"p�ipojen�ch k va�emu serveru."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+msgid "The wizard successfully configured your Samba server."
+msgstr "Pr�vodce �sp�n� nastavil v� server Samba."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
-"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� serveru "
-"Samba."
+msgid "Server Banner."
+msgstr "Titulek serveru."
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Titulek:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Tiskov� server:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Pracovn� skupina"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Pracovn� skupina:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"Titulek je n�zev, s jak�m bude v� server prezentov�n pracovn�m stanic�m s "
-"Windows."
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Sd�len� soubor�:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1305,12 +1295,26 @@ msgstr ""
 "Povolili jste p��stup u�ivatel� k jejich domovsk�m adres���m p�es protokol "
 "Samba, ale u�ivatel� musej� pro nastaven� hesla pou��t program smbpasswd."
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "Povolit slu�by serveru Samba"
+msgid "Printers:"
+msgstr "Tiskov� server:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "Titulek serveru je �patn�"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Pr�vodce nastaven�m serveru Samba"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1319,279 +1323,252 @@ msgstr ""
 "tiskov�ho serveru pracovn�m stanic�m provozuj�c�m opera�n� syst�m jin� ne� "
 "Linux."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
+#: ../samba_wizard/samba.wiz_.c:28
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:28
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "Nastavuji server Samba"
+"Tento pr�vodce v�m pom��e nastavit slu�by serveru Samba na va�em po��ta�i."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr "Titulek serveru:"
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
-msgstr "Titulek serveru."
+msgid "Enabled Samba Services"
+msgstr "Povolit slu�by serveru Samba"
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "Povolit sd�len� tisk�rny na serveru"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "N�zev pracovn� skupiny je �patn�"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Pokud chcete nastavovat nyn�, budete automaticky pokra�ovat nastaven�m "
+"serveru Samba."
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
+"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� serveru "
+"Samba."
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "Kontrola p��stupu"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"Titulek je n�zev, s jak�m bude v� server prezentov�n pracovn�m stanic�m s "
+"Windows."
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
 msgstr ""
-"Server Samba m��e poskytovat prostor pro spole�n� sd�len� soubor� pro va�e "
-"pracovn� stanice s Windows, a tak� m��e poskytovat sd�len� tisk�ren "
-"p�ipojen�ch k va�emu serveru."
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Titulek:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "Pr�vodce �sp�n� nastavil v� server Samba."
+msgid "The Workgroup is wrong"
+msgstr "N�zev pracovn� skupiny je �patn�"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr ""
-"Server Samba pot�ebuje zn�t pracovn� skupinu Windows, kterou bude obsluhovat."
+msgid "Samba wizard"
+msgstr "Pr�vodce pro server Samba"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Titulek serveru:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "Kontrola p��stupu:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Tiskov� server:"
+msgid "Workgroup"
+msgstr "Pracovn� skupina"
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Pr�vodce pro server Samba"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Pr�vodce nastaven�m serveru Samba"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "Make home directories available for their owners"
-msgstr "Zp��stupnit domovsk� adres��e jejich vlastn�k�m"
+msgid "Access control"
+msgstr "Kontrola p��stupu"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Povolit sd�len� tisk�rny na serveru"
-
-#: ../samba_wizard/samba.wiz_.c:56
+#: ../samba_wizard/samba.wiz_.c:53
 #, fuzzy
-msgid "Printers:"
-msgstr "Tiskov� server:"
+msgid "Enable file sharing area"
+msgstr "Povolit prostor pro sd�len� /home/samba/public"
 
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Domovsk� adres��:"
+#: ../samba_wizard/samba.wiz_.c:56
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr ""
+msgid "File Sharing:"
+msgstr "Sd�len� soubor�:"
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
-msgstr ""
-"Vyberte s��ov� za��zen� (obvykle kartu), kterou by m�l server pou��t pro "
-"p�ipojen� do va�� s�t�. Je to za��zen� pro va�� lok�ln� s��, pravd�podobn� "
-"jin� ne� za��zen�, kter� pou��v�te pro p��stup do s�t� Internet."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "IP adresa serveru nen� spr�vn�"
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "Tento pr�vodce nastav� z�kladn� parametry s�t� va�eho serveru."
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "Za��zen� br�ny:"
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Pr�vodce pro server"
-
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
-"Adresa s�t� jsou �ty�i ��sla men�� ne� 256 odd�len� te�kami; posledn� z "
-"t�chto ��sel mus� b�t nula."
+msgid "Host Name:"
+msgstr "N�zev po��ta�e:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "s��ov� za��zen�"
+msgid "Basic Network Configuration Wizard"
+msgstr "Pr�vodce z�kladn�m nastaven�m s�t�"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "Adresa s�t� je �patn�"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Tak�e je velmi pravd�podobn�, �e n�zev dom�ny a IP adresa pro tuto lok�ln� "
-"s�� jsou ODLI�N� od \\qextern�ho\\q p�ipojen� serveru."
+msgid "Server IP address:"
+msgstr "IP adresa serveru:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Adresa s�t�"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "Po dobu b�hu tohoto pr�vodce byste nem�li m�t spu�t�nou ��dnou jinou "
 "aplikaci, a po skon�en� tohoto pr�vodce byste m�li ukon�it va�e sezen� a "
 "znovu se p�ihl�sit."
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
-msgstr ""
-"Zde je va�e aktu�ln� hodnota pro extern� br�nu (hodnota zadan� b�hem prvotn� "
-"instalace). Za��zen� (s��ov� karta nebo modem) by se m�lo li�it od za��zen�, "
-"kter� je pou�ito pro p�ipojen� k va�� intern� s�ti."
-
-#: ../server_wizard/server.wiz_.c:12
-msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
-msgstr ""
-"Co se t��e t�chto pr�vodc�, je na v� po��ta� nahl��eno jako na server "
-"spravuj�c� svou vlastn� lok�ln� s�� (s�� t��dy C)."
+"The wizard successfully configured the basic networking services of your "
+"server."
+msgstr "Pr�vodce �sp�n� nastavil z�kladn� s��ov� slu�by va�eho serveru."
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Za��zen�:"
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
+msgstr "(tyto hodnoty lze zde zm�nit, pokud opravdu p�esn� v�te, co d�l�te)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Varov�n�"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"Adresa s�t� je ��slo, kter� ozna�uje va�i s��; navrhovan� hodnota je ur�ena "
+"pro nastaven�, kde s�� nen� p�ipojena k Internetu, nebo je p�ipojena pomoc� "
+"ma�kar�dy IP adresy; pokud si nejste jisti, o co jde, ponechte v�choz� "
+"hodnotu."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Tato str�nka po��t� n�zev dom�ny, m�la by b�t neviditeln�."
+msgid "Note about networking"
+msgstr "Pozn�mka o s�t�ch"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Adresa serveru:"
+msgid "Server Address"
+msgstr "Adresa serveru"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Vypo�ten� n�zev dom�ny"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"Adresa s�t� jsou �ty�i ��sla men�� ne� 256 odd�len� te�kami; posledn� z "
+"t�chto ��sel mus� b�t nula."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "N�zev po��ta�e"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Pozn�mka: IP adresa br�ny by nem�la b�t pr�zdn�, pokud chcete m�t p��stup k "
+"vn�j��mu sv�tu."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr "Tato str�nka po��t� v�choz� adresu serveru, a m�la by b�t neviditeln�."
+msgid "The Server IP address is incorrect"
+msgstr "IP adresa serveru nen� spr�vn�"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Pr�vodce z�kladn�m nastaven�m s�t�"
+msgid "Configuring your network"
+msgstr "Nastavuji va�i s��"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "IP adresa br�ny:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "N�zev po��ta�e je �patn�"
+msgid "This page computes the default server address; it should be invisible."
+msgstr "Tato str�nka po��t� v�choz� adresu serveru, a m�la by b�t neviditeln�."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"N�zvy po��ta�� mus� b�t ve form�tu \\qpocitac.domena.typdomeny\\q; pokud je "
-"v� server ur�en� pro Internet, jm�no dom�ny by m�lo b�t jm�no registrovan� "
-"u va�eho poskytovatele Internetu. Pokud m�te pouze Intranet, je platn� "
-"jak�koli jm�no, nap�. \\qfirma.net\\q."
+msgid "IP net address:"
+msgstr "IP adresa s�t�:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Extern� br�na"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"Adresa s�t� je ��slo, kter� ozna�uje va�i s��; navrhovan� hodnota je ur�ena "
-"pro nastaven�, kde s�� nen� p�ipojena k Internetu, nebo je p�ipojena pomoc� "
-"ma�kar�dy IP adresy; pokud si nejste jisti, o co jde, ponechte v�choz� "
-"hodnotu."
+msgid "Server Wizard"
+msgstr "Pr�vodce pro server"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
-"Tento pr�vodce v�m pom��e nastavit z�kladn� s��ov� slu�by va�eho serveru."
+"Tak�e je velmi pravd�podobn�, �e n�zev dom�ny a IP adresa pro tuto lok�ln� "
+"s�� jsou ODLI�N� od \\qextern�ho\\q p�ipojen� serveru."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "Tento pr�vodce nastav� z�kladn� parametry s�t� va�eho serveru."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Pozn�mka o s�t�ch"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Pozn�mka: IP adresa br�ny by nem�la b�t pr�zdn�, pokud chcete m�t p��stup k "
-"vn�j��mu sv�tu."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Chyba pr�vodce."
+"Vyberte s��ov� za��zen� (obvykle kartu), kterou by m�l server pou��t pro "
+"p�ipojen� do va�� s�t�. Je to za��zen� pro va�� lok�ln� s��, pravd�podobn� "
+"jin� ne� za��zen�, kter� pou��v�te pro p��stup do s�t� Internet."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1599,19 +1576,40 @@ msgstr ""
 "Za��zen� jsou zobrazena s n�zvem pro Linux, a pokud je zn�m�, tak� s jejich "
 "popisem."
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Adresa s�t�:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Zde je va�e aktu�ln� hodnota pro extern� br�nu (hodnota zadan� b�hem prvotn� "
+"instalace). Za��zen� (s��ov� karta nebo modem) by se m�lo li�it od za��zen�, "
+"kter� je pou�ito pro p�ipojen� k va�� intern� s�ti."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "Nastavuji va�i s��"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr ""
+"Tento pr�vodce v�m pom��e nastavit z�kladn� s��ov� slu�by va�eho serveru."
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "IP adresa br�ny:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"IP adresa serveru je ��slo, kter� ozna�uje v� server na va�i s�ti; navr�en� "
+"v�choz� hodnota je ur�ena pro priv�tn� s��, kter� je pro Internet "
+"neviditeln� nebo se k n�mu p�ipojuje pomoc� ma�kar�dy IP adresy; pokud "
+"nev�te p�esn�, o co jde, ponechte tuto v�choz� hodnotu."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "N�zev po��ta�e je �patn�"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1621,407 +1619,422 @@ msgstr ""
 "pracovn�m stanic�m na va�� s�ti a p��padn� na Internetu (z�le�� na nastaven� "
 "nad�azen� s�t�)."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "N�zev po��ta�e:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Chyba pr�vodce."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "s��ov� za��zen�"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "Vypo�ten� n�zev dom�ny"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Tato str�nka po��t� n�zev dom�ny, m�la by b�t neviditeln�."
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "Za��zen� br�ny:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
 msgstr ""
 "Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�� s�t�:"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"Extern� p�ipojen� je s��, pro kterou je dan� po��ta� klientem (Internet nebo "
-"nad�azen� s��), obvykle je k n� p�ipojen� dal�� s��ovou kartou nebo modemem."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Varov�n�"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr "(tyto hodnoty lze zde zm�nit, pokud opravdu p�esn� v�te, co d�l�te)"
+msgid "Device:"
+msgstr "Za��zen�:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"IP adresa serveru je ��slo, kter� ozna�uje v� server na va�i s�ti; navr�en� "
-"v�choz� hodnota je ur�ena pro priv�tn� s��, kter� je pro Internet "
-"neviditeln� nebo se k n�mu p�ipojuje pomoc� ma�kar�dy IP adresy; pokud "
-"nev�te p�esn�, o co jde, ponechte tuto v�choz� hodnotu."
+"Co se t��e t�chto pr�vodc�, je na v� po��ta� nahl��eno jako na server "
+"spravuj�c� svou vlastn� lok�ln� s�� (s�� t��dy C)."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "N�zev serveru:"
+msgid "Server Address:"
+msgstr "Adresa serveru:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "Adresa s�t� je �patn�"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"Extern� p�ipojen� je s��, pro kterou je dan� po��ta� klientem (Internet nebo "
+"nad�azen� s��), obvykle je k n� p�ipojen� dal�� s��ovou kartou nebo modemem."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Adresa serveru"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
-msgstr "Pr�vodce �sp�n� nastavil z�kladn� s��ov� slu�by va�eho serveru."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
+msgstr ""
+"N�zvy po��ta�� mus� b�t ve form�tu \\qpocitac.domena.typdomeny\\q; pokud je "
+"v� server ur�en� pro Internet, jm�no dom�ny by m�lo b�t jm�no registrovan� "
+"u va�eho poskytovatele Internetu. Pokud m�te pouze Intranet, je platn� "
+"jak�koli jm�no, nap�. \\qfirma.net\\q."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "S��ov� za��zen�"
+msgid "Host Name"
+msgstr "N�zev po��ta�e"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "IP adresa s�t�:"
+msgid "Network Address:"
+msgstr "Adresa s�t�:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Adresa s�t�"
+msgid "Network Device"
+msgstr "S��ov� za��zen�"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "IP adresa serveru:"
+msgid "Server Name:"
+msgstr "N�zev serveru:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "University of Adelaide, Ji�n� Austr�lie"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Universite Paris Sud, Francie"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Klepn�te na Dal�� pro spu�t�n� testu �asov�ch server�."
+msgid "University of Manchester, Manchester, England"
+msgstr "University of Manchester, Manchester, Anglie"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "�asov� servery"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Universite de Limoges, Francie"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Sekund�rn� �asov� server:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Canadian Meteorological Centre, Dorval, Quebec, Kanada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr "Tento pr�vodce v�m pom��e nastavit �asov� server pro va�i s��."
+msgid "Press next to start the time servers test."
+msgstr "Klepn�te na Dal�� pro spu�t�n� testu �asov�ch server�."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
-msgstr "Server nyn� m��e fungovat jako �asov� server pro va�i lok�ln� s��."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
+msgstr ""
+"M��ete se op�t pokusit kontaktovat �asov� servery nebo ulo�it nastaven� bez "
+"nastaven� aktu�ln�ho �asu."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "V�deck� centrum v �ernogolovce, Moskevsk� region, Rusko"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(vyberte si pros�m servery ve va�em geografick�m regionu)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylor College of Medicine, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "University of Oklahoma, Norman, Oklahoma, USA"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Vyberte si �asov� p�smo:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "University of Regina, Regina, Saskatchewan, Kanada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr ""
-"Za�n�te klepnut�m na tla��tko Dal��, nebo pr�vodce ukon�ete klepnut�m na "
-"tla��tko Zru�it"
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Trinity College, Dublin, Irsko"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, Francie"
+msgid "Singapore"
+msgstr "Singapur"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Universite de Limoges, Francie"
+msgid "Secondary Time Server:"
+msgstr "Sekund�rn� �asov� server:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
+msgstr "Zkusit op�t"
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
-msgstr "Vyberte ze seznamu prim�rn� a sekund�rn� server."
+msgid "The Chinese University of Hong Kong"
+msgstr "The Chinese University of Hong Kong"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(vyberte si pros�m servery ve va�em geografick�m regionu)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV College of Engineering, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, Francie"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante/�pan�lsko)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Canadian Meteorological Centre, Dorval, Quebec, Kanada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "National Research Council of Canada, Ottawa, Ontario, Kanada"
 
+#: ../time_wizard/time.wiz_.c:18
+msgid "Select a primary and secondary server from the list."
+msgstr "Vyberte ze seznamu prim�rn� a sekund�rn� server."
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "University of Manchester, Manchester, Anglie"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, Francie"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr " - nen� dostupn� vn�j�� s��"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Inc., Seoul, Korea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Pokud nen� �asov� server okam�it� dostupn� (kv�li probl�m�m se s�t�), m��ete "
-"�ekat tak 30 sekund."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "V�deck� centrum v �ernogolovce, Moskevsk� region, Rusko"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Testov�n� dostupnosti �asov�ch server�"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washington State University Tri-Cities, Richland, Wa"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "University of Oslo, Norsko"
+msgid "University of Adelaide, South Australia"
+msgstr "University of Adelaide, Ji�n� Austr�lie"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "Computer Science Department, University of Wisconsin-Madison"
+msgid "Time zone:"
+msgstr "�asov� p�smo:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Trinity College, Dublin, Irsko"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "�asov� server neodpov�d�. P���inou m��e b�t:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "University of Regina, Regina, Saskatchewan, Kanada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Universite de Caen, Francie"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "�asov� server neodpov�d�. P���inou m��e b�t:"
+msgid "- other reasons..."
+msgstr " - dal�� d�vody..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Swiss Fed. Inst. of Technology"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Pokud nen� �asov� server okam�it� dostupn� (kv�li probl�m�m se s�t�), m��ete "
+"�ekat tak 30 sekund."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Universite de Caen, Francie"
+msgid "WARNING"
+msgstr "VAROV�N�"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, Francie"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, Francie"
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
-msgstr ""
-"Tento pr�vodce v�m pom��e nastavit slu�bu �asov�ho serveru, bu� lok�ln� nebo "
-"synchronizovan� s extern�m �asov�m serverem."
+msgid "Your server can now act as a time server for your local network."
+msgstr "Server nyn� m��e fungovat jako �asov� server pro va�i lok�ln� s��."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "VAROV�N�"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Fukuoka university, Fukuoka, Japonsko"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Inc., Seoul, Korea"
+msgid "Time Servers"
+msgstr "�asov� servery"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "University of Oklahoma, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Swiss Fed. Inst. of Technology"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "The Chinese University of Hong Kong"
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Tento pr�vodce v�m pom��e nastavit slu�bu �asov�ho serveru, bu� lok�ln� nebo "
+"synchronizovan� s extern�m �asov�m serverem."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr " - dal�� d�vody..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, Francie"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr " - neexistuj�c� �asov� servery"
+msgid "Testing the time servers availability"
+msgstr "Testov�n� dostupnosti �asov�ch server�"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "�asov� p�smo:"
+msgid "Save config without test"
+msgstr "Ulo�it nastaven� bez testu"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Dept. Computer Science, Strathclyde University, Glasgow, Skotsko"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"M��ete se op�t pokusit kontaktovat �asov� servery nebo ulo�it nastaven� bez "
-"nastaven� aktu�ln�ho �asu."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT Information Systems, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Prim�rn� �asov� server:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylor College of Medicine, Houston, Tx"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Zkusit op�t"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn State University, University Park, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
+msgstr " - neexistuj�c� �asov� servery"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Nastaven� �asov�ho serveru ulo�eno"
+msgid "Time wizard"
+msgstr "Pr�vodce pro �as"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Universite Paris Sud, Francie"
+msgid "University of Oslo, Norway"
+msgstr "University of Oslo, Norsko"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr "Tento pr�vodce v�m pom��e nastavit �asov� server pro va�i s��."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Ulo�it nastaven� bez testu"
+msgid "- no outside network"
+msgstr " - nen� dostupn� vn�j�� s��"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapur"
+msgid "Primary Time Server:"
+msgstr "Prim�rn� �asov� server:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Fukuoka university, Fukuoka, Japonsko"
+msgid "Time server configuration saved"
+msgstr "Nastaven� �asov�ho serveru ulo�eno"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr ""
+"Za�n�te klepnut�m na tla��tko Dal��, nebo pr�vodce ukon�ete klepnut�m na "
+"tla��tko Zru�it"
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante/�pan�lsko)"
+msgid "Choose a time zone:"
+msgstr "Vyberte si �asov� p�smo:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Pr�vodce pro �as"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr ""
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr "Computer Science Department, University of Wisconsin-Madison"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid ""
+"Your server can act as a Web Server toward your internal network (intranet) "
+"and as a Web Server for the Internet."
 msgstr ""
-"Pokud nechcete aktivovat ��dn� webov� server, neza�krt�vejte ��dn� pol��ko."
+"V� server m��e plnit funkci webov�ho serveru pro va�i intern� s�� "
+"(Intranet) a webov�ho serveru pro Internet."
 
 #: ../web_wizard/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr "Pr�vodce �sp�n� nastavil v� webov� server pro Internet/Intranet"
+#, fuzzy
+msgid "Internet web server:"
+msgstr "Webov� server pro Internet:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
-"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�eho "
-"webov�ho serveru"
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Pr�vodce pro WWW"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
+msgstr ""
 
-#: ../web_wizard/web.wiz_.c:11
-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/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Povolit webov� server pro Intranet"
 
 #: ../web_wizard/web.wiz_.c:12
-#, fuzzy
-msgid "Internet web server:"
-msgstr "Webov� server pro Internet:"
+msgid "Configuring the Web Server"
+msgstr "Nastavuji webov� server"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Povolit webov� server pro Intranet"
+msgid "Web Server"
+msgstr "Webov� server"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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/web.wiz_.c:15
 #, fuzzy
 msgid "Enable the Web Server for the Internet"
 msgstr "Povolit webov� server pro Intranet"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Adres��:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "Vyberte po�adovan� druh webov� slu�by, kterou chcete aktivovat:"
+#, fuzzy
+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/web.wiz_.c:17
-msgid "document root:"
-msgstr ""
+msgid "Web wizard"
+msgstr "Pr�vodce pro WWW"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Webov� server pro Intranet:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "Nastavuji webov� server"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Webov� 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."
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Pr�vodce nastaven�m webov�ho serveru"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "Vyberte po�adovan� druh webov� slu�by, kterou chcete aktivovat:"
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr ""
+"Pr�vodce shrom�dil n�sleduj�c� parametry pot�ebn� pro nastaven� va�eho "
+"webov�ho serveru"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr "Pr�vodce �sp�n� nastavil v� webov� server pro Internet/Intranet"
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr ""
+msgid "Web Server Configuration Wizard"
+msgstr "Pr�vodce nastaven�m webov�ho serveru"
 
 msgid "Cancel"
 msgstr "Zru�it"
diff --git a/po/cy.po b/po/cy.po
index f79588b3..55af0ee0 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-09-22 15:10-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -13,230 +13,218 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-14\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Mae cleient i'ch rhwydwaith lleol yn beiriant wedi ei gysylltu �'r "
-"rhwydwaith gyda'i enw a'i rhif IP ei hun."
+"Gwasgwch nesaf i ffurfweddu'r paramedrau hyn nawr, neu Diddymu i adael y "
+"dewin."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "Nid yw hwn yn gyfeiriad dilys...gwasgwch nesaf i barhau"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "Iawn"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"Gwasgwch nesaf os ydych am newid y gwerth sy'n bodoli eisoes, neu n�l i "
-"gywiro eich dewis."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Llongyfarchiadau"
+"Os ydych yn dewis ffurfweddi nawr, byddwch yn parhau'n awtomatig gyda'r "
+"ffurfweddiad Cleient"
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "Dewin Cleient DNS"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr "Gwasgwch nesaf i gychwyn, neu Diddymu i adael y dewin."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"Bydd eich cleient ar y rhwydwaith yn cael ei adnabod drwy ei enw, fel yn "
+"enwcleient.cwmni.net. Rhaid i bob peiriant ar eich rhwydwaith gael cyfeiriad "
+"IP unigryw, yn �l y gystrawen collnod arferol"
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "Casglodd y dewin y paramedrau canlynol sy'n angenrheidiol i ychwanegu "
 "cleient i'ch rhwydwaith:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Gwall system, heb ffurfweddu dim"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "Enw cleient"
+msgid "The wizard successfully added the client."
+msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Ychwanegu cleient newydd i'ch rhwydwaith"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(does dim angen teipio'r parth ar �l yr enw)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Ffurfweddu"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"Sylwer bod yn rhaid i'r rhif IP a'r enw cleient fod yn unigryw o fewn y "
+"rhwydwaith."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Enw cleient:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Rhybudd"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(does dim angen teipio'r parth ar �l yr enw)"
+msgid "Name of the machine:"
+msgstr "Enw'r peiriant"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Os ydych yn dewis ffurfweddi nawr, byddwch yn parhau'n awtomatig gyda'r "
-"ffurfweddiad Cleient"
+msgid "Adding a new client to your network"
+msgstr "Ychwanegu cleient newydd i'ch rhwydwaith"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Bydd y gwasanaethwr yn defnyddio'r wybodaeth rydych wedi ei rhoi yma i wneud "
-"enw'r cleient ar gael ar gyfer peiriannau eraill ar eich rhwydwaith."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Gwall system, heb ffurfweddu dim"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr ""
-"Rydych wedi rhoi enw peiriant neu rif IP sy'n cael ei ddefnyddio eisoes. "
+msgid "Client identification:"
+msgstr "Enw cleient:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr ""
+"Bydd y dewin yn eich cynorthwyo i ychwanegu cleient newydd yn eich DNS."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "Enw'r peiriant"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "Iawn"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"Bydd eich cleient ar y rhwydwaith yn cael ei adnabod drwy ei enw, fel yn "
-"enwcleient.cwmni.net. Rhaid i bob peiriant ar eich rhwydwaith gael cyfeiriad "
-"IP unigryw, yn �l y gystrawen collnod arferol"
+"Mae cleient i'ch rhwydwaith lleol yn beiriant wedi ei gysylltu �'r "
+"rhwydwaith gyda'i enw a'i rhif IP ei hun."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"Sylwer bod yn rhaid i'r rhif IP a'r enw cleient fod yn unigryw o fewn y "
-"rhwydwaith."
+"I dderbyn y gwerthoedd hyn, ac ychwanegu cleient, cliciwch y botwm Nesaf neu "
+"ddefnyddio botwm N�l i'w cywiro."
 
-#: ../client_wizard/client.wiz_.c:21
-#, fuzzy
-msgid "DNS Wizard (add client)"
-msgstr "Dewin DNS"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "Nid yw hwn yn gyfeiriad dilys...gwasgwch nesaf i barhau"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Rhybudd\\nRydych yn dhcp, efallai na fydd y gwasanaethwr yn gweithio gyda'ch "
-"ffufrweddiad."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "IP Cleient:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "Rhif IP'r peiriant:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Ffurfweddu"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Gadael"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "Rhaid i chi fod yn wraidd i ddefnyddio'r dewin hwn"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Rhwydwaith heb ei ffurfweddu eto"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
 msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ychwanegu cleient newydd yn eich DNS."
+"Rydych wedi rhoi enw peiriant neu rif IP sy'n cael ei ddefnyddio eisoes. "
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+#, fuzzy
+msgid "DNS Wizard (add client)"
+msgstr "Dewin DNS"
+
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Gadael"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"I dderbyn y gwerthoedd hyn, ac ychwanegu cleient, cliciwch y botwm Nesaf neu "
-"ddefnyddio botwm N�l i'w cywiro."
+"Rhybudd\\nRydych yn dhcp, efallai na fydd y gwasanaethwr yn gweithio gyda'ch "
+"ffufrweddiad."
 
 #: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Gwasgwch nesaf i gychwyn, neu Diddymu i adael y dewin."
-
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Gwasgwch nesaf i ffurfweddu'r paramedrau hyn nawr, neu Diddymu i adael y "
-"dewin."
+"Bydd y gwasanaethwr yn defnyddio'r wybodaeth rydych wedi ei rhoi yma i wneud "
+"enw'r cleient ar gael ar gyfer peiriannau eraill ar eich rhwydwaith."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "Rhaid i chi fod yn wraidd i ddefnyddio'r dewin hwn"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Llongyfarchiadau"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "Rhif IP'r peiriant:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "IP Cleient:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Gwasgwch nesaf os ydych am newid y gwerth sy'n bodoli eisoes, neu n�l i "
+"gywiro eich dewis."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
 msgstr ""
 "Rhaid ffurfweddi'r paramedrau rhwydwaith sylfaenol cyn cychwyn y dewin."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Rhybudd"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Dewin Ffurfweddu"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "Gwasanaethwr Cronfa ddata MySQL"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Rhowch enw defnyddiwr a chyfrinair i ychwanegu defnyddiwr"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "Enw cleient"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Ychwaneiad defnyddiwr"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -244,76 +232,68 @@ msgstr ""
 "I dderbyn y gwerth hwn ac i ffurfweddu eich gwasanaethwr, cliciwch \\qIawn"
 "\\q neu ddefnyddio'r botwm N�l i'w cywiro."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Teipiwch gyfrinair ar gyfer y defnyddiwr gwraidd"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "Ffurfweddu Gwasanaethwr Cronfa Ddata MySQL"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "Mae'r dewin wedi ffurfweddu eich Gwasanaethwr Cronfa Ddata MySQL"
+msgid "Confirm"
+msgstr "Iawn"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Gwasanaethwr Cronfa Ddata"
+msgid "Password:"
+msgstr "Cyfrinair:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Cyfrinair Gwraidd:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "Mae'r dewin wedi ffurfweddu eich Gwasanaethwr Cronfa Ddata MySQL"
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Iawn"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "Rhaid i chi fod yn wraidd i wneud hyn..."
+msgid "Username:"
+msgstr "Enw Defnyddiwr:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Cyfrinair:"
+msgid "Add"
+msgstr "Ychwanegu"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Os ydych yn dewis ffurfweddu nawr, byddwch yn parhau'n awtomatig i "
-"ffurfweddu'r Cronfa Ddata MySQL"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "Rhaid i chi fod yn wraidd i wneud hyn..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu eich Gwasanaethwr Cronfa Ddata "
-"MySQL ar gyfer eich rhwydwaith."
+msgid "Database Server"
+msgstr "Gwasanaethwr Cronfa Ddata"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Enw Defnyddiwr:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Nodyn: Bydd gan y defnyddiwr hwn pob hawl"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Ychwanegu"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Teipiwch gyfrinair ar gyfer y defnyddiwr gwraidd"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "Dewin Cronfa Ddata MySQL"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "Ffurfweddu Gwasanaethwr Cronfa Ddata MySQL"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Dewin Ffurfweddu"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr "I redeg y gwasanaethwr, rhaid i chi yn gyntaf bennu cyfrinair gwraidd"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "Dewin Cronfa Ddata MySQL"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Cyfrinair Gwraidd:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "Gwasanaethwr Cronfa ddata MySQL"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -321,34 +301,59 @@ msgstr ""
 "Casglodd y dewin y paramedrau canlynol angenrheidiol i ffurfweddu eich "
 "Gwasanaethwr Cronfa Ddata MySQL"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
-msgstr "Mae cyfeiriadau IP yn rhestr o bedwar rhif llai na 256 rhwng atalnodau"
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
+msgstr ""
+"Bydd y dewin yn eich cynorthwyo i ffurfweddu eich Gwasanaethwr Cronfa Ddata "
+"MySQL ar gyfer eich rhwydwaith."
+
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Rhowch enw defnyddiwr a chyfrinair i ychwanegu defnyddiwr"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../db_wizard/db.wiz_.c:27
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
+msgstr ""
+"Os ydych yn dewis ffurfweddu nawr, byddwch yn parhau'n awtomatig i "
+"ffurfweddu'r Cronfa Ddata MySQL"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr ""
+"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer eich "
+"gwasanaeth DHCP:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Ei drwsio"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
-"Dewiswch ystod cyfeiriadau dynodwyd i'r orsaf waith gan y gwasanaeth DHCP; "
-"oni bai fod gennych anghenion arbennig, bydd modd i chi dderbyn y gwerthoedd "
-"sy'n cael eu cynnig."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Cyfeiriad IP Uchaf"
+msgid "Lowest IP Address:"
+msgstr "Cyfiriad IP Isaf:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "Ystod y cyfeiriadau defnyddir gan dhcp"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr "Mae cyfeiriadau IP yn rhestr o bedwar rhif llai na 256 rhwng atalnodau"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -356,99 +361,85 @@ msgstr ""
 "I dderbyn y gwerth hwn ac i ffurfweddu eich gwasanaethwr, cliciwch  y botwm "
 "Nesaf neu ddefnyddio'r botwm N�l i'w cywiro."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"Mae DHCP yn wasanaeth sy'n dynodi'n awtomatig cyfeiriadau rhwydweithiol i'ch "
-"gorsaf waith"
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "Dewin DHCP"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Ei drwsio"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr ""
+"Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau DHCP eich "
+"gwasanaethwr."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "Ystod y cyfeiriadau defnyddir gan dhcp"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gwasanaethwr."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau DHCP eich "
-"gwasanaethwr."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer eich "
-"gwasanaeth DHCP:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Cyfiriad IP Isaf:"
+"Dewiswch ystod cyfeiriadau dynodwyd i'r orsaf waith gan y gwasanaeth DHCP; "
+"oni bai fod gennych anghenion arbennig, bydd modd i chi dderbyn y gwerthoedd "
+"sy'n cael eu cynnig."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "Dewin Ffurfweddiad DHCP"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "Nid yw'r amrediad IP rhoddwyd yn gyrrwr"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
+"Mae DHCP yn wasanaeth sy'n dynodi'n awtomatig cyfeiriadau rhwydweithiol i'ch "
+"gorsaf waith"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "Nid yw'r amrediad IP rhoddwyd yn gyrrwr"
+msgid "Highest IP Address:"
+msgstr "Cyfeiriad IP Uchaf"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
-msgstr "Dewin DHCP"
+msgid "DHCP Configuration Wizard"
+msgstr "Dewin Ffurfweddiad DHCP"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "Ffurfweddu'r Gwasanaethwr DHCP"
 
-#: ../dns_wizard/dns.wiz_.c:2
-#, fuzzy
-msgid "DNS Wizard (configuration)"
-msgstr "Dewin Ffurfweddu DNS"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer eich "
-"gwasanaeth DNS:"
+"Mae modd derbyn eich gosodiad, ond ni fydd modd i chi adnabod peiriannau tu "
+"allan i'ch rhwydwaith lleol."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr ""
+"Cliciwch nesaf i adael y gwerthoedd yn wag, neu ewch yn �l a chynnig gwerth."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Cyfeiriad DNS Cynradd:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "Ffurfweddu'r Gwasanaethwr DHCP"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Cyfeiriad DNS Eilradd:"
+msgid "DNS Configuration Wizard"
+msgstr "Dewin Ffurfweddu DNS"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "Cyfeiriadau Gwasanaethwr DNS"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Dydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau DNS ar gyfer eich "
-"gwasanaethwr. Bydd y ffurfweddiad yn darparu gwasanaeth DNS lleol ar gyfer "
-"enwau cyfrifiaduron lleol, gyda cheisiadau allanol yn cael eu hanfon ymlaen "
-"i DNS allanol."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -460,44 +451,56 @@ msgstr ""
 "gwasanaethwr DNS cynradd ac eilradd; fel rheol mae'r cyfeiriadau'n cael eu "
 "darparu gan eich darparwr Rhyngrwyd."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr ""
+"Llwyddiant! Mae'r dewin wedi ffurfweddu'r gwasanaethau DNS ar gyfer eich "
+"gwasanaethwr."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Rydych wedi rhoi cyfeiriad gwag ar gyfer y gwasanaethwr DNS."
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
-"Cliciwch nesaf i adael y gwerthoedd yn wag, neu ewch yn �l a chynnig gwerth."
-
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "Dewin Ffurfweddu DNS"
+"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer eich "
+"gwasanaeth DNS:"
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Cyfeiriad DNS Cynradd:"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
+msgstr "Cyfeiriadau Gwasanaethwr DNS"
 
-#: ../dns_wizard/dns.wiz_.c:20
+#: ../dns_wizard/dns.wiz_.c:17
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Mae modd derbyn eich gosodiad, ond ni fydd modd i chi adnabod peiriannau tu "
-"allan i'ch rhwydwaith lleol."
+"DNS (Domain Name Server) yw'r gwasanaeth sy'n rhoi cyfathrebiad i beiriant "
+"sydd ag enw gwestai rhyngrwyd"
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Cyfeiriad DNS Eilradd:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"DNS (Domain Name Server) yw'r gwasanaeth sy'n rhoi cyfathrebiad i beiriant "
-"sydd ag enw gwestai rhyngrwyd"
+"Dydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau DNS ar gyfer eich "
+"gwasanaethwr. Bydd y ffurfweddiad yn darparu gwasanaeth DNS lleol ar gyfer "
+"enwau cyfrifiaduron lleol, gyda cheisiadau allanol yn cael eu hanfon ymlaen "
+"i DNS allanol."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr ""
-"Llwyddiant! Mae'r dewin wedi ffurfweddu'r gwasanaethau DNS ar gyfer eich "
-"gwasanaethwr."
+#, fuzzy
+msgid "DNS Wizard (configuration)"
+msgstr "Dewin Ffurfweddu DNS"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -508,62 +511,69 @@ msgid "Please select a wizard"
 msgstr "Dewiswch ddewin"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Dyfais"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "Canolig - gwe, ftp a ssh yn cael eu harddangos i'r byd"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr "Cryf - dim golwg allanol, defnyddwyr wedi eu cyfyngu i'r we"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Mae rhywbeth erchyll wedi digwydd"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Dewin Ffurfweddu Mur Cadarn"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+"ffurfweddu eich mur cadarn:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr ""
+"Mae'r mur cadarn yn amddiffyn eich rhwydwaith mewnol rhag mynediad heb "
+"ganiat�d o'r We."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "Dyfais Rhwydwaith y Rhyngrwyd:"
+msgid "Device"
+msgstr "Dyfais"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Ei Drwsio"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Dewin Mur Cadarn"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Dim - Dim diogelwch"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "Lefel Diogelwch:"
+msgid "Internet Network Device:"
+msgstr "Dyfais Rhwydwaith y Rhyngrwyd:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Dewin Mur Cadarn"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Mae modd ffurfweddu eich mur cadarn i gynnig amrywiaeth o ddiogelwch; "
+"dewiswch y lefel sy'n cyfateb i'ch anghenion. Os nad ydych yn siwr, y lefel "
+"Canolig sy'n fwyaf addas fel arfer."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaethwr mur cadarn."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "Canolig - gwe, ftp a ssh yn cael eu harddangos i'r byd"
+msgid "The device name is not correct"
+msgstr "Nid yw enw'r ddyfais yn gyrwir"
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "Lefel Dioglewch"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Ei Drwsio"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Gadael"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Dewin Ffurfweddu Mur Cadarn"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "Nid yw enw'r ddyfais yn gyrwir"
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -571,94 +581,107 @@ msgstr ""
 "Mae'r mur cadarn angen gwybod sut mae eich gwasanaethwr wedi ei gysylltu �'r "
 "Rhyngrwyd; dewiswch ddyfais rydych yn ei ddefnyddio ar gyfer cyswllt allanol."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr ""
-"Mae'r mur cadarn yn amddiffyn eich rhwydwaith mewnol rhag mynediad heb "
-"ganiat�d o'r We."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "Lefel Dioglewch"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "Ffurfweddu'r Mur Cadarn"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Mae rhywbeth erchyll wedi digwydd"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "Dyfais Rhwydwaith Mur Cadarn"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Dim - Dim diogelwch"
+msgid "The wizard successfully configured your server firewall."
+msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaethwr mur cadarn."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
+msgid "Configuring the Firewall"
+msgstr "Ffurfweddu'r Mur Cadarn"
+
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Gadael"
+
+#: ../firewall_wizard/firewall.wiz_.c:24
+#, fuzzy
 msgid "This wizard will help you configuring your server firewall."
 msgstr ""
 "Bydd y dewin yn eich cynorthwyo i ffurfweddu mur cadarn eich gwasanaethwr."
 
-#: ../firewall_wizard/firewall.wiz_.c:23
+#: ../firewall_wizard/firewall.wiz_.c:25
 msgid "Low - Light filtering, standard services available"
 msgstr "Isel - hidlo ysgafn, gwasanaethau safonol ar gael"
 
-#: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "Dyfais Rhwydwaith Mur Cadarn"
+#: ../firewall_wizard/firewall.wiz_.c:26
+msgid "Protection Level:"
+msgstr "Lefel Diogelwch:"
 
-#: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
-"ffurfweddu eich mur cadarn:"
+"Bydd y dewin yn eich cynorthwyo i ffurfweddu'r Gwasanaethwr FTP ar gyfer "
+"eich rhwydwaith."
 
-#: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Mae modd ffurfweddu eich mur cadarn i gynnig amrywiaeth o ddiogelwch; "
-"dewiswch y lefel sy'n cyfateb i'ch anghenion. Os nad ydych yn siwr, y lefel "
-"Canolig sy'n fwyaf addas fel arfer."
+#: ../ftp_wizard/ftp.wiz_.c:3
+#, fuzzy
+msgid "Public directory:"
+msgstr "Cyfeiriadur:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "Dewiswch y matho o wasanaeth FTP rydych am ei gychwyn:"
+#: ../ftp_wizard/ftp.wiz_.c:4
+msgid "Internet FTP Server:"
+msgstr "Gwasanaeth FTP y Rhyngrwyd:"
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "Galluogi'r Gwasanaethwr FTP ar gyfer y Fewnrwyd"
 
 #: ../ftp_wizard/ftp.wiz_.c:7
-msgid "Internet FTP Server:"
-msgstr "Gwasanaeth FTP y Rhyngrwyd:"
+msgid "FTP wizard"
+msgstr "Dewin FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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 gwasanaethwr weithredu fel Gwasanaethwr FTP ar gyfer eich "
-"rhwydwaith mewnol (mewnrwyd) neu fel Gwasanaethwr FTP ar gyfer y Rhyngrwyd."
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "Gwasanaethwr FTP"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr ""
+"Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gwasanaethwr FTP."
+
+#: ../ftp_wizard/ftp.wiz_.c:12
+msgid "Configuring the FTP Server"
+msgstr "Ffurfweddu'r Gwasanaethwr FTP"
+
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "Galluogi'r Gwasanaethwr FTP ar gyfer y Rhyngrwyd"
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "Gwasanaethwr FTP Mewnrwyd"
+
+#: ../ftp_wizard/ftp.wiz_.c:15
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr FTP Mewnrwyd/"
 "Rhyngrwyd"
 
-#: ../ftp_wizard/ftp.wiz_.c:12
-#, fuzzy
-msgid "Public directory:"
-msgstr "Cyfeiriadur:"
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "Dewiswch y matho o wasanaeth FTP rydych am ei gychwyn:"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "Galluogi'r Gwasanaethwr FTP ar gyfer y Fewnrwyd"
-
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
@@ -666,62 +689,36 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gwasanaethwr FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "Dewin FTP"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
 msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu'r Gwasanaethwr FTP ar gyfer "
-"eich rhwydwaith."
 
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "Galluogi'r Gwasanaethwr FTP ar gyfer y Rhyngrwyd"
-
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "Gwasanaethwr FTP Mewnrwyd"
-
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "Dewin Ffurfweddu Gwasanaethwr FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "Ffurfweddu'r Gwasanaethwr FTP"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
 msgstr ""
-"Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gwasanaethwr FTP."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "Gwasanaethwr FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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 gwasanaethwr weithredu fel Gwasanaethwr FTP ar gyfer eich "
+"rhwydwaith mewnol (mewnrwyd) neu fel Gwasanaethwr FTP ar gyfer y Rhyngrwyd."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Enw Gwasanaethwr Newyddion:"
+msgid "Polling Interval:"
+msgstr "Cyfnod Gofyn:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "Croeso i'r Dewin Newyddion"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Cyfnod Gofyn (Oriau):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "Gwasanaethwr Newyddion"
+msgid "Polling Period"
+msgstr "Cyfnod Gofyn"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -731,29 +728,32 @@ msgstr ""
 "Newyddion Rhyngrwyd diweddaraf; mae'r cyfnod gofyn yn gosod y cyfnod rhwng "
 "dau ofyniad dilynol."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+"Bydd y dewin yn eich cynorthwyo i ffurfweddu'r gwasanaethau Newyddion "
+"Rhyngrwyd ar gyfer eich rhwydwaith."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "Dewin Newyddion"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "Nid yw'r cyfnod galw'n gywir"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "Nid yw enw'r gwasanaethwr newyddion yn gywir"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Cyfnod Gofyn:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Rhaid i enw'r gwesteiwyr rhyngrwyd fod ar ffurf  \\qgwestai.parth.mathparth"
-"\\q; e.e. os eich darparwr yw \\qdarparwr.com\\q, fel rheol y gwasanaethwr "
-"newyddion rhyngrwyd yw \\qnewyddion.darparwr.com\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Cyfnod Gofyn"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Ffurfweddu'r Gwasanaethwr Newyddion:"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -761,15 +761,7 @@ msgstr ""
 "Gan ddibynnu ar y math o gysylltiad rhyngrwyd sydd gennych, mae cyfnod galw "
 "priodol yn medru newid rhwng 6 a 24 awr."
 
-#: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "Nid yw'r cyfnod galw'n gywir"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "Gwasanaethwr Newyddion"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -778,7 +770,13 @@ msgstr ""
 "Rhyngrwyd i'ch rhwydwaith; fel arfer mae'r enw'n cael ei ddarparu gan eich "
 "darparwr."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr ""
+"Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaeth Newyddion Rhyngrwyd"
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -786,31 +784,65 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gwasanaeth Newyddion Rhyngrwyd:"
 
-#: ../news_wizard/news.wiz_.c:22
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Cyfnod Gofyn (Oriau):"
+
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Enw Gwasanaethwr Newyddion:"
+
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu'r gwasanaethau Newyddion "
-"Rhyngrwyd ar gyfer eich rhwydwaith."
+"Rhaid i enw'r gwesteiwyr rhyngrwyd fod ar ffurf  \\qgwestai.parth.mathparth"
+"\\q; e.e. os eich darparwr yw \\qdarparwr.com\\q, fel rheol y gwasanaethwr "
+"newyddion rhyngrwyd yw \\qnewyddion.darparwr.com\\q."
 
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Ffurfweddu'r Gwasanaethwr Newyddion:"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "Croeso i'r Dewin Newyddion"
 
 #: ../news_wizard/news.wiz_.c:24
+msgid "News Server"
+msgstr "Gwasanaethwr Newyddion"
+
+#: ../news_wizard/news.wiz_.c:25
+msgid "News Server:"
+msgstr "Gwasanaethwr Newyddion"
+
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Rhwydwaith awdurdodedig:"
+
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Rheoli Mynediad"
+
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
-"The wizard successfully configured your Internet News service of your server."
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr ""
-"Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaeth Newyddion Rhyngrwyd"
+"Bydd mynediad yn cael ei ganiat�u i westeion ar y rhwydwaith. Dyma'r "
+"wybodaeth ganfyddwyd am eich rhwydwaith lleol bresennol, mae modd ei newid "
+"os oes angen."
 
-#: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "Dewin Newyddion"
+#: ../nfs_wizard/nfs.wiz_.c:4
+#, fuzzy
+msgid "Access :"
+msgstr "Rheoli Mynediad:"
+
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
+msgstr "Rhwydwaith Lleol - mynediad ar gyfer y rhwydwaith lleol (argymhellir)"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
 msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
+"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 ""
@@ -818,115 +850,124 @@ msgstr ""
 "Rhwydwaith Leol sydd fel arfer yn fwyaf addas. Nid yw'r Pob lefel yn gwbl "
 "ddiogel."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
+msgstr ""
+"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+"ffurfweddu Samba."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "Dewin Ffurfweddu Gwasanaethwr NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "Dewin NFS"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
+msgstr "Caniat�u mynediad i'r rhwydwaith lleol"
+
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "Gwasanaethwr NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr NFS"
-
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "Pob - Dim cyfyngiad mynediad"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
-msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+#: ../nfs_wizard/nfs.wiz_.c:18
+msgid "Netmask :"
 msgstr ""
-"Bydd mynediad yn cael ei ganiat�u i westeion ar y rhwydwaith. Dyma'r "
-"wybodaeth ganfyddwyd am eich rhwydwaith lleol bresennol, mae modd ei newid "
-"os oes angen."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Rheoli Mynediad"
+#: ../nfs_wizard/nfs.wiz_.c:19
+msgid "Directory:"
+msgstr "Cyfeiriadur:"
 
-#: ../nfs_wizard/nfs.wiz_.c:11
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 msgid "This wizard will help you configuring the NFS Server for your network."
 msgstr ""
 "Bydd y dewin yn eich cynorthwyo i ffurfweddu eich Gwasanaethwr NFS ar gyfer "
 "eich rhwydwaith."
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
-msgstr "Rhwydwaith Lleol - mynediad ar gyfer y rhwydwaith lleol (argymhellir)"
-
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "Rhwydwaith awdurdodedig:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
-msgstr "Caniat�u mynediad i'r rhwydwaith lleol"
+#: ../nfs_wizard/nfs.wiz_.c:21
+msgid "The wizard successfully configured your NFS Server"
+msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:2
 #, fuzzy
-msgid "The wizard collected the following parameters."
+msgid "There seems to be a problem..."
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
-"ffurfweddu Samba."
+"Mae'n ymddangos bod yna broblem... ewch i ofyn i'r dyn mawr lawr grisiau"
 
-#: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "Rheoli Mynediad:"
+#: ../postfix_wizard/postfix.wiz_.c:3
+msgid "Internet Mail Gateway"
+msgstr "Port E-bost Rhyngrwyd"
 
-#: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr "Cyfeiriadur:"
+#: ../postfix_wizard/postfix.wiz_.c:5
+msgid "Outgoing Mail Address"
+msgstr "Cyfeiriad E-bost Allfynd"
 
-#: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "Dewin NFS"
+#: ../postfix_wizard/postfix.wiz_.c:6
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr ""
+"Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaeth E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/postfix.wiz_.c:1
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "Gweithredu!"
 
-#: ../postfix_wizard/postfix.wiz_.c:3
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
-"Mae modd dewis y math o gyfeiriad fydd e-bost allfynd yn ei ddangos ym maes "
-"\\qOddi wrth:\\q a \\qAteb i\\q."
+"Rhaid i hyn gael ei ddewis yn gyson gyda'r cyfeiriad sy'n cael ei ddefnyddio "
+"ar gyfer e-bost sy'n cyrraedd."
 
-#: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "Ffurfweddu E-bost Rhyngrwyd"
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:11
+msgid "You entered an empty address for the mail gateway."
+msgstr "Rydych wedi rhoi cyfeiriad gwag ar gyfer porth e-bost."
+
+#: ../postfix_wizard/postfix.wiz_.c:12
+msgid "Internet Mail Configuration Wizard"
+msgstr "Dewin Ffurfweddu E-bost Rhyngrwyd"
+
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Dewin Postfix"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Enw GwasanaethwrE-bost::"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"Bydd eich gwasanaethwr yn anfon yr e-bost allfynd drwy borth e-bost, fgan "
-"ofalu am y trosglwyddiad terfynol."
+"Mae modd derbyn eich dewis, ond ni fydd yn caniat�u i chi anfon e-bost y tu "
+"allan i'ch rhwydwaith lleol. Cliciwch nesaf i barhau, neu n�l i gynnig "
+"gwerth."
 
-#: ../postfix_wizard/postfix.wiz_.c:8
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
@@ -934,28 +975,15 @@ msgstr ""
 "Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau E-bost Rhyngrwyd "
 "ar gyfer eich rhwydwaith."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Cyfeiriad E-bost Allfynd"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr ""
-"Rhaid i hyn gael ei ddewis yn gyson gyda'r cyfeiriad sy'n cael ei ddefnyddio "
-"ar gyfer e-bost sy'n cyrraedd."
-
-#: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
-"Mae'n ymddangos bod yna broblem... ewch i ofyn i'r dyn mawr lawr grisiau"
-
-#: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "Ffugio gwael!"
+"Bydd eich gwasanaethwr yn anfon yr e-bost allfynd drwy borth e-bost, fgan "
+"ofalu am y trosglwyddiad terfynol."
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -963,11 +991,7 @@ msgstr ""
 "Os ydych yn dewis ffurfweddu nawr, byddwch yn parhau'n awtomatig gyda  "
 "ffurfweddiad POSTFIX"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Ffurf y Cyfeiriad"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -977,11 +1001,19 @@ msgstr ""
 "\\q; e.e. os eich darparwr yw \\qdarparwr.com\\q, fel rheol y gwasanaethwr e-"
 "bost rhyngrwyd yw \\qnewyddion.darparwr.com\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Dewin Ffurfweddu E-bost Rhyngrwyd"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Mae modd dewis y math o gyfeiriad fydd e-bost allfynd yn ei ddangos ym maes "
+"\\qOddi wrth:\\q a \\qAteb i\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "Ffurfweddu E-bost Rhyngrwyd"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -989,70 +1021,56 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gwasanaeth E-bost Rhyngrwyd:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
+#: ../postfix_wizard/postfix.wiz_.c:26
+msgid "Masquerade not good!"
+msgstr "Ffugio gwael!"
+
+#: ../postfix_wizard/postfix.wiz_.c:28
+msgid "Form of the Address"
+msgstr "Ffurf y Cyfeiriad"
+
+#: ../postfix_wizard/postfix.wiz_.c:29
 msgid "Mail Address:"
 msgstr "Cyfeiriad E-bost:"
 
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Rydych wedi rhoi cyfeiriad gwag ar gyfer porth e-bost."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaeth E-bost Rhyngrwyd"
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Port E-bost Rhyngrwyd"
-
-#: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Enw GwasanaethwrE-bost::"
+"Os ydych yn dewis ffurfweddu nawr, byddwch yn parhau'n awtomatig gyda  "
+"ffurfweddiad Dirprwyol."
 
-#: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"Mae modd derbyn eich dewis, ond ni fydd yn caniat�u i chi anfon e-bost y tu "
-"allan i'ch rhwydwaith lleol. Cliciwch nesaf i barhau, neu n�l i gynnig "
-"gwerth."
+#: ../proxy_wizard/proxy.wiz_.c:4
+msgid "Proxy Configuration Wizard"
+msgstr "Dewin Ffurfweddu Dirprwy"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../proxy_wizard/proxy.wiz_.c:8
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "Rhaid dewis porth mwy na 1024 a llai na 65535"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
-msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
-msgstr ""
-"Storfa Cof yw'r hyn o RAM sydd wedi ei neilltuo i weithrediadau cof y storfa "
-"(sylwch fod y defnydd o gof ar gyfer y broses squid cyfan yn fwy)."
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Rhaid rhedeg y Dewin fel Gwraidd"
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Porth dirprwyol:"
+#: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Rheoli Mynediad:"
 
-#: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaethwr dirprwyol."
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "Ffurfweddu'r Dirprwy"
 
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "Rydych wedi cynnig porth all fod yn ddefnyddiol ar gyfer y gwasanaeth."
+#: ../proxy_wizard/proxy.wiz_.c:13
+msgid "Define an upper level proxy"
+msgstr "Diffiniwch ddirprwy lefel uwch"
 
-#: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Hierarchaeth storfa"
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "System Ffeil            Size  Used Avail Use% Mounted on"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -1060,244 +1078,214 @@ msgstr ""
 "Gwasanaethwr dirprwyol storfa gwe ys squid, sy'n caniat�u mynediad gwe cynt "
 "ar gyfer eich rhwydwaith lleol."
 
-#: ../proxy_wizard/proxy.wiz_.c:10
-msgid "Define an upper level proxy"
-msgstr "Diffiniwch ddirprwy lefel uwch"
-
-#: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Lle ar Ddisg (MB)"
-
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "Enw gwesteiwr dirprwyol lefel uwch:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr ""
+"Bydd y dewin yn eich cynorthwyo i ffurfweddu eich gwasanaethwr dirprwyol."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Porth dirprwy lefel uchaf"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Er gwybodaeth dyma le ar ddisg  /var/spool/squid:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "Storfa Ddisg yw'r maint o le ar ddisg sydd ar gael ar gyfer storio ar ddisg."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "Ffurfweddu'r Dirprwy"
+msgid "Proxy Port"
+msgstr "Porth Dirprwyol:"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"Mae gwerth y porth dirprwyol yn gosod yr hyn fydd y gwasanaethwr dirprwyol "
-"yn gwrando arno am geisiadau http. Y rhagosodiad yw 3128, gall werth "
-"cyffredin arall fod yn 8080, mae gwerth y porth angen bod yn fwy na 1024."
+"Mae modd defnyddio ffurf rhifol fel \\q192.168.1.0/255.255.255.0\\q neu un "
+"testun fel \\q.parth.net\\q"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Dewin Squid"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Porth:"
-
-#: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "System Ffeil            Size  Used Avail Use% Mounted on"
-
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Rhaid rhedeg y Dewin fel Gwraidd"
-
-#: ../proxy_wizard/proxy.wiz_.c:26
 msgid ""
-"You can safely select \\qNo upper level proxy\\q if you don't need this "
-"feature."
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
-"Mae modd dewis \\qDim lefel dirprwy uchel\\q os nad oes anfgen y nodwedd hwn."
+"Cliciwch Nesaf os ydych am gadw'r gwerth hwn, neu N�l i gywiro eich dewis."
+
+#: ../proxy_wizard/proxy.wiz_.c:24
+msgid "You have entered a port that may be useful for this service:"
+msgstr "Rydych wedi cynnig porth all fod yn ddefnyddiol ar gyfer y gwasanaeth."
 
 #: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Storfa cof (MB):"
+msgid "/etc/services:"
+msgstr "/etc/services:"
 
 #: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Rheoli Mynediad:"
+msgid "Cache hierarchy"
+msgstr "Hierarchaeth storfa"
 
 #: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"You can safely select \\qNo upper level proxy\\q if you don't need this "
+"feature."
 msgstr ""
-"Os ydych yn dewis ffurfweddu nawr, byddwch yn parhau'n awtomatig gyda  "
-"ffurfweddiad Dirprwyol."
+"Mae modd dewis \\qDim lefel dirprwy uchel\\q os nad oes anfgen y nodwedd hwn."
 
 #: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Porth Dirprwyol:"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Cliciwch n�l i newid y gwerth."
+msgid "Port:"
+msgstr "Porth:"
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Rhowch enw gwesteiwr cywir (fel\\qstorfa.parth.net\\q) a porth y dirprwy i'w "
-"ddefnyddio."
+"Fel dewis mae modd ffurfweddu Squid mewn dirprwy rhaeadru. Mae modd "
+"ychwanegu dirprwy lefel uwch drwy enwi ei enw gwesteiwr a phorth."
 
 #: ../proxy_wizard/proxy.wiz_.c:34
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr ""
+"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+"ffurfweddu eich dirprwy:"
+
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Storfa cof (MB):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Dim dirprwy lefel uchel (argymhellir)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Rhaid dewis porth mwy na 1024 a llai na 65535"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Maint Storfa Dirprwyol"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Cliciwch n�l i newid y gwerth."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Cliciwch Nesaf os ydych am gadw'r gwerth hwn, neu N�l i gywiro eich dewis."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Gwestai Lleol - cyfyngu mynediad i'r gwasanaethwr hwn yn unig"
+"Mae gwerth y porth dirprwyol yn gosod yr hyn fydd y gwasanaethwr dirprwyol "
+"yn gwrando arno am geisiadau http. Y rhagosodiad yw 3128, gall werth "
+"cyffredin arall fod yn 8080, mae gwerth y porth angen bod yn fwy na 1024."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Mae modd defnyddio ffurf rhifol fel \\q192.168.1.0/255.255.255.0\\q neu un "
-"testun fel \\q.parth.net\\q"
+msgid "Squid wizard"
+msgstr "Dewin Squid"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Dewin Ffurfweddu Dirprwy"
+msgid "Proxy port:"
+msgstr "Porth dirprwyol:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Lle ar Ddisg (MB)"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "Enw gwesteiwr dirprwyol lefel uwch:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Gwestai Lleol - cyfyngu mynediad i'r gwasanaethwr hwn yn unig"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"Fel dewis mae modd ffurfweddu Squid mewn dirprwy rhaeadru. Mae modd "
-"ychwanegu dirprwy lefel uwch drwy enwi ei enw gwesteiwr a phorth."
+"Storfa Cof yw'r hyn o RAM sydd wedi ei neilltuo i weithrediadau cof y storfa "
+"(sylwch fod y defnydd o gof ar gyfer y broses squid cyfan yn fwy)."
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
-"ffurfweddu eich dirprwy:"
+"Rhowch enw gwesteiwr cywir (fel\\qstorfa.parth.net\\q) a porth y dirprwy i'w "
+"ddefnyddio."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr "Mae modd ffurfweddu'r dirprwy i ddefnyddio lefelau rheoli gwahanol."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Porth dirprwy lefel uchaf"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu eich gwasanaethwr dirprwyol."
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaethwr dirprwyol."
 
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Er gwybodaeth dyma le ar ddisg  /var/spool/squid:"
+#: ../samba_wizard/samba.wiz_.c:3
+msgid "Home:"
+msgstr "Cartref:"
 
-#: ../samba_wizard/samba.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:4
 #, fuzzy
-msgid "Enable file sharing area"
-msgstr "Galluogi gofod rhannu  /home/samba/public"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr ""
+msgid "Enable all printer"
+msgstr "Gwasanaethau Samba "
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Grwp Gwaith"
+#, fuzzy
+msgid "Make home directories available for their owners"
+msgstr "Gwneud cyfeiriaduron cartref ar gael ar gyfer eu perchnogion"
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr ""
-"Os ydych yn dewis ffurfweddu nawr, byddwch yn parhau'n awtomatig gyda  "
-"ffurfweddiad SAMBA"
+msgid "Configuring Samba"
+msgstr "Ffurfweddu Samba"
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "Mae Baner y Gwasanaethwr yn anghywir"
-
 #: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Mae Samba angen gwybod y Grwp Gwaith Windows bydd yn ei wasanaethu."
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau Samba eich "
-"gwasanaethwr."
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Gwasanaethau Samba "
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+"Mae Samba'n medru darparu gofod rhannu ffeiliau cyffredin ar gyfer eich "
+"gorsaf gwaith Windows, a rhannu argraffydd ar gyfer argraffyddion sydd wedi "
+"eu cysylltu i'ch gwasanaethwr."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+msgid "The wizard successfully configured your Samba server."
+msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaethwr Samba."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
-"ffurfweddu Samba."
+msgid "Server Banner."
+msgstr "Banner Gwasanaethwr"
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Baner:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Gwasanaethwr Argraffu:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
 msgstr "Grwp Gwaith"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"Y faner yw'r ffordd bydd y gwasanaethwr hwn yn cael ei ddisgrifio mewn "
-"gorsafoedd gwaith Windows."
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Rhannu Ffeiliau:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1305,12 +1293,26 @@ msgstr ""
 "Rydych wedi dewis i ganiat�u mynediad i ddefnyddwyr i'w cyfeiriaduron "
 "cartref drwy samba ond rhaid defnyddio smbpasswd i osod cyfrinair."
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "Gwasanaethau Samba "
+msgid "Printers:"
+msgstr "Gwasanaethwr Argraffu:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "Mae Baner y Gwasanaethwr yn anghywir"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Dewin Ffurfweddu Samba"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1318,281 +1320,259 @@ msgstr ""
 "Mae Samba'n caniat�u i'ch gwasanaethwr ymddwyn fel gwasanaethwr ffeil ac "
 "argraffu ar gyfer gorsafoedd gwaith sy'n rhedeg systemau heblaw Linux."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
+#: ../samba_wizard/samba.wiz_.c:28
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:28
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "Ffurfweddu Samba"
+"Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau Samba eich "
+"gwasanaethwr."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
 msgstr "Banner Gwasanaethwr"
 
+#: ../samba_wizard/samba.wiz_.c:33
+msgid "Enabled Samba Services"
+msgstr "Gwasanaethau Samba "
+
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "Galluogi'r Rhannu Gwasanaethwr Argraffydd"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "Mae'r Grwp Gwaith yn anghywir"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Os ydych yn dewis ffurfweddu nawr, byddwch yn parhau'n awtomatig gyda  "
+"ffurfweddiad SAMBA"
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
+"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+"ffurfweddu Samba."
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "Rheoli Mynediad"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"Y faner yw'r ffordd bydd y gwasanaethwr hwn yn cael ei ddisgrifio mewn "
+"gorsafoedd gwaith Windows."
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
 msgstr ""
-"Mae Samba'n medru darparu gofod rhannu ffeiliau cyffredin ar gyfer eich "
-"gorsaf gwaith Windows, a rhannu argraffydd ar gyfer argraffyddion sydd wedi "
-"eu cysylltu i'ch gwasanaethwr."
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Baner:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaethwr Samba."
+msgid "The Workgroup is wrong"
+msgstr "Mae'r Grwp Gwaith yn anghywir"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Mae Samba angen gwybod y Grwp Gwaith Windows bydd yn ei wasanaethu."
+msgid "Samba wizard"
+msgstr "Dewin Samba"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Banner Gwasanaethwr"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "Rheoli Mynediad:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Gwasanaethwr Argraffu:"
+msgid "Workgroup"
+msgstr "Grwp Gwaith"
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Dewin Samba"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Dewin Ffurfweddu Samba"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "Make home directories available for their owners"
-msgstr "Gwneud cyfeiriaduron cartref ar gael ar gyfer eu perchnogion"
+msgid "Access control"
+msgstr "Rheoli Mynediad"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Galluogi'r Rhannu Gwasanaethwr Argraffydd"
-
-#: ../samba_wizard/samba.wiz_.c:56
+#: ../samba_wizard/samba.wiz_.c:53
 #, fuzzy
-msgid "Printers:"
-msgstr "Gwasanaethwr Argraffu:"
+msgid "Enable file sharing area"
+msgstr "Galluogi gofod rhannu  /home/samba/public"
 
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Cartref:"
+#: ../samba_wizard/samba.wiz_.c:56
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr ""
+msgid "File Sharing:"
+msgstr "Rhannu Ffeiliau:"
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
+msgid "This wizard will set the basic networking parameters of your server."
 msgstr ""
-"Dewiswch ddyfais rhwydwaith (cerdyn fel rheol) y dylai'r gwasanaethwr ei "
-"ddefnyddio i gysylltu �'ch rhwydwaith. Dyfais ar gyfer y rhwydwaith lleol, "
-"nid yr un ar gyfer mynediad i'r rhyngrwyd."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "Mae cyfeiriad IP y Gwasanaethwr yn anghywir"
+"Bydd y dewin yn gosod paramedrau rhwydweithio elfennol eich gwasanaethwr."
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "Dyfais porth:"
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Dewin Gwasanaethwr"
-
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
-"Rhestr o bedwar rhif llai na 256, wedi eu rhannu gan atalnod llawn; yw "
-"cyfeiriadau rhwydwaith,. Rhaid i'r rhif olaf fod yn sero."
+msgid "Host Name:"
+msgstr "Enw Gwesteiwr:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "dyfais rhyngrwyd"
+msgid "Basic Network Configuration Wizard"
+msgstr "Dewin Ffurfweddu Rhwydwaith Elfennol"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "Mae'r cyfeiriad rhwydwaith yn anghywir"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Felly, mae'n bosibl fod yr enw parth a'r cyfeiriad IP ar gyfer y rhwydwaith "
-"lleol yn WAHANOL i gysylltiad \\qallanol\\ y gwasanaethwr."
+msgid "Server IP address:"
+msgstr "yfeiriad IP y Gwasanaethwr"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Cyfeiriad Rhwydwaith"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "Ni ddylech redeg unrhyw raglen arall wrth redeg y dewin ac ar ddiwedd y "
 "dewin dylech adael eich sesiwn ac ail fewn gofnodi."
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
+"The wizard successfully configured the basic networking services of your "
+"server."
 msgstr ""
-"Dyma eich gwerth cyfredol ar gyfer y porth allanol (mae'r gwerth yn cael ei "
-"osod wrth osod y rhaglen). Dylai'r ddyfais (cerdyn rhwydwaith neu fodem) fod "
-"yn wahanol i'r un sy'n cael ei ddefnyddio ar gyfer y rhwydwaith mewnol."
+"LLwyddiant! Mae'r dewin wedi ffurfweddu gwasanaethau rhwydweithio elfennol "
+"eich gwasanaethwr."
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:14
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"(you can change here these values if you know exactly what you're doing)"
 msgstr ""
-"Mewn perthynas �'r dewiniaid, mae eich cyfrifiadur yn cael ei weld fel "
-"gwasanaethwr yn rheoli ei rhwydwaith ei hun. (Rhwydwaith Dosbarth C) "
-
-#: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Dyfais:"
+"(mae modd newid y gwerthoedd yma - os ydych yn gwybod beth yn union rydych "
+"yn ei wneud)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Rhybudd"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"Rhif yn dynodi eich rhwydwaith yw cyfeiriad rhwydwaith; mae'r gwerth sy'n "
+"cael ei gynnig wedi ei lunio ar gyfer ffurfweddiad sydd heb ei gysylltu �'r "
+"Rhyngrwyd, na'i gysylltu drwy IP ffug; oni bai eich bod yn gwybod beth "
+"rydych yn ei wneud, derbyniwch y gwerth rhagosodedig."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Mae'r dudalen yn cyfrifiannu'r enw parth: dylai fod yn anweledig"
+msgid "Note about networking"
+msgstr "Nodyn am rwydweithio"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Cyfeiriad y Gwasanaethwr:"
+msgid "Server Address"
+msgstr "Cyfeiriad Gwasanaethwr"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Enw parth cyfrifianwyd"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"Rhestr o bedwar rhif llai na 256, wedi eu rhannu gan atalnod llawn; yw "
+"cyfeiriadau rhwydwaith,. Rhaid i'r rhif olaf fod yn sero."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "Enw Gwestai"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Nodyn: ni ddylai'r cyfeiriad IP porth fod yn wag os ydych am gael mynediad "
+"i'r byd tu allan."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-"Mae'r dudalen yn cyfrifiannu cyfeiriad y gwasanaethwr rhagosodedig: dylai "
-"fod yn anweledig"
+msgid "The Server IP address is incorrect"
+msgstr "Mae cyfeiriad IP y Gwasanaethwr yn anghywir"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Dewin Ffurfweddu Rhwydwaith Elfennol"
+msgid "Configuring your network"
+msgstr "Ffurfweddu eich rhwydwaith"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "IP Porth:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "Nid yw enw gwestai yn gywir"
+msgid "This page computes the default server address; it should be invisible."
+msgstr ""
+"Mae'r dudalen yn cyfrifiannu cyfeiriad y gwasanaethwr rhagosodedig: dylai "
+"fod yn anweledig"
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"Rhaid i enwau gwesteiwyr  fod ar ffurf  \\qgwestai.parth.mathparth\\q; os "
-"mai gwasanaethwr Rhyngrwyd fydd eich gwasanaethwr, a dylai'r enw parth fod "
-"yr enw cofrestrwyd gyda'ch darparwr. Os mai dim ond mewnrwyd sydd gennych "
-"bydd unrhyw enw'n iawn, e.e. \\qcwmni.net\\q."
+msgid "IP net address:"
+msgstr "Cyfeiriad rhyngrwyd IP:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Porth allanol"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"Rhif yn dynodi eich rhwydwaith yw cyfeiriad rhwydwaith; mae'r gwerth sy'n "
-"cael ei gynnig wedi ei lunio ar gyfer ffurfweddiad sydd heb ei gysylltu �'r "
-"Rhyngrwyd, na'i gysylltu drwy IP ffug; oni bai eich bod yn gwybod beth "
-"rydych yn ei wneud, derbyniwch y gwerth rhagosodedig."
+msgid "Server Wizard"
+msgstr "Dewin Gwasanaethwr"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau rhwydwaith "
-"elfennol eich gwasanaethwr."
+"Felly, mae'n bosibl fod yr enw parth a'r cyfeiriad IP ar gyfer y rhwydwaith "
+"lleol yn WAHANOL i gysylltiad \\qallanol\\ y gwasanaethwr."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr ""
-"Bydd y dewin yn gosod paramedrau rhwydweithio elfennol eich gwasanaethwr."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Nodyn am rwydweithio"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Nodyn: ni ddylai'r cyfeiriad IP porth fod yn wag os ydych am gael mynediad "
-"i'r byd tu allan."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Gwall Dewin."
+"Dewiswch ddyfais rhwydwaith (cerdyn fel rheol) y dylai'r gwasanaethwr ei "
+"ddefnyddio i gysylltu �'ch rhwydwaith. Dyfais ar gyfer y rhwydwaith lleol, "
+"nid yr un ar gyfer mynediad i'r rhyngrwyd."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1600,19 +1580,42 @@ msgstr ""
 "Bydd dyfeisiau'n cael eu cyflwyno gyda'u henwau Linux ac, os yn hysbys, gyda "
 "disgrifiad."
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Cyfeiriad Rhwydwaith:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Dyma eich gwerth cyfredol ar gyfer y porth allanol (mae'r gwerth yn cael ei "
+"osod wrth osod y rhaglen). Dylai'r ddyfais (cerdyn rhwydwaith neu fodem) fod "
+"yn wahanol i'r un sy'n cael ei ddefnyddio ar gyfer y rhwydwaith mewnol."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "Ffurfweddu eich rhwydwaith"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr ""
+"Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau rhwydwaith "
+"elfennol eich gwasanaethwr."
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "IP Porth:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"Rhif yn dynodi eich gwasanaethwr ar eich rhwydwaith yw'r cyfeiriad IP "
+"gwasanaethwr; mae'r gwerth syn cael ei gynnig wedi ei lunio ar gyfer "
+"rhwydwaith preifat, dim gwelediad rhyngrwyd, na chysylltiad drwy ffugio IP; "
+"oni bai eich bod yn gwybod beth rydych yn ei wneud, derbyniwch y gwerth "
+"rhagosodedig."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "Nid yw enw gwestai yn gywir"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1622,11 +1625,27 @@ msgstr ""
 "gorsafoedd gwaith eraill yn eich rhwydwaith ac efallai ar y We ( yn dibynnu "
 "ar eich ffurfweddiad uwch)."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "Enw Gwesteiwr:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Gwall Dewin."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "dyfais rhyngrwyd"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "Enw parth cyfrifianwyd"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Mae'r dudalen yn cyfrifiannu'r enw parth: dylai fod yn anweledig"
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "Dyfais porth:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
@@ -1634,407 +1653,401 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich rhwydwaith"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"Cyswllt allanol yw rhwydwaith y mae'r cyfrifiadur yn gleient ohono "
-"(Rhyngrwyd neu rwydwaith uwch), wedi ei gysylltu drwy gerdyn rhwydwaith neu "
-"fodem."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Rhybudd"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr ""
-"(mae modd newid y gwerthoedd yma - os ydych yn gwybod beth yn union rydych "
-"yn ei wneud)"
+msgid "Device:"
+msgstr "Dyfais:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"Rhif yn dynodi eich gwasanaethwr ar eich rhwydwaith yw'r cyfeiriad IP "
-"gwasanaethwr; mae'r gwerth syn cael ei gynnig wedi ei lunio ar gyfer "
-"rhwydwaith preifat, dim gwelediad rhyngrwyd, na chysylltiad drwy ffugio IP; "
-"oni bai eich bod yn gwybod beth rydych yn ei wneud, derbyniwch y gwerth "
-"rhagosodedig."
+"Mewn perthynas �'r dewiniaid, mae eich cyfrifiadur yn cael ei weld fel "
+"gwasanaethwr yn rheoli ei rhwydwaith ei hun. (Rhwydwaith Dosbarth C) "
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Enw Gwasanaethwr:"
+msgid "Server Address:"
+msgstr "Cyfeiriad y Gwasanaethwr:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "Mae'r cyfeiriad rhwydwaith yn anghywir"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"Cyswllt allanol yw rhwydwaith y mae'r cyfrifiadur yn gleient ohono "
+"(Rhyngrwyd neu rwydwaith uwch), wedi ei gysylltu drwy gerdyn rhwydwaith neu "
+"fodem."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Cyfeiriad Gwasanaethwr"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
 msgstr ""
-"LLwyddiant! Mae'r dewin wedi ffurfweddu gwasanaethau rhwydweithio elfennol "
-"eich gwasanaethwr."
+"Rhaid i enwau gwesteiwyr  fod ar ffurf  \\qgwestai.parth.mathparth\\q; os "
+"mai gwasanaethwr Rhyngrwyd fydd eich gwasanaethwr, a dylai'r enw parth fod "
+"yr enw cofrestrwyd gyda'ch darparwr. Os mai dim ond mewnrwyd sydd gennych "
+"bydd unrhyw enw'n iawn, e.e. \\qcwmni.net\\q."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "Dyfais Rhwydwaith"
+msgid "Host Name"
+msgstr "Enw Gwestai"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "Cyfeiriad rhyngrwyd IP:"
+msgid "Network Address:"
+msgstr "Cyfeiriad Rhwydwaith:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Cyfeiriad Rhwydwaith"
+msgid "Network Device"
+msgstr "Dyfais Rhwydwaith"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "yfeiriad IP y Gwasanaethwr"
+msgid "Server Name:"
+msgstr "Enw Gwasanaethwr:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "Prifysgol Adelaide, De Awstralia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Universite Paris Sud, Ffrainc"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Cliciwch Nesaf i gychwyn y prawf gwasanaethwyr amser."
+msgid "University of Manchester, Manchester, England"
+msgstr "Prifysgol Manceinion, Manceinion, Lloegr"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Gwasanaethwyr Amser"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Universite de Limoges, Ffrainc"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Gwasanaethwyr Amser Eilradd"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr ""
-"Felly bydd eich gwasanaethwr yn wasanaethwr amser lleol eich rhwydwaith."
+msgid "Press next to start the time servers test."
+msgstr "Cliciwch Nesaf i gychwyn y prawf gwasanaethwyr amser."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
-"Mae modd i'ch gwasanaethwr weithredu fel gwasanaethwr amser eich rhwydwaith "
-"lleol."
+"Medrwch geisio cysylltu �'r gwasanaethwyr amser eto, neu cadw'r ffurfweddiad "
+"heb osod yr amser."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Y Ganolfan Wyddonol, Chernogolovka, Moscow, Rwsia."
+msgid "(please, choose servers in your geographical area)"
+msgstr "(dewiswch wasanaethwr yn eich ardal ddaearyddol)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylor College of Medicine, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "University of Oklahoma, Norman, Oklahoma, USA"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Dewiswch gylchfa amser"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "University of Regina, Regina, Saskatchewan, Canada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr "cliciwch Nesaf i gychwyn, neu Diddymu i adael y dewin"
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Coleg y Drindod, Dulun, Iwerddon"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, Ffrainc"
+msgid "Singapore"
+msgstr "Singapore"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Universite de Limoges, Ffrainc"
+msgid "Secondary Time Server:"
+msgstr "Gwasanaethwyr Amser Eilradd"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
+msgstr "Ceisiwch eto"
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
-msgstr "Dewiswch wasanaethwr cynradd ac eilradd o'r rhestr."
+msgid "The Chinese University of Hong Kong"
+msgstr "The Chinese University of Hong Kong"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(dewiswch wasanaethwr yn eich ardal ddaearyddol)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV College of Engineering, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, Ffrainc"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante/SBAEN)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "National Research Council of Canada, Ottawa, Ontario, Canada"
 
+#: ../time_wizard/time.wiz_.c:18
+msgid "Select a primary and secondary server from the list."
+msgstr "Dewiswch wasanaethwr cynradd ac eilradd o'r rhestr."
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "Prifysgol Manceinion, Manceinion, Lloegr"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, Ffrainc"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- dim rhwydwaith allanol"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Inc., Seoul, Corea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Os nad yw'r gwasanaethwr amser ar gael yn syth (rhwydwaith neu reswm arall), "
-"bydd yna oedi am tua 30 eiliad."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Y Ganolfan Wyddonol, Chernogolovka, Moscow, Rwsia."
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Profi presenoldeb y gwasanaethwyr amser"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washington State University Tri-Cities, Richland, Wa"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "Prifysgol Oslo, Norwy"
+msgid "University of Adelaide, South Australia"
+msgstr "Prifysgol Adelaide, De Awstralia"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "Computer Science Department, University of Wisconsin-Madison"
+msgid "Time zone:"
+msgstr "Cylchfa amser:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Coleg y Drindod, Dulun, Iwerddon"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Nid yw'r gwasanaethwyr amser yn ymateb. Gall hyn fod oherwydd:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "University of Regina, Regina, Saskatchewan, Canada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Universite de Caen, Ffranic"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Nid yw'r gwasanaethwyr amser yn ymateb. Gall hyn fod oherwydd:"
+msgid "- other reasons..."
+msgstr "- rhesymau eraill..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Swiss Fed. Inst. of Technology"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Os nad yw'r gwasanaethwr amser ar gael yn syth (rhwydwaith neu reswm arall), "
+"bydd yna oedi am tua 30 eiliad."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Universite de Caen, Ffranic"
+msgid "WARNING"
+msgstr "RHYBUDD"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, Ffrainc"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, Ffrainc"
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
-"Bydd y dewin yn eich cynorthwyo i osod amser eich gwasanaethwr neu gydamseru "
-"gyda gwasanaethwr amser allanol."
+"Mae modd i'ch gwasanaethwr weithredu fel gwasanaethwr amser eich rhwydwaith "
+"lleol."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "RHYBUDD"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Prifysgol Fukuoka, Fukuoka, Siapan"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Inc., Seoul, Corea"
+msgid "Time Servers"
+msgstr "Gwasanaethwyr Amser"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "University of Oklahoma, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Swiss Fed. Inst. of Technology"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "The Chinese University of Hong Kong"
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Bydd y dewin yn eich cynorthwyo i osod amser eich gwasanaethwr neu gydamseru "
+"gyda gwasanaethwr amser allanol."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- rhesymau eraill..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, Ffrainc"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- dim gwasanaethwyr amser yn bod"
+msgid "Testing the time servers availability"
+msgstr "Profi presenoldeb y gwasanaethwyr amser"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Cylchfa amser:"
+msgid "Save config without test"
+msgstr "Cadw'r ffurfweddiad heb brawf"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Dept. Computer Science, Strathclyde University, Glasgow, Yr Alban"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Medrwch geisio cysylltu �'r gwasanaethwyr amser eto, neu cadw'r ffurfweddiad "
-"heb osod yr amser."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT Information Systems, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Gwasanaethwr Amser Cynradd:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylor College of Medicine, Houston, Tx"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Ceisiwch eto"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn State University, University Park, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
+msgstr "- dim gwasanaethwyr amser yn bod"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Wedi cadw ffurfweddiad gwasanaethwr amser"
+msgid "Time wizard"
+msgstr "Dewin amser"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Universite Paris Sud, Ffrainc"
+msgid "University of Oslo, Norway"
+msgstr "Prifysgol Oslo, Norwy"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr ""
+"Felly bydd eich gwasanaethwr yn wasanaethwr amser lleol eich rhwydwaith."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Cadw'r ffurfweddiad heb brawf"
+msgid "- no outside network"
+msgstr "- dim rhwydwaith allanol"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapore"
+msgid "Primary Time Server:"
+msgstr "Gwasanaethwr Amser Cynradd:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Prifysgol Fukuoka, Fukuoka, Siapan"
+msgid "Time server configuration saved"
+msgstr "Wedi cadw ffurfweddiad gwasanaethwr amser"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr "cliciwch Nesaf i gychwyn, neu Diddymu i adael y dewin"
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante/SBAEN)"
+msgid "Choose a time zone:"
+msgstr "Dewiswch gylchfa amser"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Dewin amser"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr ""
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr "Computer Science Department, University of Wisconsin-Madison"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid ""
+"Your server can act as a Web Server toward your internal network (intranet) "
+"and as a Web Server for the Internet."
 msgstr ""
-"Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gwasanaethwr Gwe."
+"Mae modd i'ch gwasanaethwr weithredu fel Gwasanaethwr Gwe ar gyfer eich "
+"rhwydwaith mewnol (mewnrwyd) ac fel Gwasanaethwr Gwe ar gyfer y Rhyngrwyd."
 
 #: ../web_wizard/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr ""
-"Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr Gwe Mewnrwyd/"
-"Rhyngrwyd"
+#, fuzzy
+msgid "Internet web server:"
+msgstr "Gwasanaethwr Gwe Rhyngrwyd:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
-"ffurfweddu eich Gwasanaethwr Gwe"
-
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Dewin Gwe"
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
 msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu'r Gwasanaethwr Gwe ar gyfer "
-"eich rhwydwaith."
+
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Galluogi'r Gwasanaethwr Gwe ar gyfer y Fewnrwyd"
 
 #: ../web_wizard/web.wiz_.c:12
-#, fuzzy
-msgid "Internet web server:"
-msgstr "Gwasanaethwr Gwe Rhyngrwyd:"
+msgid "Configuring the Web Server"
+msgstr "Ffurfweddu'r Gwasanaethwr Gwe"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Galluogi'r Gwasanaethwr Gwe ar gyfer y Fewnrwyd"
+msgid "Web Server"
+msgstr "Gwasanaethwr Gwe"
 
 #: ../web_wizard/web.wiz_.c:14
-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 gwasanaethwr weithredu fel Gwasanaethwr Gwe ar gyfer eich "
-"rhwydwaith mewnol (mewnrwyd) ac fel Gwasanaethwr Gwe ar gyfer y Rhyngrwyd."
-
-#: ../web_wizard/web.wiz_.c:15
 #, fuzzy
 msgid "Enable the Web Server for the Internet"
 msgstr "Galluogi'r Gwasanaethwr Gwe ar gyfer y Fewnrwyd"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Cyfeiriadur:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "Dewiswch y math o wasanaeth Gwe rydych am ei weithredu:"
+#, fuzzy
+msgid "This wizard will help you configuring the Web Server for your network."
+msgstr ""
+"Bydd y dewin yn eich cynorthwyo i ffurfweddu'r Gwasanaethwr Gwe ar gyfer "
+"eich rhwydwaith."
 
 #: ../web_wizard/web.wiz_.c:17
-msgid "document root:"
-msgstr ""
+msgid "Web wizard"
+msgstr "Dewin Gwe"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Gwasanaethwr Gwe Mewnrwyd"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "Ffurfweddu'r Gwasanaethwr Gwe"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Gwasanaethwr Gwe"
+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 Gwasanaethwr Gwe."
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Dewin Ffurfweddu Gwasanaethwr Gwe"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "Dewiswch y math o wasanaeth Gwe rydych am ei weithredu:"
+
+#: ../web_wizard/web.wiz_.c:28
+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 Gwasanaethwr Gwe"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr ""
+"Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr Gwe Mewnrwyd/"
+"Rhyngrwyd"
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr ""
+msgid "Web Server Configuration Wizard"
+msgstr "Dewin Ffurfweddu Gwasanaethwr Gwe"
 
 msgid "Cancel"
 msgstr "Diddymu"
diff --git a/po/da.po b/po/da.po
index b5660360..a00ac185 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
-"POT-Creation-Date: 2003-01-16 00:06+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-11-17 09:41+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team:  Danish <dansk@klid.dk>\n"
@@ -31,9 +31,9 @@ msgstr ""
 
 #: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
 #: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
-#: ../ftp_wizard/ftp.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:5
-#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:4
-#: ../web_wizard/web.wiz_.c:10
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
 msgid "OK"
 msgstr "O.k."
 
@@ -87,7 +87,7 @@ msgstr ""
 "Bem�rk at angivet IP-nummer og klientnavn skal v�re unikke i netv�rket."
 
 #: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
-#: ../postfix_wizard/postfix.wiz_.c:21 ../proxy_wizard/proxy.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
 msgid "Warning:"
 msgstr "Advarsel:"
 
@@ -140,18 +140,18 @@ msgstr "Klient-IP:"
 #: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
 #: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
 #: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
-#: ../nfs_wizard/nfs.wiz_.c:4 ../proxy_wizard/proxy.wiz_.c:33
-#: ../samba_wizard/samba.wiz_.c:28 ../server_wizard/server.wiz_.c:31
-#: ../web_wizard/web.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
 msgid "Configure"
 msgstr "Konfigur�r"
 
-#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:9
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
 msgid "You need to be root to run this wizard"
 msgstr "Du skal v�re root for at kunne k�re denne hj�lper"
 
 #: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
-#: ../postfix_wizard/postfix.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:40
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
 #: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Netv�rk ikke konfigureret endnu"
@@ -165,17 +165,17 @@ msgid "DNS Wizard (add client)"
 msgstr "DNS-hj�lper (tilf�j klient)"
 
 #: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
-#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:16
-#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
-#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:11
-#: ../postfix_wizard/postfix.wiz_.c:15 ../proxy_wizard/proxy.wiz_.c:43
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
 #: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
-#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:17
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
 msgid "Quit"
 msgstr "Afslut"
 
 #: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
-#: ../ftp_wizard/ftp.wiz_.c:20 ../web_wizard/web.wiz_.c:19
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
 msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
 "Advarsel\\nDu er i dhcp, serveren vil muligvis ikke virke med din "
@@ -192,10 +192,10 @@ msgstr ""
 #: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
 #: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
 #: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
-#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:16
-#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:53 ../server_wizard/server.wiz_.c:48
-#: ../web_wizard/web.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
 msgid "Congratulations"
 msgstr "Tillykke"
 
@@ -212,7 +212,7 @@ msgstr ""
 "Tilbage for at �ndre dit valg."
 
 #: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:52
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
 #: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
@@ -265,8 +265,8 @@ msgstr "Brugernavn:"
 msgid "Add"
 msgstr "Tilf�j"
 
-#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:19
-#: ../web_wizard/web.wiz_.c:18
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
 msgid "Sorry, you must be root to do this..."
 msgstr "Desv�rre, du skal v�re root for at g�re dette."
 
@@ -307,6 +307,7 @@ msgstr ""
 "MySQL-databaseserver"
 
 #: ../db_wizard/db.wiz_.c:25
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the MySQL Database Server for your "
 "network."
@@ -350,16 +351,16 @@ msgid "Lowest IP Address:"
 msgstr "Laveste IP-adresse:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
-#: ../server_wizard/server.wiz_.c:2
+#: ../server_wizard/server.wiz_.c:3
 msgid "IP addresses are a dotted list of four numbers smaller than 256."
 msgstr ""
 "IP-adresser er en liste af fire tal mindre end 256 med punktummer imellem"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:9
-#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:3
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
 #: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
-#: ../server_wizard/server.wiz_.c:5 ../web_wizard/web.wiz_.c:9
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -372,6 +373,7 @@ msgid "DHCP Wizard"
 msgstr "DHCP-hj�lper"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
 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."
@@ -436,23 +438,15 @@ msgstr ""
 msgid "Primary DNS Address:"
 msgstr "Prim�r DNS-adresse:"
 
-#: ../dns_wizard/dns.wiz_.c:8
-msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
-msgstr ""
-"DNS (Domain Name Server) er tjenesten som giver en maskine et v�rtsnavn p� "
-"internettet."
-
-#: ../dns_wizard/dns.wiz_.c:10
+#: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "Konfigurerer DNS-serveren"
 
-#: ../dns_wizard/dns.wiz_.c:11
+#: ../dns_wizard/dns.wiz_.c:10
 msgid "DNS Configuration Wizard"
 msgstr "Konfigurationshj�lper for DNS"
 
-#: ../dns_wizard/dns.wiz_.c:12
+#: ../dns_wizard/dns.wiz_.c:11
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -464,15 +458,15 @@ msgstr ""
 "til prim�r og sekund�r DNS server; normalt bliver denne adresse opgivet af "
 "din Internet-udbyder."
 
-#: ../dns_wizard/dns.wiz_.c:13
+#: ../dns_wizard/dns.wiz_.c:12
 msgid "The wizard successfully configured the DNS services of your server."
 msgstr "Hj�lperen konfigurerede DNS-tjenesterne p� din server uden problemer."
 
-#: ../dns_wizard/dns.wiz_.c:14
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Du har angivet en tom adresse for DNS-serveren:"
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "The wizard collected the following parameters needed to configure your DNS "
 "service:"
@@ -480,15 +474,24 @@ msgstr ""
 "Hj�lperen samlede f�lgende parametre som beh�ves for at konfigurere din DNS-"
 "tjeneste:"
 
-#: ../dns_wizard/dns.wiz_.c:17
+#: ../dns_wizard/dns.wiz_.c:16
 msgid "DNS Server Addresses"
 msgstr "DNS-serveradresser"
 
+#: ../dns_wizard/dns.wiz_.c:17
+msgid ""
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
+msgstr ""
+"DNS (Domain Name Server) er tjenesten som giver en maskine et v�rtsnavn p� "
+"internettet."
+
 #: ../dns_wizard/dns.wiz_.c:20
 msgid "Secondary DNS Address:"
 msgstr "Sekund�r DNS-adresse:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the DNS services of your server. This "
 "configuration will provide a local DNS service for local computers names, "
@@ -565,7 +568,7 @@ msgid "The device name is not correct"
 msgstr "Enhedsnavnet er ikke korrekt"
 
 #: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
-#: ../server_wizard/server.wiz_.c:41
+#: ../server_wizard/server.wiz_.c:42
 msgid "Fix It"
 msgstr "Ret det"
 
@@ -586,7 +589,7 @@ msgid "Protection Level"
 msgstr "Beskyttelsesniveau"
 
 #: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
-#: ../proxy_wizard/proxy.wiz_.c:23 ../samba_wizard/samba.wiz_.c:19
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
 msgid "Something terrible happened"
 msgstr "Noget forf�rdeligt h�ndte"
 
@@ -603,12 +606,13 @@ msgid "Configuring the Firewall"
 msgstr "Konfigurerer brandmuren"
 
 #: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
-#: ../proxy_wizard/proxy.wiz_.c:50 ../samba_wizard/samba.wiz_.c:55
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
 #: ../server_wizard/server.wiz_.c:51
 msgid "Exit"
 msgstr "Afslut"
 
 #: ../firewall_wizard/firewall.wiz_.c:24
+#, fuzzy
 msgid "This wizard will help you configuring your server firewall."
 msgstr "Denne hj�lper kan assistere dig med at konfigurere serverbrandmuren."
 
@@ -621,6 +625,7 @@ msgid "Protection Level:"
 msgstr "Beskyttelsesniveau:"
 
 #: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Denne hj�lpe vil hj�lpe dig med at konfigurere FTP-serveren til dit netv�rk."
@@ -633,47 +638,47 @@ msgstr "Offentligt katalog:"
 msgid "Internet FTP Server:"
 msgstr "Internet-FTP-server:"
 
-#: ../ftp_wizard/ftp.wiz_.c:6 ../samba_wizard/samba.wiz_.c:29
-msgid "Shared dir:"
-msgstr "Delt kat.:"
-
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:6
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Aktiv�r FTP-serveren for Intranettet"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
+#: ../ftp_wizard/ftp.wiz_.c:7
 msgid "FTP wizard"
 msgstr "FTP-hj�lper"
 
-#: ../ftp_wizard/ftp.wiz_.c:11
+#: ../ftp_wizard/ftp.wiz_.c:10
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: ../ftp_wizard/ftp.wiz_.c:12
+#: ../ftp_wizard/ftp.wiz_.c:11
 msgid "Don't check any box if you don't want to activate your FTP Server."
 msgstr "Mark�r ingen boks hvis du ikke vil aktivere FTP-serveren."
 
-#: ../ftp_wizard/ftp.wiz_.c:13
+#: ../ftp_wizard/ftp.wiz_.c:12
 msgid "Configuring the FTP Server"
 msgstr "Konfigurerer FTP-serveren"
 
-#: ../ftp_wizard/ftp.wiz_.c:14
+#: ../ftp_wizard/ftp.wiz_.c:13
 msgid "Enable the FTP Server for the Internet"
 msgstr "Aktiv�r FTP-serveren for Internettet"
 
-#: ../ftp_wizard/ftp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:14
 msgid "Intranet FTP Server:"
 msgstr "Intranet-FTP-server:"
 
-#: ../ftp_wizard/ftp.wiz_.c:16
+#: ../ftp_wizard/ftp.wiz_.c:15
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Hj�lperen konfigurerede din Intranet/Internet FTP-server uden problemer"
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:16
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "V�lg hvilken form af FTP-tjeneste du vil aktivere:"
 
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr "Delt kat.:"
+
 #: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
@@ -682,8 +687,8 @@ msgstr ""
 "Hj�lperen samlede f�lgende parametre som beh�ves for at konfigurere din FTP-"
 "server"
 
-#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:17
-#: ../web_wizard/web.wiz_.c:20
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
 msgid "The path you entered does not exist."
 msgstr "Stien du angav eksisterer ikke."
 
@@ -722,6 +727,7 @@ msgstr ""
 "f�lgende tjek."
 
 #: ../news_wizard/news.wiz_.c:5
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet News services for your "
 "network."
@@ -806,11 +812,15 @@ msgstr "Nyhedsgruppeserver"
 msgid "News Server:"
 msgstr "Nyhedsgruppeserver:"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:30
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Autoriseret netv�rk:"
+
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
 msgid "Access Control"
 msgstr "Adgangskontrol"
 
-#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:2
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
 "Access will be allowed for hosts on the network. Here is the information "
 "found about your current local network, you can modify it if needed."
@@ -818,98 +828,102 @@ msgstr ""
 "Adgang vil blive tilladt for v�rter p� netv�rket. Her er informationen der "
 "er fundet om dit nuv�rende lokale netv�rk, du kan �ndre det om �nsket."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:4
 msgid "Access :"
 msgstr "Adgangskontrol :"
 
-#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
 msgid "Local Network - access for local network (recommended)"
 msgstr "Lokalt netv�rk - adgang for lokalt netv�rk (anbefalet)"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+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 "
+"ikke er sikkert."
+
+#: ../nfs_wizard/nfs.wiz_.c:8
 msgid "Exported dir:"
 msgstr "Eksporteret kat.:"
 
-#: ../nfs_wizard/nfs.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:9
 msgid "The wizard collected the following parameters."
 msgstr "Hj�lperen samlede f�lgende parametre."
 
-#: ../nfs_wizard/nfs.wiz_.c:8
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "Konfigurationshj�lper for NFS-server"
 
-#: ../nfs_wizard/nfs.wiz_.c:9
+#: ../nfs_wizard/nfs.wiz_.c:11
 msgid "NFS can be restricted to a certain ip class"
 msgstr "NFS kan begr�nses til en bestemt ip-klasse"
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:19
-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 "
-"ikke er sikkert."
-
-#: ../nfs_wizard/nfs.wiz_.c:12
+#: ../nfs_wizard/nfs.wiz_.c:13
 msgid "NFS Wizard"
 msgstr "NFS-hj�lper"
 
-#: ../nfs_wizard/nfs.wiz_.c:13 ../proxy_wizard/proxy.wiz_.c:20
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
 msgid "Grant access on local network"
 msgstr "Tillad adgang p� lokalt netv�rk"
 
-#: ../nfs_wizard/nfs.wiz_.c:14
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "NFS-server"
 
-#: ../nfs_wizard/nfs.wiz_.c:15 ../proxy_wizard/proxy.wiz_.c:46
-#: ../samba_wizard/samba.wiz_.c:50
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "Alle - Ingen adgangsrestriktioner"
 
-#: ../nfs_wizard/nfs.wiz_.c:17
+#: ../nfs_wizard/nfs.wiz_.c:18
 msgid "Netmask :"
 msgstr "Netmaske:"
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../nfs_wizard/nfs.wiz_.c:19
 msgid "Directory:"
 msgstr "Katalog:"
 
-#: ../nfs_wizard/nfs.wiz_.c:19
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 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.wiz_.c:20
+#: ../nfs_wizard/nfs.wiz_.c:21
 msgid "The wizard successfully configured your NFS Server"
 msgstr "Hj�lperen konfigurerede din NFS-server uden problemer."
 
-#: ../nfs_wizard/nfs.wiz_.c:21 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Authorised network:"
-msgstr "Autoriseret netv�rk:"
-
 #: ../postfix_wizard/postfix.wiz_.c:2
+#, fuzzy
+msgid "There seems to be a problem..."
+msgstr ""
+"Det ser ud som der er et problem... g� ned i k�lderen og sp�rg manden med de "
+"beskidte fingre"
+
+#: ../postfix_wizard/postfix.wiz_.c:3
 msgid "Internet Mail Gateway"
 msgstr "Internet epost gateway"
 
-#: ../postfix_wizard/postfix.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:5
 msgid "Outgoing Mail Address"
 msgstr "Udg�ende e-postadresse"
 
-#: ../postfix_wizard/postfix.wiz_.c:5
+#: ../postfix_wizard/postfix.wiz_.c:6
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Hj�lperen konfigurerede din Internet eposttjeneste for din server uden "
 "problemer."
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "G�r det"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -917,27 +931,27 @@ msgstr ""
 "Denne b�r v�lges i overensstemmelse med adressen du bruger for indg�ende "
 "post."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:10
 msgid "Hmmm"
 msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:11
 msgid "You entered an empty address for the mail gateway."
 msgstr "Du indtastede en tom adresse for epost-gatewayen."
 
-#: ../postfix_wizard/postfix.wiz_.c:11
+#: ../postfix_wizard/postfix.wiz_.c:12
 msgid "Internet Mail Configuration Wizard"
 msgstr "Internet epost konfigureringshj�lper"
 
-#: ../postfix_wizard/postfix.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Postfix-hj�lper"
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:14
 msgid "Mail Server Name:"
 msgstr "Navn p� e-postserver:"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -946,7 +960,8 @@ msgstr ""
 "udenfor dit lokale netv�rk. Tryk n�ste for at forts�tte, eller tilbage for "
 "at indtaste en v�rdi."
 
-#: ../postfix_wizard/postfix.wiz_.c:16
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
@@ -954,7 +969,7 @@ msgstr ""
 "Denne hj�lper vil hj�lpe dig med at konfigurere Internet epost-tjenester for "
 "dit netv�rk."
 
-#: ../postfix_wizard/postfix.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -962,7 +977,7 @@ msgstr ""
 "Din server vil sende udg�ende post via en epost-gateway, denne vil tage hnd "
 "om slutleveringen."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -970,7 +985,7 @@ msgstr ""
 "Hvis du v�lger at konfigurere nu vil du automatisk forts�tte med POSTFIX-"
 "konfigurationen"
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -980,7 +995,7 @@ msgstr ""
 "hvis din udbyder er \\qudbyder.dk\\q, er internet epost-serveren normalt "
 "\\qsmtp.udbyder.dk\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:20
+#: ../postfix_wizard/postfix.wiz_.c:21
 msgid ""
 "You can select the kind of address that outgoing mail will show in the "
 "\\qFrom:\\q and \\qReply-to\\q field."
@@ -988,12 +1003,6 @@ msgstr ""
 "Du kan v�lge den slags adresser som udg�ende epost vil vise i \\qFrom:\\q og "
 "\\qReply-to\\q-felterne."
 
-#: ../postfix_wizard/postfix.wiz_.c:22
-msgid "There seems to be a problem... go ask to the big black man downstairs"
-msgstr ""
-"Det ser ud som der er et problem... g� ned i k�lderen og sp�rg manden med de "
-"beskidte fingre"
-
 #: ../postfix_wizard/postfix.wiz_.c:23
 msgid "Configuring the Internet Mail"
 msgstr "Konfigurerer Internet epost"
@@ -1034,23 +1043,28 @@ msgstr "Konfigurationshj�lper for proxy"
 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/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Denne hj�lper skal k�res som root"
+
+#: ../proxy_wizard/proxy.wiz_.c:10
 msgid "Access Control:"
 msgstr "Adgangskontrol:"
 
-#: ../proxy_wizard/proxy.wiz_.c:10
+#: ../proxy_wizard/proxy.wiz_.c:11
 msgid "Configuring the Proxy"
 msgstr "Konfigurerer proxy"
 
-#: ../proxy_wizard/proxy.wiz_.c:11
+#: ../proxy_wizard/proxy.wiz_.c:13
 msgid "Define an upper level proxy"
 msgstr "Defin�r en �vre niveau-proxy"
 
-#: ../proxy_wizard/proxy.wiz_.c:12
+#: ../proxy_wizard/proxy.wiz_.c:14
 msgid "Filesystem            Size  Used Avail Use% Mounted on"
 msgstr "Filsystem            Str   Brugt Tilg� Brug% Monteret p�"
 
-#: ../proxy_wizard/proxy.wiz_.c:13
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -1058,20 +1072,28 @@ msgstr ""
 "Squid er en web-cache proxy-server. Den tillader hurtigere web-adgang for "
 "dit lokale netv�rk."
 
-#: ../proxy_wizard/proxy.wiz_.c:14
+#: ../proxy_wizard/proxy.wiz_.c:16
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Denne hj�lper vil hj�lpe dig med at konfigurere din proxy-server."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
 msgid "Upper level proxy port:"
 msgstr "�vre niveau proxy-port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:15
+#: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Som information er her /var/spool/squid-plads p� disken:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 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/proxy.wiz_.c:16
+#: ../proxy_wizard/proxy.wiz_.c:20
 msgid "Proxy Port"
 msgstr "Proxy-port"
 
-#: ../proxy_wizard/proxy.wiz_.c:17
+#: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
 "You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
 "a text format like \\q.domain.net\\q"
@@ -1079,31 +1101,26 @@ msgstr ""
 "Du kan bruge enten et numerisk format som \\q192.168.1.0/255.255.255.0\\q "
 "eller et tekstformat som \\q.domain.net\\q"
 
-#: ../proxy_wizard/proxy.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:22
 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"
 
-#: ../proxy_wizard/proxy.wiz_.c:21
+#: ../proxy_wizard/proxy.wiz_.c:24
 msgid "You have entered a port that may be useful for this service:"
 msgstr "Du har opgivet en port som kan v�re til nytte for denne tjeneste:"
 
-#: ../proxy_wizard/proxy.wiz_.c:24
+#: ../proxy_wizard/proxy.wiz_.c:27
 msgid "/etc/services:"
 msgstr "/etc/services:"
 
-#: ../proxy_wizard/proxy.wiz_.c:25
+#: ../proxy_wizard/proxy.wiz_.c:28
 msgid "Cache hierarchy"
 msgstr "Cachehierarki"
 
-#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:22
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Denne hj�lper skal k�res som root"
-
-#: ../proxy_wizard/proxy.wiz_.c:27
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
@@ -1111,11 +1128,11 @@ msgstr ""
 "Du kan trygt v�lge \\qIngen �vre niveau-proxy\\q hvis du ikke beh�ver denne "
 "funktion."
 
-#: ../proxy_wizard/proxy.wiz_.c:28
+#: ../proxy_wizard/proxy.wiz_.c:30
 msgid "Port:"
 msgstr "Port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
 "As an option, Squid can be configured in proxy cascading. You can add a new "
 "upper level proxy by specifying its hostname and port."
@@ -1123,68 +1140,61 @@ msgstr ""
 "Du kan v�lge at konfigurere Squid i proxy-kaskade. Du kan tilf�je en ny �vre "
 "niveau-proxy ved at specificere v�rtsnavn og port."
 
-#: ../proxy_wizard/proxy.wiz_.c:31
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Som information er her /var/spool/squid-plads p� disken:"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
+#: ../proxy_wizard/proxy.wiz_.c:34
 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/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
 msgid "Memory cache (MB):"
 msgstr "Hukommelsescache (MB):"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Ingen �vre niveau-proxy (anbefalet)"
 
-#: ../proxy_wizard/proxy.wiz_.c:36
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Denne hj�lper vil hj�lpe dig med at konfigurere din proxy-server."
-
-#: ../proxy_wizard/proxy.wiz_.c:37
+#: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Proxy cache-st�rrelse"
 
-#: ../proxy_wizard/proxy.wiz_.c:38
+#: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Klik p� Tilbage for at �ndre v�rdien."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
 "Proxy port value sets what port the proxy server will listen on for http "
 "requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"needs to be greater than 1024."
 msgstr ""
 "Proxy-portv�rdi s�tter hvilke porte som proxy-serveren vil lytte til for "
 "http-foresp�rgsler. Standard er 3128, andre normale valg kan v�re 8080, "
 "portv�rdien skal v�re st�rre end 1024."
 
-#: ../proxy_wizard/proxy.wiz_.c:39
-msgid "Press back to change the value."
-msgstr "Klik p� Tilbage for at �ndre v�rdien."
-
-#: ../proxy_wizard/proxy.wiz_.c:41
+#: ../proxy_wizard/proxy.wiz_.c:42
 msgid "Squid wizard"
 msgstr "Squid-hj�lper"
 
-#: ../proxy_wizard/proxy.wiz_.c:42
+#: ../proxy_wizard/proxy.wiz_.c:43
 msgid "Proxy port:"
 msgstr "Proxy-port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:44
+#: ../proxy_wizard/proxy.wiz_.c:45
 msgid "Disk space (MB):"
 msgstr "Diskplads (MB):"
 
-#: ../proxy_wizard/proxy.wiz_.c:45
+#: ../proxy_wizard/proxy.wiz_.c:46
 msgid "Upper level proxy hostname:"
 msgstr "�vre niveau-proxy v�rtsnavn:"
 
-#: ../proxy_wizard/proxy.wiz_.c:47
+#: ../proxy_wizard/proxy.wiz_.c:48
 msgid "Localhost - access restricted to this server only"
 msgstr "Lokalv�rt - adgang begr�nset til kun denne server"
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
 "Memory Cache is the amount of RAM dedicated to cache memory operations (note "
 "that actual memory usage of the whole squid process is bigger)."
@@ -1192,7 +1202,7 @@ msgstr ""
 "Hukommelseslager er m�ngden af RAM afsat til operationer p� hukommelseslager "
 "( bem�rk at faktisk hukommelsesforbrug af hele squid-processen er st�rre)."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
 "Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
 "the proxy to use."
@@ -1200,12 +1210,12 @@ msgstr ""
 "Indtast kvalificeret v�rtsnavn (som \\qcache.dom�ne.net\\q) og porten som "
 "proxyen skal bruge."
 
-#: ../proxy_wizard/proxy.wiz_.c:53
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 "Proxyen kan konfigureres til at bruge forskellige adgangkontrolniveauer."
 
-#: ../proxy_wizard/proxy.wiz_.c:54
+#: ../proxy_wizard/proxy.wiz_.c:55
 msgid "The wizard successfully configured your proxy server."
 msgstr "Hj�lperen har konfigureret din proxy-server uden problemer."
 
@@ -1229,11 +1239,15 @@ msgstr "Konfigurerer Samba"
 msgid "My rules - Ask me allowed and denied hosts"
 msgstr "Mine regler - Sp�rg mig om tilladte og afviste v�rter"
 
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../samba_wizard/samba.wiz_.c:11
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba skal kende de Windows-arbejdsgrupper den skal betjene."
+
+#: ../samba_wizard/samba.wiz_.c:12
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Bem�rk at adgang stadig kr�ver passende bruger-niveau adgangskoder."
 
-#: ../samba_wizard/samba.wiz_.c:11
+#: ../samba_wizard/samba.wiz_.c:13
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -1242,32 +1256,28 @@ msgstr ""
 "Samba kan tilbyde et f�lles fildelingsomr�de for din Windows-arbejdstation, "
 "og kan ogs� tilbyde printerdeling for printere tilkoblet din server."
 
-#: ../samba_wizard/samba.wiz_.c:12
+#: ../samba_wizard/samba.wiz_.c:14
 msgid "The wizard successfully configured your Samba server."
 msgstr "Hj�lperen konfigurerede din Samba-server uden problemer."
 
-#: ../samba_wizard/samba.wiz_.c:13
+#: ../samba_wizard/samba.wiz_.c:15
 msgid "Server Banner."
 msgstr "Server-beskrivelse."
 
-#: ../samba_wizard/samba.wiz_.c:14
+#: ../samba_wizard/samba.wiz_.c:16
 msgid "Print Server:"
 msgstr "Printserver:"
 
-#: ../samba_wizard/samba.wiz_.c:15
+#: ../samba_wizard/samba.wiz_.c:17
 msgid "Workgroup:"
 msgstr "Arbejdsgruppe:"
 
-#: ../samba_wizard/samba.wiz_.c:16
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba skal kende de Windows-arbejdsgrupper den skal betjene."
-
-#: ../samba_wizard/samba.wiz_.c:18
+#: ../samba_wizard/samba.wiz_.c:20
 msgid ""
 "* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr "* Eksempel 3: tillad et par v�rter\\nhosts allow = lapland, odin"
 
-#: ../samba_wizard/samba.wiz_.c:20
+#: ../samba_wizard/samba.wiz_.c:22
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1275,7 +1285,7 @@ msgstr ""
 "Du har valgt at tillade brugere adgang til deres hjemmekataloger via Samba, "
 "men du eller de skal bruge smbpasswd til at s�tte en adgangskode."
 
-#: ../samba_wizard/samba.wiz_.c:21
+#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
 "150.203. EXCEPT 150.203.6.66"
@@ -1283,19 +1293,19 @@ msgstr ""
 "* Eksempel 1: tillad alle IP'er i 150.203.*.*; undtagen �n\\nhosts allow = "
 "150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/samba.wiz_.c:23
+#: ../samba_wizard/samba.wiz_.c:24
 msgid "Printers:"
 msgstr "Printere:"
 
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../samba_wizard/samba.wiz_.c:25
 msgid "The Server Banner is incorrect"
 msgstr "Serverens beskrivelse er ukorrekt"
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:26
 msgid "Samba Configuration Wizard"
 msgstr "Konfigurationshj�lper for Samba"
 
-#: ../samba_wizard/samba.wiz_.c:26
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1303,11 +1313,12 @@ msgstr ""
 "Samba lader din server opf�re sig som en fil- og printerserver for "
 "arbejdstationer som k�re ikke-Linux-systemer."
 
-#: ../samba_wizard/samba.wiz_.c:27
+#: ../samba_wizard/samba.wiz_.c:28
 msgid "Deny hosts:"
 msgstr "Afvis v�rter:"
 
 #: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -1385,10 +1396,19 @@ msgid "Allow hosts:"
 msgstr "Tillad v�rter:"
 
 #: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
+"Indtast brugere eller gruppe adskilt af et komma (grupper skal have et "
+"foranstillet \\'@\\') p� denne m�de :\\nroot, fred, @users, @wheel for hver "
+"slags tilladelse."
+
+#: ../samba_wizard/samba.wiz_.c:50
 msgid "Access control"
 msgstr "Adgangskontrol"
 
-#: ../samba_wizard/samba.wiz_.c:51
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
 "from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
@@ -1396,19 +1416,10 @@ msgstr ""
 "* Eksempel 4: tillad kun v�rter i NIS netgruppe \\qfoonet\\q,  men afvis "
 "adgang fra en s�rlig v�rt\\nhosts allow = @foonet\\nhosts deny = pirate"
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:53
 msgid "Enable file sharing area"
 msgstr "Aktiv�r fildelingsomr�de"
 
-#: ../samba_wizard/samba.wiz_.c:54
-msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
-msgstr ""
-"Indtast brugere eller gruppe adskilt af et komma (grupper skal have et "
-"foranstillet \\'@\\') p� denne m�de :\\nroot, fred, @users, @wheel for hver "
-"slags tilladelse."
-
 #: ../samba_wizard/samba.wiz_.c:56
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
@@ -1425,27 +1436,39 @@ msgstr "Fildeling:"
 msgid "File permissions"
 msgstr "Filtilladelser"
 
-#: ../server_wizard/server.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:2
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "Denne hj�lper vil s�tte de grundl�ggende parametre p� din server."
+
+#: ../server_wizard/server.wiz_.c:4
 msgid "Host Name:"
 msgstr "V�rtsnavn:"
 
-#: ../server_wizard/server.wiz_.c:6
+#: ../server_wizard/server.wiz_.c:7
 msgid "Basic Network Configuration Wizard"
 msgstr "Hj�lper for basal netv�rkskonfigurering"
 
-#: ../server_wizard/server.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:8
 msgid "The network address is wrong"
 msgstr "Netv�rksadressen er forkert"
 
-#: ../server_wizard/server.wiz_.c:8
+#: ../server_wizard/server.wiz_.c:9
 msgid "Server IP address:"
 msgstr "IP-adresse for server:"
 
-#: ../server_wizard/server.wiz_.c:9
+#: ../server_wizard/server.wiz_.c:10
 msgid "Network Address"
 msgstr "Netv�rksadresse"
 
-#: ../server_wizard/server.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:12
+msgid ""
+"You should not run any other applications while running this wizard and at "
+"the end of the wizard you should exit your session and login again."
+msgstr ""
+"Du b�r ikke k�re nogen andre applikationer mens du k�rer denne hj�lper, og "
+"n�r hj�lperen er f�rdig b�r du afslutte din session og logge ind igen."
+
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
 "The wizard successfully configured the basic networking services of your "
 "server."
@@ -1453,12 +1476,12 @@ msgstr ""
 "Hj�lperen konfigurerede de basale netv�rkstjenester p� din server uden "
 "problemer."
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:14
 msgid ""
 "(you can change here these values if you know exactly what you're doing)"
 msgstr "(Du kan �ndre disse v�rdier her hvis du v�d pr�cis hvad du g�r)"
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:15
 msgid ""
 "The network address is a number identifying your network; the proposed value "
 "is designed for a configuration not connected to Internet, or connected "
@@ -1470,15 +1493,15 @@ msgstr ""
 "opkoblet ved brug af IP maskering; hvis du ikke v�d hvad du g�r, s� godtag "
 "standardv�rdien."
 
-#: ../server_wizard/server.wiz_.c:13
+#: ../server_wizard/server.wiz_.c:16
 msgid "Note about networking"
 msgstr "Kommentar om netv�rk"
 
-#: ../server_wizard/server.wiz_.c:14
+#: ../server_wizard/server.wiz_.c:17
 msgid "Server Address"
 msgstr "Serveradresse"
 
-#: ../server_wizard/server.wiz_.c:15
+#: ../server_wizard/server.wiz_.c:18
 msgid ""
 "Network addresses are a list of four numbers smaller than 256, separated by "
 "dots; the last number of the list must be zero."
@@ -1486,7 +1509,7 @@ msgstr ""
 "Netv�rksadressene er en liste med fire tal mindre end 256, adskilt med "
 "punktum; det sidste tal i listen skal v�re nul."
 
-#: ../server_wizard/server.wiz_.c:16
+#: ../server_wizard/server.wiz_.c:19
 msgid ""
 "Note: the gateway IP address should be non empty if you want an access to "
 "outside world."
@@ -1494,39 +1517,35 @@ msgstr ""
 "Bem�rk: gateway IP-adressen b�r ikke v�re tom hvis du �nsker adgang til "
 "verdenen udenfor."
 
-#: ../server_wizard/server.wiz_.c:17
+#: ../server_wizard/server.wiz_.c:20
 msgid "The Server IP address is incorrect"
 msgstr "Serverens IP-adresse er ukorrekt"
 
-#: ../server_wizard/server.wiz_.c:18
+#: ../server_wizard/server.wiz_.c:21
 msgid "Configuring your network"
 msgstr "Konfigurerer dit netv�rk"
 
-#: ../server_wizard/server.wiz_.c:19
+#: ../server_wizard/server.wiz_.c:22
 msgid "Gateway IP:"
 msgstr "Gateway-IP:"
 
-#: ../server_wizard/server.wiz_.c:20
-msgid ""
-"You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
-msgstr ""
-"Du b�r ikke k�re nogen andre applikationer mens du k�rer denne hj�lper, og "
-"n�r hj�lperen er f�rdig b�r du afslutte din session og logge ind igen."
+#: ../server_wizard/server.wiz_.c:23
+msgid "This page computes the default server address; it should be invisible."
+msgstr "Denne side beregner standard serveradresse; b�r v�re usynlig."
 
-#: ../server_wizard/server.wiz_.c:21
+#: ../server_wizard/server.wiz_.c:24
 msgid "IP net address:"
 msgstr "IP-netadresse:"
 
-#: ../server_wizard/server.wiz_.c:23
+#: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Ekstern gateway"
 
-#: ../server_wizard/server.wiz_.c:24
+#: ../server_wizard/server.wiz_.c:26
 msgid "Server Wizard"
 msgstr "Serverhj�lper"
 
-#: ../server_wizard/server.wiz_.c:25
+#: ../server_wizard/server.wiz_.c:27
 msgid ""
 "So, it's very probable that domain name and IP adresses for this local "
 "network are DIFFERENT from the server \\qexternal\\q connection."
@@ -1534,7 +1553,7 @@ msgstr ""
 "Det er meget sandsynligt at dom�nenavnet og IP-adresserne for dette lokale "
 "netv�rk er FORSKELLIGT fra serverens \\qeksterne\\q opkobling."
 
-#: ../server_wizard/server.wiz_.c:26
+#: ../server_wizard/server.wiz_.c:28
 msgid ""
 "Choose the network device (usually a card) the server should use to connect "
 "to your network. It's the device for the local network, probably not the "
@@ -1544,7 +1563,7 @@ msgstr ""
 "til dit netv�rk. Det er enheden til det lokale netv�rk, sandsynligvis ikke "
 "den samme enhed som bruges til internet-adgang."
 
-#: ../server_wizard/server.wiz_.c:27
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1552,7 +1571,7 @@ msgstr ""
 "Enheder er presenteret med Linux-navnet og, hvis kendt, med beskrivelse af "
 "kortet."
 
-#: ../server_wizard/server.wiz_.c:28
+#: ../server_wizard/server.wiz_.c:30
 msgid ""
 "Here is your current value for the external gateway (value specified during "
 "the initial installation). The device (network card or modem) should be "
@@ -1562,15 +1581,15 @@ msgstr ""
 "installation). Enheden (netv�rkskort eller modem) b�r v�re forskellig fra "
 "den som bruges til det interne netv�rk."
 
-#: ../server_wizard/server.wiz_.c:29
+#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"This wizard will help you in configuring the basic networking services of "
+"your server."
 msgstr ""
-"Som det fremg�r af disse hj�lpere, bliver din maskine set som en server som "
-"h�ndterer sit eget lokale netv�rk (klasse C-netv�rk)."
+"Denne hj�lper vil hj�lpe dig med at konfigurere de grundl�ggende "
+"netv�rkstjenester p� din server."
 
-#: ../server_wizard/server.wiz_.c:30
+#: ../server_wizard/server.wiz_.c:32
 msgid ""
 "The server IP address is a number identifing your server in your network; "
 "the proposed value designed for a private network , with no internet "
@@ -1582,11 +1601,11 @@ msgstr ""
 "internettet eller opkoblet ved brug af IP maskering; hvis du ikke v�d hvad "
 "du g�r, s� brug standardv�rdien."
 
-#: ../server_wizard/server.wiz_.c:32
+#: ../server_wizard/server.wiz_.c:34
 msgid "The host name is not correct"
 msgstr "V�rtsnavnet er ikke rigtigt"
 
-#: ../server_wizard/server.wiz_.c:33
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1596,27 +1615,27 @@ msgstr ""
 "arbejdsstationer i dit netv�rk og m�ske p� Internettet (afh�ngig af din "
 "upstream konfiguration)."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:36
 msgid "Wizard Error."
 msgstr "Fejl p� hj�lperen."
 
-#: ../server_wizard/server.wiz_.c:35
+#: ../server_wizard/server.wiz_.c:37
 msgid "net device"
 msgstr "netenhed"
 
-#: ../server_wizard/server.wiz_.c:36
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Denne side beregner dom�nenavnet; det b�r v�re usynligt"
-
-#: ../server_wizard/server.wiz_.c:37
+#: ../server_wizard/server.wiz_.c:38
 msgid "Computed domain Name"
 msgstr "Beregnet dom�nenavn"
 
-#: ../server_wizard/server.wiz_.c:38
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Denne side beregner dom�nenavnet; det b�r v�re usynligt"
+
+#: ../server_wizard/server.wiz_.c:40
 msgid "Gateway device:"
 msgstr "Gateway-enhed:"
 
-#: ../server_wizard/server.wiz_.c:39
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
@@ -1624,14 +1643,6 @@ msgstr ""
 "Hj�lperen samlede f�lgende parametre som beh�ves for at konfigurere dit "
 "netv�rk"
 
-#: ../server_wizard/server.wiz_.c:40
-msgid "This page compute the default server address; should be invisible."
-msgstr "Denne side beregner standard serveradresse; b�r v�re usynlig."
-
-#: ../server_wizard/server.wiz_.c:42
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "Denne hj�lper vil s�tte de grundl�ggende parametre p� din server."
-
 #: ../server_wizard/server.wiz_.c:43
 msgid "Warning"
 msgstr "Advarsel"
@@ -1641,16 +1652,16 @@ msgid "Device:"
 msgstr "Enhed:"
 
 #: ../server_wizard/server.wiz_.c:46
-msgid "Server Address:"
-msgstr "Serveradresse:"
-
-#: ../server_wizard/server.wiz_.c:47
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"Denne hj�lper vil hj�lpe dig med at konfigurere de grundl�ggende "
-"netv�rkstjenester p� din server."
+"Som det fremg�r af disse hj�lpere, bliver din maskine set som en server som "
+"h�ndterer sit eget lokale netv�rk (klasse C-netv�rk)."
+
+#: ../server_wizard/server.wiz_.c:47
+msgid "Server Address:"
+msgstr "Serveradresse:"
 
 #: ../server_wizard/server.wiz_.c:49
 msgid ""
@@ -1730,85 +1741,85 @@ msgid "University of Regina, Regina, Saskatchewan, Canada"
 msgstr "Universitetet i Regina, Regina, Saskatchewan, Canada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Hvis tidsserveren ikke er umiddelbart tilg�ngelig (pga. netv�rket eller "
-"andre �rsager), vil du vente i omkring 30 sekunder."
-
-#: ../time_wizard/time.wiz_.c:11
 msgid "Trinity College, Dublin, Ireland"
 msgstr "Trinity College, Dublin, Irland"
 
-#: ../time_wizard/time.wiz_.c:12
+#: ../time_wizard/time.wiz_.c:11
 msgid "Singapore"
 msgstr "Singapore"
 
-#: ../time_wizard/time.wiz_.c:13
+#: ../time_wizard/time.wiz_.c:12
 msgid "Secondary Time Server:"
 msgstr "Sekund�r tidsserver:"
 
-#: ../time_wizard/time.wiz_.c:14
+#: ../time_wizard/time.wiz_.c:13
 msgid "Try again"
 msgstr "Fors�g igen"
 
-#: ../time_wizard/time.wiz_.c:15
+#: ../time_wizard/time.wiz_.c:14
 msgid "The Chinese University of Hong Kong"
 msgstr "The Chinese University of Hong Kong"
 
-#: ../time_wizard/time.wiz_.c:16
+#: ../time_wizard/time.wiz_.c:15
 msgid "UNLV College of Engineering, Las Vegas, NV"
 msgstr "UNLV College of Engineering, Las Vegas, NV, USA"
 
-#: ../time_wizard/time.wiz_.c:17
+#: ../time_wizard/time.wiz_.c:16
 msgid "Altea (Alicante/SPAIN)"
 msgstr "Altea (Alicante/Spanien)"
 
-#: ../time_wizard/time.wiz_.c:18
+#: ../time_wizard/time.wiz_.c:17
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "National Research Council of Canada, Ottawa, Ontario, Canada"
 
-#: ../time_wizard/time.wiz_.c:19
+#: ../time_wizard/time.wiz_.c:18
 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/time.wiz_.c:20
+#: ../time_wizard/time.wiz_.c:19
 msgid "CISM, Lyon, France"
 msgstr "CISM, Lyon, Frankrig"
 
-#: ../time_wizard/time.wiz_.c:21
+#: ../time_wizard/time.wiz_.c:20
 msgid "Inet, Inc., Seoul, Korea"
 msgstr "Inet, Inc., Seoul, Korea"
 
-#: ../time_wizard/time.wiz_.c:22
+#: ../time_wizard/time.wiz_.c:21
 msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
 msgstr "Scientific Center i Chernogolovka, Moskva-regionen, Rusland"
 
-#: ../time_wizard/time.wiz_.c:23
+#: ../time_wizard/time.wiz_.c:22
 msgid "Washington State University Tri-Cities, Richland, Wa"
 msgstr "Washington State University Tri-Cities, Richland, Wa, USA"
 
-#: ../time_wizard/time.wiz_.c:24
+#: ../time_wizard/time.wiz_.c:23
 msgid "University of Adelaide, South Australia"
 msgstr "Universitet i Adelaide, Syd-Australien"
 
-#: ../time_wizard/time.wiz_.c:25
+#: ../time_wizard/time.wiz_.c:24
 msgid "Time zone:"
 msgstr "Tidszone:"
 
-#: ../time_wizard/time.wiz_.c:26
+#: ../time_wizard/time.wiz_.c:25
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Tidsserverne svarer ikke �rsagerne kan v�re:"
 
-#: ../time_wizard/time.wiz_.c:27
+#: ../time_wizard/time.wiz_.c:26
 msgid "CRIUC, Universite de Caen, France"
 msgstr "CRIUC, Universite de Caen, Frankrig"
 
-#: ../time_wizard/time.wiz_.c:28
+#: ../time_wizard/time.wiz_.c:27
 msgid "- other reasons..."
 msgstr "- andre �rsager..."
 
+#: ../time_wizard/time.wiz_.c:28
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Hvis tidsserveren ikke er umiddelbart tilg�ngelig (pga. netv�rket eller "
+"andre �rsager), vil du vente i omkring 30 sekunder."
+
 #: ../time_wizard/time.wiz_.c:29
 msgid "WARNING"
 msgstr "ADVARSEL"
@@ -1912,7 +1923,7 @@ msgstr "Computer Science Department, University of Wisconsin-Madison, USA"
 
 #: ../web_wizard/web.wiz_.c:2
 msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
+"* User module : allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
@@ -1937,51 +1948,70 @@ msgid "Modules :"
 msgstr "Moduler:"
 
 #: ../web_wizard/web.wiz_.c:6
+#, fuzzy
+msgid "Document root:"
+msgstr "Dokumentrod:"
+
+#: ../web_wizard/web.wiz_.c:7
 msgid "user http sub-directory : ~/"
 msgstr "brugers http-underkatalog: ~/"
 
-#: ../web_wizard/web.wiz_.c:8
+#: ../web_wizard/web.wiz_.c:9
 msgid "Enable the Web Server for the Intranet"
 msgstr "Aktiv�r web-serveren for Intranettet"
 
-#: ../web_wizard/web.wiz_.c:11
+#: ../web_wizard/web.wiz_.c:12
 msgid "Configuring the Web Server"
 msgstr "Konfigurerer webserveren"
 
-#: ../web_wizard/web.wiz_.c:12
+#: ../web_wizard/web.wiz_.c:13
 msgid "Web Server"
 msgstr "Webserver"
 
-#: ../web_wizard/web.wiz_.c:13
+#: ../web_wizard/web.wiz_.c:14
 msgid "Enable the Web Server for the Internet"
 msgstr "Aktiv�r web-serveren for Internettet"
 
-#: ../web_wizard/web.wiz_.c:14
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Delt kat.:"
+
+#: ../web_wizard/web.wiz_.c:16
+#, fuzzy
 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/web.wiz_.c:15
+#: ../web_wizard/web.wiz_.c:17
 msgid "Web wizard"
 msgstr "Webhj�lper"
 
-#: ../web_wizard/web.wiz_.c:16
+#: ../web_wizard/web.wiz_.c:18
 msgid "Intranet web server:"
 msgstr "Intranet-webserver:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
+msgid ""
+"Type the name of the directory users should create in their homes (whitout "
+"~/) to get it available via http://www.yourserver.com/~user"
+msgstr ""
+"Indtast navnet p� det katalog, brugere b�r oprette i deres hjemmekatalog "
+"(uden ~/) for at f� det tilg�ngeligt via http://www.din-server.dk/~bruger"
+
+#: ../web_wizard/web.wiz_.c:25
 msgid "activate user module"
 msgstr "aktiv�r brugermodul"
 
-#: ../web_wizard/web.wiz_.c:23
+#: ../web_wizard/web.wiz_.c:26
 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/web.wiz_.c:24
+#: ../web_wizard/web.wiz_.c:27
 msgid "Select the kind of Web service you want to activate:"
 msgstr "V�lg hvilken form af webtjeneste du vil aktivere:"
 
-#: ../web_wizard/web.wiz_.c:25
+#: ../web_wizard/web.wiz_.c:28
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "Server"
@@ -1989,39 +2019,23 @@ msgstr ""
 "Hj�lperen samlede f�lgende parametre som beh�ves for at konfigurere din web-"
 "server"
 
-#: ../web_wizard/web.wiz_.c:26
-msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
-"~/) to get it available via http://www.yourserver.com/~user"
-msgstr ""
-"Indtast navnet p� det katalog, brugere b�r oprette i deres hjemmekatalog "
-"(uden ~/) for at f� det tilg�ngeligt via http://www.din-server.dk/~bruger"
-
-#: ../web_wizard/web.wiz_.c:27
+#: ../web_wizard/web.wiz_.c:29
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 "Hj�lperen konfigurerede din Intranet/Internet web-server uden problemer"
 
-#: ../web_wizard/web.wiz_.c:28
-msgid "user dir:"
-msgstr "Bruger kat.:"
-
-#: ../web_wizard/web.wiz_.c:29
+#: ../web_wizard/web.wiz_.c:30
 msgid "Document Root:"
 msgstr "Dokumentrod:"
 
-#: ../web_wizard/web.wiz_.c:30
+#: ../web_wizard/web.wiz_.c:31
 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/web.wiz_.c:31
+#: ../web_wizard/web.wiz_.c:32
 msgid "Web Server Configuration Wizard"
 msgstr "Konfigurationshj�lper for webserver"
 
-#: ../web_wizard/web.wiz_.c:32
-msgid "document root:"
-msgstr "dokumentrod:"
-
 msgid "Cancel"
 msgstr "Annull�r"
 
@@ -2037,6 +2051,12 @@ msgstr "aktiveret"
 msgid "disabled"
 msgstr "deaktiveret"
 
+#~ msgid "user dir:"
+#~ msgstr "Bruger kat.:"
+
+#~ msgid "document root:"
+#~ msgstr "dokumentrod:"
+
 #~ msgid ""
 #~ "You can set the time of your machine in two ways: Locally means that the "
 #~ "setting will simply set the system clock, without synchronizing with the "
diff --git a/po/de.po b/po/de.po
index f96151cb..147fbc34 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-08-14 21:15+0200\n"
 "Last-Translator: Stefan Siegel <siegel@linuc-mandrake.com> 2002\n"
 "Language-Team:  German <cooker-i18n@linux-mandrake.com>\n"
@@ -18,373 +18,379 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr ""
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "OK"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
-msgstr ""
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "DNS-Klienten Assistent"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr ""
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
-"The wizard collected the following parameters needed to add a client to your "
-"network:"
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
+"The wizard collected the following parameters needed to add a client to your "
+"network:"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr ""
+msgid "The wizard successfully added the client."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Einen neuen Klienten in Ihr Netzwerk aufnehmen"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(Sie müssen die Domäne nach dem Rechnernamen nicht angeben)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr ""
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Warnung:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(Sie müssen die Domäne nach dem Rechnernamen nicht angeben)"
+#, fuzzy
+msgid "Name of the machine:"
+msgstr "Rechnername:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
+msgid "Adding a new client to your network"
+msgstr "Einen neuen Klienten in Ihr Netzwerk aufnehmen"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
+msgid "Client identification:"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr ""
 
 #: ../client_wizard/client.wiz_.c:17
-#, fuzzy
-msgid "Name of the machine:"
-msgstr "Rechnername:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "OK"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:21
-msgid "DNS Wizard (add client)"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:23
-#, fuzzy
-msgid "IP number of the machine:"
-msgstr "IP des Rechners:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr ""
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+msgid "DNS Wizard (add client)"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
+msgstr ""
+
+#: ../client_wizard/client.wiz_.c:28
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
 msgstr ""
 
+#: ../client_wizard/client.wiz_.c:30
+#, fuzzy
+msgid "IP number of the machine:"
+msgstr "IP des Rechners:"
+
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Warnung:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
+#: ../db_wizard/db.wiz_.c:1
+msgid "User addition"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
+#: ../db_wizard/db.wiz_.c:2
+msgid ""
+"To accept this value, and configure your server, click on \\qConfirm\\q or "
+"use the Back button to correct them."
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:5
-msgid "User addition"
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:6
-msgid ""
-"To accept this value, and configure your server, click on \\qConfirm\\q or "
-"use the Back button to correct them."
+msgid "Configuring the MySQL Database Server"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:7
-#, fuzzy
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+msgid "Confirm"
+msgstr ""
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
+msgid "Password:"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr ""
+#, fuzzy
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr ""
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
+msgid "Username:"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
+msgid "Add"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
+msgid "Database Server"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
+msgid "Note: This user will have all permissions"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:17
-msgid "Note: This user will have all permissions"
+msgid "MySQL Database wizard"
+msgstr ""
+
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:20
-msgid "Add"
+msgid "To run your server, you first need to specify a root password"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
+msgid "Root Password:"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:25
-msgid "To run your server, you first need to specify a root password"
+#: ../db_wizard/db.wiz_.c:24
+msgid ""
+"The wizard collected the following parameters needed to configure your MySQL "
+"Database Server"
 msgstr ""
 
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+
 #: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
+msgid "Please enter a username and password to add a user"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:27
 msgid ""
-"The wizard collected the following parameters needed to configure your MySQL "
-"Database Server"
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
-msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr ""
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Höchste IP-Adresse:"
+msgid "Lowest IP Address:"
+msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr ""
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr ""
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 #, fuzzy
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr ""
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
-msgstr ""
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr ""
+msgid "Highest IP Address:"
+msgstr "Höchste IP-Adresse:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
+msgid "DHCP Configuration Wizard"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr ""
 
+#: ../dns_wizard/dns.wiz_.c:1
+msgid ""
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
+msgstr ""
+
 #: ../dns_wizard/dns.wiz_.c:2
-msgid "DNS Wizard (configuration)"
+msgid "Press next to leave these values empty, or back to enter a value."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:8
-msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:9
@@ -392,21 +398,10 @@ msgid "Configuring the DNS Server"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
+msgid "DNS Configuration Wizard"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr ""
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -414,38 +409,45 @@ msgid ""
 "by your Internet provider."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+#, fuzzy
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
+#: ../dns_wizard/dns.wiz_.c:17
+msgid ""
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:20
-msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+msgid "Secondary DNS Address:"
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:22
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
 
 #: ../dns_wizard/dns.wiz_.c:23
-#, fuzzy
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+msgid "DNS Wizard (configuration)"
+msgstr ""
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -456,576 +458,574 @@ msgid "Please select a wizard"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
+msgid "Medium - web, ftp and ssh shown to outside"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
+#: ../firewall_wizard/firewall.wiz_.c:5
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
+msgid "Device"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr ""
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
+msgid "Internet Network Device:"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-#, fuzzy
-msgid "The wizard successfully configured your server firewall."
-msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
+msgid "The device name is not correct"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr ""
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
 msgstr ""
 
+#: ../firewall_wizard/firewall.wiz_.c:21
+#, fuzzy
+msgid "The wizard successfully configured your server firewall."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+
 #: ../firewall_wizard/firewall.wiz_.c:22
-msgid "This wizard will help you configuring your server firewall."
+msgid "Configuring the Firewall"
 msgstr ""
 
-#: ../firewall_wizard/firewall.wiz_.c:23
-msgid "Low - Light filtering, standard services available"
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr ""
+#, fuzzy
+msgid "This wizard will help you configuring your server firewall."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
+msgid "Low - Light filtering, standard services available"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
+msgid "Protection Level:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
+#: ../ftp_wizard/ftp.wiz_.c:3
+msgid "Public directory:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:4
 msgid "Internet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+#: ../ftp_wizard/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+#: ../ftp_wizard/ftp.wiz_.c:7
+msgid "FTP wizard"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:12
-msgid "Public directory:"
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
+#: ../ftp_wizard/ftp.wiz_.c:11
+msgid "Don't check any box if you don't want to activate your FTP Server."
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
+#: ../ftp_wizard/ftp.wiz_.c:12
+msgid "Configuring the FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:17
-msgid ""
-"The wizard collected the following parameters needed to configure your FTP "
-"Server"
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
+#: ../ftp_wizard/ftp.wiz_.c:15
+msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:22
-msgid "FTP Server Configuration Wizard"
+#: ../ftp_wizard/ftp.wiz_.c:21
+msgid ""
+"The wizard collected the following parameters needed to configure your FTP "
+"Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
 msgstr ""
 
 #: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
+msgid "FTP Server Configuration Wizard"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"Your server can act as an FTP Server toward your internal network (intranet) "
+"and as an FTP Server for the Internet."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
+msgid "Polling Interval:"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
+msgid "Polling Period"
 msgstr ""
 
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
+#: ../news_wizard/news.wiz_.c:4
+msgid ""
+"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/news.wiz_.c:6
-msgid "News Server"
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:9
-msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
-"Internet News; the polling period set the interval between two consecutive "
-"polling."
+msgid "The polling period is not correct"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr ""
 
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr ""
+
 #: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
+msgid ""
+"Depending on the kind of internet connection you have, an appropriate "
+"polling period can change between 6 and 24 hours."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:13
 msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
+"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/news.wiz_.c:15
-msgid "Polling Period"
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:16
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
-"polling period can change between 6 and 24 hours."
+"The wizard collected the following parameters needed to configure your "
+"Internet News Service:"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr ""
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
+msgid "Polling Period (Hours):"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:19
-msgid ""
-"The news server name is the name of the host providing the Internet news to "
-"your network; the name is usually provided by your provider."
+msgid "News Server Name:"
 msgstr ""
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"The wizard collected the following parameters needed to configure your "
-"Internet News Service:"
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:22
-msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
-msgstr ""
-
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
+msgid "Welcome to the News Wizard"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:24
-msgid ""
-"The wizard successfully configured your Internet News service of your server."
+msgid "News Server"
 msgstr ""
 
 #: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
+msgid "News Server:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
-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."
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:3
-msgid "NFS Server Configuration Wizard"
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
+msgid ""
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
-msgid "NFS Server"
+#: ../nfs_wizard/nfs.wiz_.c:4
+msgid "Access :"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-#, fuzzy
-msgid "The wizard successfully configured your NFS Server"
-msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
-
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
-msgid "All - No access restriction"
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
 msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:11
-#, fuzzy
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+#: ../nfs_wizard/nfs.wiz_.c:9
+msgid "The wizard collected the following parameters."
+msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
+#: ../nfs_wizard/nfs.wiz_.c:10
+msgid "NFS Server Configuration Wizard"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:13
+#: ../nfs_wizard/nfs.wiz_.c:11
 msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
+#: ../nfs_wizard/nfs.wiz_.c:13
+#, fuzzy
+msgid "NFS Wizard"
+msgstr "DNS-Klienten Assistent"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
 msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
+msgid "NFS Server"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
+msgid "All - No access restriction"
 msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:18
-msgid "The wizard collected the following parameters."
+msgid "Netmask :"
 msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:19
-msgid "Access :"
+msgid "Directory:"
 msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr ""
+#, fuzzy
+msgid "This wizard will help you configuring the NFS Server for your network."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../nfs_wizard/nfs.wiz_.c:21
 #, fuzzy
-msgid "NFS Wizard"
-msgstr "DNS-Klienten Assistent"
+msgid "The wizard successfully configured your NFS Server"
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
-msgid "Do It"
+#: ../postfix_wizard/postfix.wiz_.c:2
+msgid "There seems to be a problem..."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:3
-msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+msgid "Internet Mail Gateway"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
+msgid "Outgoing Mail Address"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:6
-msgid "Postfix wizard"
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:7
-msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+msgid "Do It"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"This wizard will help you configuring the Internet Mail services for your "
-"network."
-msgstr ""
-
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:10
-msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
+msgid "Hmmm"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
+msgid "Internet Mail Configuration Wizard"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"POSTFIX configuration"
+msgid "Postfix wizard"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
+msgid "Mail Server Name:"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet mail server is "
-"usually \\qsmtp.provider.com\\q."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet Mail services for your "
+"network."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+
 #: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
+msgid ""
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
-"The wizard collected the following parameters needed to configure your "
-"Internet Mail Service:"
+"If you choose to configure now, you will automatically continue with the "
+"POSTFIX configuration"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:20
-msgid "Mail Address:"
+msgid ""
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet mail server is "
+"usually \\qsmtp.provider.com\\q."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr ""
-
-#: ../postfix_wizard/postfix.wiz_.c:22
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
+msgid "Configuring the Internet Mail"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
+#: ../postfix_wizard/postfix.wiz_.c:25
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"Internet Mail Service:"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
+msgid "Masquerade not good!"
 msgstr ""
 
 #: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
+msgid "Form of the Address"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:2
-msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
+#: ../postfix_wizard/postfix.wiz_.c:29
+msgid "Mail Address:"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:4
-#, fuzzy
-msgid "The wizard successfully configured your proxy server."
-msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
-
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
+msgid "Proxy Configuration Wizard"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
+msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:9
-msgid ""
-"Squid is a web caching proxy server, it allows faster web access for your "
-"local network."
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:13
 msgid "Define an upper level proxy"
 msgstr ""
 
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr ""
+
 #: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
+msgid ""
+"Squid is a web caching proxy server, it allows faster web access for your "
+"local network."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
+msgid "Proxy Port"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:26
-msgid ""
-"You can safely select \\qNo upper level proxy\\q if you don't need this "
-"feature."
+msgid "You have entered a port that may be useful for this service:"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
+msgid "/etc/services:"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
+msgid "Cache hierarchy"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"You can safely select \\qNo upper level proxy\\q if you don't need this "
+"feature."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
+msgid "Port:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
+#: ../proxy_wizard/proxy.wiz_.c:31
+msgid ""
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:34
-msgid "No upper level proxy (recommended)"
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
+#: ../proxy_wizard/proxy.wiz_.c:37
+msgid "No upper level proxy (recommended)"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:38
@@ -1033,342 +1033,340 @@ msgid "Proxy Cache Size"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:39
-msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+msgid "Press back to change the value."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
+#: ../proxy_wizard/proxy.wiz_.c:41
+msgid ""
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
+msgid "Squid wizard"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
+msgid "Proxy port:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:46
-msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:49
-msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+#: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:50
-msgid "The proxy can be configured to use different access control levels."
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
+#: ../proxy_wizard/proxy.wiz_.c:50
+msgid ""
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
+#: ../proxy_wizard/proxy.wiz_.c:52
+msgid ""
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
+msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:1
-msgid "Enable file sharing area"
-msgstr ""
+#: ../proxy_wizard/proxy.wiz_.c:55
+#, fuzzy
+msgid "The wizard successfully configured your proxy server."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
+#: ../samba_wizard/samba.wiz_.c:3
+msgid "Home:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
+#: ../samba_wizard/samba.wiz_.c:4
+msgid "Enable all printer"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
+msgid "Make home directories available for their owners"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
+msgid "Configuring Samba"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
+#: ../samba_wizard/samba.wiz_.c:11
+msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+#, fuzzy
+msgid "The wizard successfully configured your Samba server."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
+msgid "Server Banner."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
+msgid ""
+"You have selected to allow user access their home directories via samba but "
+"you/they must use smbpasswd to set a password."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:23
 msgid ""
-"You have selected to allow user access their home directories via samba but "
-"you/they must use smbpasswd to set a password."
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
+msgid "Printers:"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:25
-msgid "Enable all printer"
+msgid "The Server Banner is incorrect"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:26
-msgid ""
-"Samba allows your server to behave as a file and print server for "
-"workstations running non-Linux systems."
+msgid "Samba Configuration Wizard"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:28
-msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr ""
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr ""
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
+msgid "Enabled Samba Services"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:40
-msgid "Access control"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:43
-#, fuzzy
-msgid "The wizard successfully configured your Samba server."
-msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
+msgid "The Workgroup is wrong"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
+msgid "Samba wizard"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:46
 msgid "Access level :"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
+msgid "Workgroup"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
-msgid "Make home directories available for their owners"
+#: ../samba_wizard/samba.wiz_.c:50
+msgid "Access control"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
+#: ../samba_wizard/samba.wiz_.c:53
+msgid "Enable file sharing area"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:56
-msgid "Printers:"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
+msgid "File Sharing:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
+msgid "This wizard will set the basic networking parameters of your server."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
+msgid "Host Name:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
+#: ../server_wizard/server.wiz_.c:7
+msgid "Basic Network Configuration Wizard"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:7
-msgid "net device"
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
+msgid "Server IP address:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:10
-msgid ""
-"You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+msgid "Network Address"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
+"You should not run any other applications while running this wizard and at "
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"The wizard successfully configured the basic networking services of your "
+"server."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
+msgid "Note about networking"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
+msgid "Server Address"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
+msgid "The Server IP address is incorrect"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
+msgid "Configuring your network"
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
+msgid "This page computes the default server address; it should be invisible."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
+msgid "IP net address:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:25
@@ -1376,439 +1374,449 @@ msgid "External gateway"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
+msgid "Server Wizard"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
+msgid ""
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
+msgid ""
+"Devices are presented with the Linux name and, if known, with the card "
+"description."
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"This wizard will help you in configuring the basic networking services of "
+"your server."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
-"Devices are presented with the Linux name and, if known, with the card "
-"description."
+"The hostname is the name under which your server will be known from the "
+"other workstations in your network and maybe on the Internet (depending of "
+"your upstream configuration)."
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
+msgid "net device"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
+msgid "Computed domain Name"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
+msgid "This page computes the domainname; it should be invisible"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:40
-msgid ""
-"The hostname is the name under which your server will be known from the "
-"other workstations in your network and maybe on the Internet (depending of "
-"your upstream configuration)."
+msgid "Gateway device:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:42
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
+msgid "Device:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
+msgid "Server Address:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
+msgid "Host Name"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
+msgid "Network Address:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
+msgid "Network Device"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
+msgid "Server Name:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
+msgid "University of Manchester, Manchester, England"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
+msgid "SCI, Universite de Limoges, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
+msgid "Press next to start the time servers test."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgid "(please, choose servers in your geographical area)"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
+msgid "Trinity College, Dublin, Ireland"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
+msgid "Singapore"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
+msgid "Secondary Time Server:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
+msgid "The Chinese University of Hong Kong"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
+msgid "Altea (Alicante/SPAIN)"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:18
-msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
+msgid "Select a primary and secondary server from the list."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
+msgid "CISM, Lyon, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
+msgid "Inet, Inc., Seoul, Korea"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
+msgid "Washington State University Tri-Cities, Richland, Wa"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
+msgid "University of Adelaide, South Australia"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
+msgid "Time zone:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
+msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgid "CRIUC, Universite de Caen, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
+msgid "- other reasons..."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
+msgid "WARNING"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
+msgid "Loria, Nancy, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:31
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
+msgid "Fukuoka university, Fukuoka, Japan"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
+msgid "Time Servers"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
+msgid "LAAS/CNRS, Toulouse, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
+msgid "Testing the time servers availability"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr ""
-
-#: ../time_wizard/time.wiz_.c:39
-msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
+msgid "Save config without test"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
+msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
+msgid "Baylor College of Medicine, Houston, Tx"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
+msgid "Penn State University, University Park, PA"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr ""
+#, fuzzy
+msgid "Time wizard"
+msgstr "Klienten Assistent"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgid "University of Oslo, Norway"
+msgstr ""
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
+msgid "- no outside network"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
+msgid "Primary Time Server:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
+msgid "Time server configuration saved"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
+msgid "Choose a time zone:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:53
-#, fuzzy
-msgid "Time wizard"
-msgstr "Klienten Assistent"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
+msgid "Computer Science Department, University of Wisconsin-Madison"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid ""
+"Your server can act as a Web Server toward your internal network (intranet) "
+"and as a Web Server for the Internet."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "Internet web server:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:12
-msgid "Internet web server:"
+msgid "Configuring the Web Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
+msgid "Web Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+msgid "Enable the Web Server for the Internet"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:15
-msgid "Enable the Web Server for the Internet"
+msgid "User directory:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr ""
+#, fuzzy
+msgid "This wizard will help you configuring the Web Server for your network."
+msgstr "Der Assistent hat den Klienten erfolgreich hinzugefügt."
 
 #: ../web_wizard/web.wiz_.c:17
-msgid "document root:"
+msgid "Web wizard"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr ""
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
+msgid "Don't check any box if you don't want to activate your Web Server."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
+msgid "Select the kind of Web service you want to activate:"
+msgstr ""
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr ""
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
+msgid "Web Server Configuration Wizard"
 msgstr ""
 
 msgid "Cancel"
diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index c9a32750..84357580 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-01-16 00:06+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+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"
@@ -24,9 +24,9 @@ msgstr ""
 
 #: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
 #: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
-#: ../ftp_wizard/ftp.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:5
-#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:4
-#: ../web_wizard/web.wiz_.c:10
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
 msgid "OK"
 msgstr ""
 
@@ -72,7 +72,7 @@ msgid ""
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
-#: ../postfix_wizard/postfix.wiz_.c:21 ../proxy_wizard/proxy.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
 msgid "Warning:"
 msgstr ""
 
@@ -120,18 +120,18 @@ msgstr ""
 #: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
 #: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
 #: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
-#: ../nfs_wizard/nfs.wiz_.c:4 ../proxy_wizard/proxy.wiz_.c:33
-#: ../samba_wizard/samba.wiz_.c:28 ../server_wizard/server.wiz_.c:31
-#: ../web_wizard/web.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
 msgid "Configure"
 msgstr ""
 
-#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:9
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
 msgid "You need to be root to run this wizard"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
-#: ../postfix_wizard/postfix.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:40
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
 #: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr ""
@@ -145,17 +145,17 @@ msgid "DNS Wizard (add client)"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
-#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:16
-#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
-#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:11
-#: ../postfix_wizard/postfix.wiz_.c:15 ../proxy_wizard/proxy.wiz_.c:43
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
 #: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
-#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:17
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
 msgid "Quit"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
-#: ../ftp_wizard/ftp.wiz_.c:20 ../web_wizard/web.wiz_.c:19
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
 msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
 
@@ -168,10 +168,10 @@ msgstr ""
 #: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
 #: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
 #: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
-#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:16
-#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:53 ../server_wizard/server.wiz_.c:48
-#: ../web_wizard/web.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
 msgid "Congratulations"
 msgstr ""
 
@@ -186,7 +186,7 @@ msgid ""
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:52
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
 #: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
@@ -235,8 +235,8 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:19
-#: ../web_wizard/web.wiz_.c:18
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
 msgid "Sorry, you must be root to do this..."
 msgstr ""
 
@@ -311,15 +311,15 @@ msgid "Lowest IP Address:"
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
-#: ../server_wizard/server.wiz_.c:2
+#: ../server_wizard/server.wiz_.c:3
 msgid "IP addresses are a dotted list of four numbers smaller than 256."
 msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:9
-#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:3
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
 #: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
-#: ../server_wizard/server.wiz_.c:5 ../web_wizard/web.wiz_.c:9
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -384,21 +384,15 @@ msgstr ""
 msgid "Primary DNS Address:"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:8
-msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
-msgstr ""
-
-#: ../dns_wizard/dns.wiz_.c:10
+#: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:11
+#: ../dns_wizard/dns.wiz_.c:10
 msgid "DNS Configuration Wizard"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:12
+#: ../dns_wizard/dns.wiz_.c:11
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -406,24 +400,30 @@ msgid ""
 "by your Internet provider."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:13
+#: ../dns_wizard/dns.wiz_.c:12
 msgid "The wizard successfully configured the DNS services of your server."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:14
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "The wizard collected the following parameters needed to configure your DNS "
 "service:"
 msgstr ""
 
-#: ../dns_wizard/dns.wiz_.c:17
+#: ../dns_wizard/dns.wiz_.c:16
 msgid "DNS Server Addresses"
 msgstr ""
 
+#: ../dns_wizard/dns.wiz_.c:17
+msgid ""
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
+msgstr ""
+
 #: ../dns_wizard/dns.wiz_.c:20
 msgid "Secondary DNS Address:"
 msgstr ""
@@ -495,7 +495,7 @@ msgid "The device name is not correct"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
-#: ../server_wizard/server.wiz_.c:41
+#: ../server_wizard/server.wiz_.c:42
 msgid "Fix It"
 msgstr ""
 
@@ -514,7 +514,7 @@ msgid "Protection Level"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
-#: ../proxy_wizard/proxy.wiz_.c:23 ../samba_wizard/samba.wiz_.c:19
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
 msgid "Something terrible happened"
 msgstr ""
 
@@ -531,7 +531,7 @@ msgid "Configuring the Firewall"
 msgstr ""
 
 #: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
-#: ../proxy_wizard/proxy.wiz_.c:50 ../samba_wizard/samba.wiz_.c:55
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
 #: ../server_wizard/server.wiz_.c:51
 msgid "Exit"
 msgstr ""
@@ -560,54 +560,54 @@ msgstr ""
 msgid "Internet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:6 ../samba_wizard/samba.wiz_.c:29
-msgid "Shared dir:"
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:6
 msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:8
+#: ../ftp_wizard/ftp.wiz_.c:7
 msgid "FTP wizard"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:11
+#: ../ftp_wizard/ftp.wiz_.c:10
 msgid "FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:12
+#: ../ftp_wizard/ftp.wiz_.c:11
 msgid "Don't check any box if you don't want to activate your FTP Server."
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:13
+#: ../ftp_wizard/ftp.wiz_.c:12
 msgid "Configuring the FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:14
+#: ../ftp_wizard/ftp.wiz_.c:13
 msgid "Enable the FTP Server for the Internet"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:14
 msgid "Intranet FTP Server:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:16
+#: ../ftp_wizard/ftp.wiz_.c:15
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:16
 msgid "Select the kind of FTP service you want to activate:"
 msgstr ""
 
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr ""
+
 #: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:17
-#: ../web_wizard/web.wiz_.c:20
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -712,168 +712,168 @@ msgstr ""
 msgid "News Server:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:30
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
 msgid "Access Control"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:2
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
 "Access will be allowed for hosts on the network. Here is the information "
 "found about your current local network, you can modify it if needed."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:4
 msgid "Access :"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
 msgid "Local Network - access for local network (recommended)"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:8
 msgid "Exported dir:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:9
 msgid "The wizard collected the following parameters."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:8
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:9
+#: ../nfs_wizard/nfs.wiz_.c:11
 msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:19
-msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
-"secure."
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:12
+#: ../nfs_wizard/nfs.wiz_.c:13
 msgid "NFS Wizard"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:13 ../proxy_wizard/proxy.wiz_.c:20
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
 msgid "Grant access on local network"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:14
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:15 ../proxy_wizard/proxy.wiz_.c:46
-#: ../samba_wizard/samba.wiz_.c:50
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:17
+#: ../nfs_wizard/nfs.wiz_.c:18
 msgid "Netmask :"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../nfs_wizard/nfs.wiz_.c:19
 msgid "Directory:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:19
+#: ../nfs_wizard/nfs.wiz_.c:20
 msgid "This wizard will help you configuring the NFS Server for your network."
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:20
+#: ../nfs_wizard/nfs.wiz_.c:21
 msgid "The wizard successfully configured your NFS Server"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:21 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Authorised network:"
+#: ../postfix_wizard/postfix.wiz_.c:2
+msgid "There seems to be a problem..."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:2
+#: ../postfix_wizard/postfix.wiz_.c:3
 msgid "Internet Mail Gateway"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:5
 msgid "Outgoing Mail Address"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:5
+#: ../postfix_wizard/postfix.wiz_.c:6
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:10
 msgid "Hmmm"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:11
 msgid "You entered an empty address for the mail gateway."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:11
+#: ../postfix_wizard/postfix.wiz_.c:12
 msgid "Internet Mail Configuration Wizard"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:14
 msgid "Mail Server Name:"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:14
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:16
+#: ../postfix_wizard/postfix.wiz_.c:17
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
 "usually \\qsmtp.provider.com\\q."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:20
+#: ../postfix_wizard/postfix.wiz_.c:21
 msgid ""
 "You can select the kind of address that outgoing mail will show in the "
 "\\qFrom:\\q and \\qReply-to\\q field."
 msgstr ""
 
-#: ../postfix_wizard/postfix.wiz_.c:22
-msgid "There seems to be a problem... go ask to the big black man downstairs"
-msgstr ""
-
 #: ../postfix_wizard/postfix.wiz_.c:23
 msgid "Configuring the Internet Mail"
 msgstr ""
@@ -910,158 +910,158 @@ msgstr ""
 msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:9
-msgid "Access Control:"
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:10
-msgid "Configuring the Proxy"
+msgid "Access Control:"
 msgstr ""
 
 #: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:13
 msgid "Define an upper level proxy"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:12
+#: ../proxy_wizard/proxy.wiz_.c:14
 msgid "Filesystem            Size  Used Avail Use% Mounted on"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:13
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:14
+#: ../proxy_wizard/proxy.wiz_.c:16
+msgid "This wizard will help you in configuring your proxy server."
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:17
 msgid "Upper level proxy port:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:15
+#: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr ""
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:16
+#: ../proxy_wizard/proxy.wiz_.c:20
 msgid "Proxy Port"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:17
+#: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
 "You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
 "a text format like \\q.domain.net\\q"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:22
 msgid ""
 "Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:21
+#: ../proxy_wizard/proxy.wiz_.c:24
 msgid "You have entered a port that may be useful for this service:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:24
+#: ../proxy_wizard/proxy.wiz_.c:27
 msgid "/etc/services:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:25
+#: ../proxy_wizard/proxy.wiz_.c:28
 msgid "Cache hierarchy"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:22
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:27
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:28
+#: ../proxy_wizard/proxy.wiz_.c:30
 msgid "Port:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
 "As an option, Squid can be configured in proxy cascading. You can add a new "
 "upper level proxy by specifying its hostname and port."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:31
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:32
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
 msgid "Memory cache (MB):"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:35
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:36
-msgid "This wizard will help you configuring your proxy server."
+#: ../proxy_wizard/proxy.wiz_.c:38
+msgid "Proxy Cache Size"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:37
-msgid "Proxy Cache Size"
+#: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:38
+#: ../proxy_wizard/proxy.wiz_.c:41
 msgid ""
 "Proxy port value sets what port the proxy server will listen on for http "
 "requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"needs to be greater than 1024."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:39
-msgid "Press back to change the value."
-msgstr ""
-
-#: ../proxy_wizard/proxy.wiz_.c:41
+#: ../proxy_wizard/proxy.wiz_.c:42
 msgid "Squid wizard"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:42
+#: ../proxy_wizard/proxy.wiz_.c:43
 msgid "Proxy port:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:44
+#: ../proxy_wizard/proxy.wiz_.c:45
 msgid "Disk space (MB):"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:45
+#: ../proxy_wizard/proxy.wiz_.c:46
 msgid "Upper level proxy hostname:"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:47
+#: ../proxy_wizard/proxy.wiz_.c:48
 msgid "Localhost - access restricted to this server only"
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
 "Memory Cache is the amount of RAM dedicated to cache memory operations (note "
 "that actual memory usage of the whole squid process is bigger)."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:51
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
 "Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
 "the proxy to use."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:53
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 
-#: ../proxy_wizard/proxy.wiz_.c:54
+#: ../proxy_wizard/proxy.wiz_.c:55
 msgid "The wizard successfully configured your proxy server."
 msgstr ""
 
@@ -1085,73 +1085,73 @@ msgstr ""
 msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../samba_wizard/samba.wiz_.c:11
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:12
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:11
+#: ../samba_wizard/samba.wiz_.c:13
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
 "server."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:12
+#: ../samba_wizard/samba.wiz_.c:14
 msgid "The wizard successfully configured your Samba server."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:13
+#: ../samba_wizard/samba.wiz_.c:15
 msgid "Server Banner."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:14
+#: ../samba_wizard/samba.wiz_.c:16
 msgid "Print Server:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:15
+#: ../samba_wizard/samba.wiz_.c:17
 msgid "Workgroup:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:16
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:18
+#: ../samba_wizard/samba.wiz_.c:20
 msgid ""
 "* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:20
+#: ../samba_wizard/samba.wiz_.c:22
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:21
+#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
 "150.203. EXCEPT 150.203.6.66"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:23
+#: ../samba_wizard/samba.wiz_.c:24
 msgid "Printers:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../samba_wizard/samba.wiz_.c:25
 msgid "The Server Banner is incorrect"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:26
 msgid "Samba Configuration Wizard"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:26
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:27
+#: ../samba_wizard/samba.wiz_.c:28
 msgid "Deny hosts:"
 msgstr ""
 
@@ -1226,25 +1226,25 @@ msgid "Allow hosts:"
 msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:50
 msgid "Access control"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
 "from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:53
 msgid "Enable file sharing area"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:54
-msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
-msgstr ""
-
 #: ../samba_wizard/samba.wiz_.c:56
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
@@ -1259,38 +1259,48 @@ msgstr ""
 msgid "File permissions"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:2
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:4
 msgid "Host Name:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:6
+#: ../server_wizard/server.wiz_.c:7
 msgid "Basic Network Configuration Wizard"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:8
 msgid "The network address is wrong"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:8
+#: ../server_wizard/server.wiz_.c:9
 msgid "Server IP address:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:9
+#: ../server_wizard/server.wiz_.c:10
 msgid "Network Address"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:12
+msgid ""
+"You should not run any other applications while running this wizard and at "
+"the end of the wizard you should exit your session and login again."
+msgstr ""
+
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
 "The wizard successfully configured the basic networking services of your "
 "server."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:14
 msgid ""
 "(you can change here these values if you know exactly what you're doing)"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:15
 msgid ""
 "The network address is a number identifying your network; the proposed value "
 "is designed for a configuration not connected to Internet, or connected "
@@ -1298,89 +1308,87 @@ msgid ""
 "default value."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:13
+#: ../server_wizard/server.wiz_.c:16
 msgid "Note about networking"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:14
+#: ../server_wizard/server.wiz_.c:17
 msgid "Server Address"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:15
+#: ../server_wizard/server.wiz_.c:18
 msgid ""
 "Network addresses are a list of four numbers smaller than 256, separated by "
 "dots; the last number of the list must be zero."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:16
+#: ../server_wizard/server.wiz_.c:19
 msgid ""
 "Note: the gateway IP address should be non empty if you want an access to "
 "outside world."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:17
+#: ../server_wizard/server.wiz_.c:20
 msgid "The Server IP address is incorrect"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:18
+#: ../server_wizard/server.wiz_.c:21
 msgid "Configuring your network"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:19
+#: ../server_wizard/server.wiz_.c:22
 msgid "Gateway IP:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:20
-msgid ""
-"You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+#: ../server_wizard/server.wiz_.c:23
+msgid "This page computes the default server address; it should be invisible."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:21
+#: ../server_wizard/server.wiz_.c:24
 msgid "IP net address:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:23
+#: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:24
+#: ../server_wizard/server.wiz_.c:26
 msgid "Server Wizard"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:25
+#: ../server_wizard/server.wiz_.c:27
 msgid ""
 "So, it's very probable that domain name and IP adresses for this local "
 "network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:26
+#: ../server_wizard/server.wiz_.c:28
 msgid ""
 "Choose the network device (usually a card) the server should use to connect "
 "to your network. It's the device for the local network, probably not the "
 "same device used for internet access."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:27
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:28
+#: ../server_wizard/server.wiz_.c:30
 msgid ""
 "Here is your current value for the external gateway (value specified during "
 "the initial installation). The device (network card or modem) should be "
 "different from the one used for the internal network."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:29
+#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"This wizard will help you in configuring the basic networking services of "
+"your server."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:30
+#: ../server_wizard/server.wiz_.c:32
 msgid ""
 "The server IP address is a number identifing your server in your network; "
 "the proposed value designed for a private network , with no internet "
@@ -1388,51 +1396,43 @@ msgid ""
 "doing, accept the default value."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:32
+#: ../server_wizard/server.wiz_.c:34
 msgid "The host name is not correct"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:33
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
 "your upstream configuration)."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:36
 msgid "Wizard Error."
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:35
+#: ../server_wizard/server.wiz_.c:37
 msgid "net device"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:36
-msgid "This page compute the domainname; it should be invisible"
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Computed domain Name"
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:38
+#: ../server_wizard/server.wiz_.c:40
 msgid "Gateway device:"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:39
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:40
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-
-#: ../server_wizard/server.wiz_.c:42
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr ""
-
 #: ../server_wizard/server.wiz_.c:43
 msgid "Warning"
 msgstr ""
@@ -1442,13 +1442,13 @@ msgid "Device:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:46
-msgid "Server Address:"
+msgid ""
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:47
-msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+msgid "Server Address:"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:49
@@ -1520,81 +1520,81 @@ msgid "University of Regina, Regina, Saskatchewan, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:10
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
+msgid "Trinity College, Dublin, Ireland"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "Trinity College, Dublin, Ireland"
+msgid "Singapore"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "Singapore"
+msgid "Secondary Time Server:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "Secondary Time Server:"
+msgid "Try again"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Try again"
+msgid "The Chinese University of Hong Kong"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "The Chinese University of Hong Kong"
+msgid "UNLV College of Engineering, Las Vegas, NV"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "UNLV College of Engineering, Las Vegas, NV"
+msgid "Altea (Alicante/SPAIN)"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Altea (Alicante/SPAIN)"
+msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:18
-msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
+msgid "Select a primary and secondary server from the list."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:19
-msgid "Select a primary and secondary server from the list."
+msgid "CISM, Lyon, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "CISM, Lyon, France"
+msgid "Inet, Inc., Seoul, Korea"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:21
-msgid "Inet, Inc., Seoul, Korea"
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgid "Washington State University Tri-Cities, Richland, Wa"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "Washington State University Tri-Cities, Richland, Wa"
+msgid "University of Adelaide, South Australia"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "University of Adelaide, South Australia"
+msgid "Time zone:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Time zone:"
+msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "The time servers are not responding. The causes could be:"
+msgid "CRIUC, Universite de Caen, France"
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "CRIUC, Universite de Caen, France"
+msgid "- other reasons..."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "- other reasons..."
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
 msgstr ""
 
 #: ../time_wizard/time.wiz_.c:29
@@ -1697,7 +1697,7 @@ msgstr ""
 
 #: ../web_wizard/web.wiz_.c:2
 msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
+"* User module : allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
@@ -1717,83 +1717,83 @@ msgid "Modules :"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:6
-msgid "user http sub-directory : ~/"
+msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Enable the Web Server for the Intranet"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "Configuring the Web Server"
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:12
-msgid "Web Server"
+msgid "Configuring the Web Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Internet"
+msgid "Web Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:14
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "Enable the Web Server for the Internet"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:15
-msgid "Web wizard"
+msgid "User directory:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:16
-msgid "Intranet web server:"
+msgid "This wizard will help you configuring the Web Server for your network."
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:22
-msgid "activate user module"
+#: ../web_wizard/web.wiz_.c:17
+msgid "Web wizard"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:23
-msgid "Don't check any box if you don't want to activate your Web Server."
+#: ../web_wizard/web.wiz_.c:18
+msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Select the kind of Web service you want to activate:"
+#: ../web_wizard/web.wiz_.c:20
+msgid ""
+"Type the name of the directory users should create in their homes (whitout "
+"~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
-"~/) to get it available via http://www.yourserver.com/~user"
+msgid "Don't check any box if you don't want to activate your Web Server."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "Select the kind of Web service you want to activate:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:28
-msgid "user dir:"
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Document Root:"
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:30
-msgid "Type the path of the directory you want being the document root."
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "Web Server Configuration Wizard"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "document root:"
+msgid "Web Server Configuration Wizard"
 msgstr ""
 
 msgid "Cancel"
diff --git a/po/es.po b/po/es.po
index 01bb7a79..c8e49a94 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.1\n"
-"POT-Creation-Date: 2003-01-16 00:06+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2003-01-15 12:15-0300\n"
 "Last-Translator: Fabian Mandelbaum\n"
 "Language-Team: Espa�ol\n"
@@ -21,9 +21,9 @@ msgstr ""
 
 #: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
 #: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
-#: ../ftp_wizard/ftp.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:5
-#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:4
-#: ../web_wizard/web.wiz_.c:10
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
 msgid "OK"
 msgstr "Aceptar"
 
@@ -79,7 +79,7 @@ msgstr ""
 "la red."
 
 #: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
-#: ../postfix_wizard/postfix.wiz_.c:21 ../proxy_wizard/proxy.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
 msgid "Warning:"
 msgstr "Advertencia:"
 
@@ -131,18 +131,18 @@ msgstr "IP del cliente:"
 #: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
 #: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
 #: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
-#: ../nfs_wizard/nfs.wiz_.c:4 ../proxy_wizard/proxy.wiz_.c:33
-#: ../samba_wizard/samba.wiz_.c:28 ../server_wizard/server.wiz_.c:31
-#: ../web_wizard/web.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
 msgid "Configure"
 msgstr "Configurar"
 
-#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:9
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
 msgid "You need to be root to run this wizard"
 msgstr "Debe ser el superusuario (root) para ejecutar este asistente"
 
 #: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
-#: ../postfix_wizard/postfix.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:40
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
 #: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Todav�a no est� configurada la red"
@@ -156,17 +156,17 @@ msgid "DNS Wizard (add client)"
 msgstr "Asistente DNS (a�adir cliente)"
 
 #: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
-#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:16
-#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
-#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:11
-#: ../postfix_wizard/postfix.wiz_.c:15 ../proxy_wizard/proxy.wiz_.c:43
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
 #: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
-#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:17
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
 msgid "Quit"
 msgstr "Salir"
 
 #: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
-#: ../ftp_wizard/ftp.wiz_.c:20 ../web_wizard/web.wiz_.c:19
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
 msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
 "Advertencia\n"
@@ -183,10 +183,10 @@ msgstr ""
 #: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
 #: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
 #: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
-#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:16
-#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:53 ../server_wizard/server.wiz_.c:48
-#: ../web_wizard/web.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
 msgid "Congratulations"
 msgstr "Felicidades"
 
@@ -203,7 +203,7 @@ msgstr ""
 "corregir su elecci�n."
 
 #: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:52
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
 #: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
@@ -256,8 +256,8 @@ msgstr "Nombre de usuario:"
 msgid "Add"
 msgstr "A�adir"
 
-#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:19
-#: ../web_wizard/web.wiz_.c:18
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
 msgid "Sorry, you must be root to do this..."
 msgstr "Lo siento, debe ser el superusuario (root) para hacer esto..."
 
@@ -299,6 +299,7 @@ msgstr ""
 "su servidor de base de datos MySQL"
 
 #: ../db_wizard/db.wiz_.c:25
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the MySQL Database Server for your "
 "network."
@@ -342,17 +343,17 @@ msgid "Lowest IP Address:"
 msgstr "Direcci�n IP m�s baja:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
-#: ../server_wizard/server.wiz_.c:2
+#: ../server_wizard/server.wiz_.c:3
 msgid "IP addresses are a dotted list of four numbers smaller than 256."
 msgstr ""
 "Las direcci�n IP son una lista de cuatro n�meros menores a 256 separados por "
 "puntos."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:9
-#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:3
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
 #: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
-#: ../server_wizard/server.wiz_.c:5 ../web_wizard/web.wiz_.c:9
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -365,6 +366,7 @@ msgid "DHCP Wizard"
 msgstr "Asistente de DHCP"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
 msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr ""
 "Este asistente lo ayudar� a configurar los servicios DHCP de su servidor."
@@ -429,23 +431,15 @@ msgstr ""
 msgid "Primary DNS Address:"
 msgstr "Direcci�n DNS primaria:"
 
-#: ../dns_wizard/dns.wiz_.c:8
-msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
-msgstr ""
-"DNS (Servidor de Nombres de Dominio) es el servicio que hace corresponder "
-"una m�quina con un nombre de host de Internet."
-
-#: ../dns_wizard/dns.wiz_.c:10
+#: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "Configurando el servidor de DNS"
 
-#: ../dns_wizard/dns.wiz_.c:11
+#: ../dns_wizard/dns.wiz_.c:10
 msgid "DNS Configuration Wizard"
 msgstr "Asistente de configuraci�n del DNS"
 
-#: ../dns_wizard/dns.wiz_.c:12
+#: ../dns_wizard/dns.wiz_.c:11
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -457,15 +451,15 @@ msgstr ""
 "de los servidores DNS primario y secundario; por lo general su proveedor de "
 "Internet le da estas direcciones."
 
-#: ../dns_wizard/dns.wiz_.c:13
+#: ../dns_wizard/dns.wiz_.c:12
 msgid "The wizard successfully configured the DNS services of your server."
 msgstr "El asistente configur� exitosamente los servicios DNS de su servidor."
 
-#: ../dns_wizard/dns.wiz_.c:14
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Ha ingresado una direcci�n en blanco para el servidor DNS."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "The wizard collected the following parameters needed to configure your DNS "
 "service:"
@@ -473,15 +467,24 @@ msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su servicio de DNS:"
 
-#: ../dns_wizard/dns.wiz_.c:17
+#: ../dns_wizard/dns.wiz_.c:16
 msgid "DNS Server Addresses"
 msgstr "Direcciones del servidor de DNS"
 
+#: ../dns_wizard/dns.wiz_.c:17
+msgid ""
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
+msgstr ""
+"DNS (Servidor de Nombres de Dominio) es el servicio que hace corresponder "
+"una m�quina con un nombre de host de Internet."
+
 #: ../dns_wizard/dns.wiz_.c:20
 msgid "Secondary DNS Address:"
 msgstr "Direcci�n DNS secundaria:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the DNS services of your server. This "
 "configuration will provide a local DNS service for local computers names, "
@@ -558,7 +561,7 @@ msgid "The device name is not correct"
 msgstr "El nombre del dispositivo no es correcto"
 
 #: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
-#: ../server_wizard/server.wiz_.c:41
+#: ../server_wizard/server.wiz_.c:42
 msgid "Fix It"
 msgstr "Corregirlo"
 
@@ -580,7 +583,7 @@ msgid "Protection Level"
 msgstr "Nivel de protecci�n"
 
 #: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
-#: ../proxy_wizard/proxy.wiz_.c:23 ../samba_wizard/samba.wiz_.c:19
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
 msgid "Something terrible happened"
 msgstr "Ocurri� algo terrible"
 
@@ -597,12 +600,13 @@ msgid "Configuring the Firewall"
 msgstr "Configurando el cortafuegos"
 
 #: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
-#: ../proxy_wizard/proxy.wiz_.c:50 ../samba_wizard/samba.wiz_.c:55
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
 #: ../server_wizard/server.wiz_.c:51
 msgid "Exit"
 msgstr "Salir"
 
 #: ../firewall_wizard/firewall.wiz_.c:24
+#, fuzzy
 msgid "This wizard will help you configuring your server firewall."
 msgstr "Este asistente lo ayudara a configurar el cortafuegos en su servidor."
 
@@ -615,6 +619,7 @@ msgid "Protection Level:"
 msgstr "Nivel de protecci�n:"
 
 #: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr "Este asistente lo ayudar� a configurar el servidor FTP para su red."
 
@@ -626,46 +631,46 @@ msgstr "Directorio p�blico:"
 msgid "Internet FTP Server:"
 msgstr "Servidor de FTP Internet:"
 
-#: ../ftp_wizard/ftp.wiz_.c:6 ../samba_wizard/samba.wiz_.c:29
-msgid "Shared dir:"
-msgstr "Directorio compartido:"
-
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:6
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Activar el servidor FTP para la Intranet"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
+#: ../ftp_wizard/ftp.wiz_.c:7
 msgid "FTP wizard"
 msgstr "Asistente de FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:11
+#: ../ftp_wizard/ftp.wiz_.c:10
 msgid "FTP Server"
 msgstr "Servidor FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:12
+#: ../ftp_wizard/ftp.wiz_.c:11
 msgid "Don't check any box if you don't want to activate your FTP Server."
 msgstr "No marque ninguna casilla si no desea activar su servidor FTP."
 
-#: ../ftp_wizard/ftp.wiz_.c:13
+#: ../ftp_wizard/ftp.wiz_.c:12
 msgid "Configuring the FTP Server"
 msgstr "Configurando el servidor FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:14
+#: ../ftp_wizard/ftp.wiz_.c:13
 msgid "Enable the FTP Server for the Internet"
 msgstr "Activar el servidor FTP para la Internet"
 
-#: ../ftp_wizard/ftp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:14
 msgid "Intranet FTP Server:"
 msgstr "Servidor FTP Intranet:"
 
-#: ../ftp_wizard/ftp.wiz_.c:16
+#: ../ftp_wizard/ftp.wiz_.c:15
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr "El asistente configur� exitosamente su servidor FTP Intranet/Internet"
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:16
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Seleccione que clase de servicio FTP quiere activar:"
 
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr "Directorio compartido:"
+
 #: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
@@ -674,8 +679,8 @@ msgstr ""
 "El asistente recolect� lo siguientes par�metros necesarios para configurar "
 "su servidor FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:17
-#: ../web_wizard/web.wiz_.c:20
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
 msgid "The path you entered does not exist."
 msgstr "La ruta que ingres� no existe."
 
@@ -714,6 +719,7 @@ msgstr ""
 "entre dos consultas consecutivas."
 
 #: ../news_wizard/news.wiz_.c:5
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet News services for your "
 "network."
@@ -799,11 +805,15 @@ msgstr "Servidor de noticias"
 msgid "News Server:"
 msgstr "Servidor de noticias:"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:30
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Red autorizada:"
+
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
 msgid "Access Control"
 msgstr "Control de acceso"
 
-#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:2
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
 "Access will be allowed for hosts on the network. Here is the information "
 "found about your current local network, you can modify it if needed."
@@ -812,97 +822,101 @@ msgstr ""
 "encontrada acerca de su red local corriente, si lo necesita puede "
 "modificarla."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:4
 msgid "Access :"
 msgstr "Acceso:"
 
-#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
 msgid "Local Network - access for local network (recommended)"
 msgstr "Red local - acceso a la red local (recomendado)"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+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."
+
+#: ../nfs_wizard/nfs.wiz_.c:8
 msgid "Exported dir:"
 msgstr "Directorio exportado:"
 
-#: ../nfs_wizard/nfs.wiz_.c:7
+#: ../nfs_wizard/nfs.wiz_.c:9
 msgid "The wizard collected the following parameters."
 msgstr "El asistente recolect� los siguientes par�metros."
 
-#: ../nfs_wizard/nfs.wiz_.c:8
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "Asistente de configuraci�n del servidor NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:9
+#: ../nfs_wizard/nfs.wiz_.c:11
 msgid "NFS can be restricted to a certain ip class"
 msgstr "NFS se puede restringir a una cierta clase de IP"
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:19
-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."
-
-#: ../nfs_wizard/nfs.wiz_.c:12
+#: ../nfs_wizard/nfs.wiz_.c:13
 msgid "NFS Wizard"
 msgstr "Asistente NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:13 ../proxy_wizard/proxy.wiz_.c:20
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
 msgid "Grant access on local network"
 msgstr "Garantizar acceso sobre la red local"
 
-#: ../nfs_wizard/nfs.wiz_.c:14
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "Servidor NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:15 ../proxy_wizard/proxy.wiz_.c:46
-#: ../samba_wizard/samba.wiz_.c:50
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "Todo - Sin restricci�n de acceso"
 
-#: ../nfs_wizard/nfs.wiz_.c:17
+#: ../nfs_wizard/nfs.wiz_.c:18
 msgid "Netmask :"
 msgstr "M�scara de red:"
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../nfs_wizard/nfs.wiz_.c:19
 msgid "Directory:"
 msgstr "Directorio:"
 
-#: ../nfs_wizard/nfs.wiz_.c:19
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 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.wiz_.c:20
+#: ../nfs_wizard/nfs.wiz_.c:21
 msgid "The wizard successfully configured your NFS Server"
 msgstr "El asistente configur� exitosamente su servidor NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:21 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Authorised network:"
-msgstr "Red autorizada:"
-
 #: ../postfix_wizard/postfix.wiz_.c:2
+#, fuzzy
+msgid "There seems to be a problem..."
+msgstr ""
+"Parece haber un problema... vaya a consultar con el tipo de la oficina de "
+"abajo"
+
+#: ../postfix_wizard/postfix.wiz_.c:3
 msgid "Internet Mail Gateway"
 msgstr "Pasarela de Correo de Internet"
 
-#: ../postfix_wizard/postfix.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:5
 msgid "Outgoing Mail Address"
 msgstr "Direcci�n de correo saliente"
 
-#: ../postfix_wizard/postfix.wiz_.c:5
+#: ../postfix_wizard/postfix.wiz_.c:6
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "El asistente configur� exitosamente el servicio de Correo de Internet para "
 "su servidor."
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "Hacerlo"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -910,27 +924,27 @@ msgstr ""
 "Esta deber�a elegirse consistentemente con la direcci�n que utiliza para el "
 "correo entrante."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:10
 msgid "Hmmm"
 msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:11
 msgid "You entered an empty address for the mail gateway."
 msgstr "Ha ingresado una direcci�n vacia para la pasarela de correo."
 
-#: ../postfix_wizard/postfix.wiz_.c:11
+#: ../postfix_wizard/postfix.wiz_.c:12
 msgid "Internet Mail Configuration Wizard"
 msgstr "Asistente de configuraci�n del correo de Internet"
 
-#: ../postfix_wizard/postfix.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Asistente Postfix"
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:14
 msgid "Mail Server Name:"
 msgstr "Nombre del servidor de correo:"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -939,7 +953,8 @@ msgstr ""
 "de su red local. Presione Siguiente para continuar, o Anterior para ingresar "
 "un valor."
 
-#: ../postfix_wizard/postfix.wiz_.c:16
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
@@ -947,7 +962,7 @@ msgstr ""
 "Este asistente lo ayudar� a configurar los servicios de Correo de Internet "
 "para su red."
 
-#: ../postfix_wizard/postfix.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -955,7 +970,7 @@ msgstr ""
 "Su servidor enviar� el correo saliente a trav�s de una pasarela de correo, "
 "la cual tomar� la responsabilidad del envio final."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -963,7 +978,7 @@ msgstr ""
 "Si selecciona configurar ahora, autom�ticamente continuar� con la "
 "configuraci�n de Postfix"
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -973,7 +988,7 @@ msgstr ""
 "tipodedominio\\q; por ejemplo, si su proveedor es \\qproveedor.com\\q, el "
 "servidor de correo de Internet por lo general es \\qsmtp.proveedor.com\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:20
+#: ../postfix_wizard/postfix.wiz_.c:21
 msgid ""
 "You can select the kind of address that outgoing mail will show in the "
 "\\qFrom:\\q and \\qReply-to\\q field."
@@ -981,12 +996,6 @@ msgstr ""
 "Puede seleccionar el tipo de direcci�n que mostar� el correo saliente en los "
 "campos \\qDe:\\q y \\qResponder-a\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:22
-msgid "There seems to be a problem... go ask to the big black man downstairs"
-msgstr ""
-"Parece haber un problema... vaya a consultar con el tipo de la oficina de "
-"abajo"
-
 #: ../postfix_wizard/postfix.wiz_.c:23
 msgid "Configuring the Internet Mail"
 msgstr "Configurando el correo de Internet"
@@ -1027,23 +1036,28 @@ msgstr "Asistente de configuraci�n del proxy"
 msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr "Debe elegir un puerto mayor que 1024 y menor que 65535"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Es necesario ejectuar este asistente como root"
+
+#: ../proxy_wizard/proxy.wiz_.c:10
 msgid "Access Control:"
 msgstr "Control de acceso:"
 
-#: ../proxy_wizard/proxy.wiz_.c:10
+#: ../proxy_wizard/proxy.wiz_.c:11
 msgid "Configuring the Proxy"
 msgstr "Configurando el Proxy"
 
-#: ../proxy_wizard/proxy.wiz_.c:11
+#: ../proxy_wizard/proxy.wiz_.c:13
 msgid "Define an upper level proxy"
 msgstr "Definir un proxy de nivel superior"
 
-#: ../proxy_wizard/proxy.wiz_.c:12
+#: ../proxy_wizard/proxy.wiz_.c:14
 msgid "Filesystem            Size  Used Avail Use% Mounted on"
 msgstr "Sist. de archivos     Tam.  Uso  Disp. Uso% Montado en"
 
-#: ../proxy_wizard/proxy.wiz_.c:13
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -1051,22 +1065,31 @@ msgstr ""
 "Squid es un servidor proxy web de cach�, permite que su red local acceda m�s "
 "r�pido a la web."
 
-#: ../proxy_wizard/proxy.wiz_.c:14
+#: ../proxy_wizard/proxy.wiz_.c:16
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Este asistente lo ayudar� a configurar su servidor proxy."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
 msgid "Upper level proxy port:"
 msgstr "Puerto del proxy de nivel superior:"
 
-#: ../proxy_wizard/proxy.wiz_.c:15
+#: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr ""
+"Para su informaci�n, aqu� tiene el tama�o de /var/spool/squid en disco:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "Cach� de disco es la cantidad de espacio en disco que se puede utilizar para "
 "almacenar el cach� en el disco."
 
-#: ../proxy_wizard/proxy.wiz_.c:16
+#: ../proxy_wizard/proxy.wiz_.c:20
 msgid "Proxy Port"
 msgstr "Puerto del proxy"
 
-#: ../proxy_wizard/proxy.wiz_.c:17
+#: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
 "You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
 "a text format like \\q.domain.net\\q"
@@ -1074,31 +1097,26 @@ msgstr ""
 "Puede usar un formato num�rico como \\q192.168.1.0/255.255.255.0\\q o un "
 "formato de texto como \\q.dominio.net\\q"
 
-#: ../proxy_wizard/proxy.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:22
 msgid ""
 "Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
 "Presione Siguiente si desea mantener este valor, o Anterior para corregir su "
 "elecci�n."
 
-#: ../proxy_wizard/proxy.wiz_.c:21
+#: ../proxy_wizard/proxy.wiz_.c:24
 msgid "You have entered a port that may be useful for this service:"
 msgstr "Ha ingresado un puerto que puede ser �til para este servicio:"
 
-#: ../proxy_wizard/proxy.wiz_.c:24
+#: ../proxy_wizard/proxy.wiz_.c:27
 msgid "/etc/services:"
 msgstr "/etc/services:"
 
-#: ../proxy_wizard/proxy.wiz_.c:25
+#: ../proxy_wizard/proxy.wiz_.c:28
 msgid "Cache hierarchy"
 msgstr "Jerarqu�a del cach�"
 
-#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:22
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Es necesario ejectuar este asistente como root"
-
-#: ../proxy_wizard/proxy.wiz_.c:27
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
@@ -1106,11 +1124,11 @@ msgstr ""
 "Puede seleccionar sin problemas \\qSin proxy de nivel superior\\q si no "
 "necesita esta caracter�stica."
 
-#: ../proxy_wizard/proxy.wiz_.c:28
+#: ../proxy_wizard/proxy.wiz_.c:30
 msgid "Port:"
 msgstr "Puerto:"
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
 "As an option, Squid can be configured in proxy cascading. You can add a new "
 "upper level proxy by specifying its hostname and port."
@@ -1119,69 +1137,61 @@ msgstr ""
 "un nuevo proxy de nivel superior especificando el nombre de host y puerto "
 "del mismo."
 
-#: ../proxy_wizard/proxy.wiz_.c:31
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr ""
-"Para su informaci�n, aqu� tiene el tama�o de /var/spool/squid en disco:"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
 "The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su proxy:"
 
-#: ../proxy_wizard/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
 msgid "Memory cache (MB):"
 msgstr "Memoria cach� (MB):"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Sin proxy de nivel superior (recomendado)"
 
-#: ../proxy_wizard/proxy.wiz_.c:36
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Este asistente lo ayudar� a configurar su servidor proxy."
-
-#: ../proxy_wizard/proxy.wiz_.c:37
+#: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Tama�o de cach� del proxy"
 
-#: ../proxy_wizard/proxy.wiz_.c:38
+#: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Presione Anterior para cambiar el valor."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
 "Proxy port value sets what port the proxy server will listen on for http "
 "requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"needs to be greater than 1024."
 msgstr ""
 "El valor del puerto del proxy configura el puerto en el cual el servidor "
 "proxy escuchar� pedidos HTTP. El predeterminado es 3128, otro valor com�n "
 "puede ser 8080; el valor del puerto debe ser superior a 1024."
 
-#: ../proxy_wizard/proxy.wiz_.c:39
-msgid "Press back to change the value."
-msgstr "Presione Anterior para cambiar el valor."
-
-#: ../proxy_wizard/proxy.wiz_.c:41
+#: ../proxy_wizard/proxy.wiz_.c:42
 msgid "Squid wizard"
 msgstr "Asistente de Squid"
 
-#: ../proxy_wizard/proxy.wiz_.c:42
+#: ../proxy_wizard/proxy.wiz_.c:43
 msgid "Proxy port:"
 msgstr "Puerto del proxy:"
 
-#: ../proxy_wizard/proxy.wiz_.c:44
+#: ../proxy_wizard/proxy.wiz_.c:45
 msgid "Disk space (MB):"
 msgstr "Espacio en disco (MB):"
 
-#: ../proxy_wizard/proxy.wiz_.c:45
+#: ../proxy_wizard/proxy.wiz_.c:46
 msgid "Upper level proxy hostname:"
 msgstr "Nombre de host del proxy de nivel superior:"
 
-#: ../proxy_wizard/proxy.wiz_.c:47
+#: ../proxy_wizard/proxy.wiz_.c:48
 msgid "Localhost - access restricted to this server only"
 msgstr "Localhost - acceso restringido s�lo a este servidor"
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
 "Memory Cache is the amount of RAM dedicated to cache memory operations (note "
 "that actual memory usage of the whole squid process is bigger)."
@@ -1189,7 +1199,7 @@ msgstr ""
 "Memoria cach� es la cantidad de RAM dedicada a operaciones de memoria cach� "
 "(note que el uso real de memoria de todo el proceso squid es mayor)"
 
-#: ../proxy_wizard/proxy.wiz_.c:51
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
 "Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
 "the proxy to use."
@@ -1197,13 +1207,13 @@ msgstr ""
 "Ingrese el nombre de host calificado (como \\qcache.dominio.net\\q) y el "
 "puerto a utilizar para el proxy."
 
-#: ../proxy_wizard/proxy.wiz_.c:53
+#: ../proxy_wizard/proxy.wiz_.c:54
 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 "
 "diferentes."
 
-#: ../proxy_wizard/proxy.wiz_.c:54
+#: ../proxy_wizard/proxy.wiz_.c:55
 msgid "The wizard successfully configured your proxy server."
 msgstr "El asistente configur� exitosamente su servidor proxy."
 
@@ -1227,12 +1237,16 @@ msgstr "Configurando Samba"
 msgid "My rules - Ask me allowed and denied hosts"
 msgstr "Mis reglas - Preguntarme los hosts permitidos y negados"
 
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../samba_wizard/samba.wiz_.c:11
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba necesita saber el Grupo de Trabajo Windows al que va a servir."
+
+#: ../samba_wizard/samba.wiz_.c:12
 msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 "Note que el acceso todav�a necesita contrase�as adecuadas a nivel de usuario."
 
-#: ../samba_wizard/samba.wiz_.c:11
+#: ../samba_wizard/samba.wiz_.c:13
 msgid ""
 "Samba can provide a common file sharing area to your Windows workstation, "
 "and can also provide printer sharing for the printers connected to your "
@@ -1242,33 +1256,29 @@ msgstr ""
 "de trabajo Windows, y tambi�n puede compartir las impresoras conectadas a su "
 "servidor."
 
-#: ../samba_wizard/samba.wiz_.c:12
+#: ../samba_wizard/samba.wiz_.c:14
 msgid "The wizard successfully configured your Samba server."
 msgstr "El asistente configur� exitosamente su servidor Samba."
 
-#: ../samba_wizard/samba.wiz_.c:13
+#: ../samba_wizard/samba.wiz_.c:15
 msgid "Server Banner."
 msgstr "Cartel del servidor."
 
-#: ../samba_wizard/samba.wiz_.c:14
+#: ../samba_wizard/samba.wiz_.c:16
 msgid "Print Server:"
 msgstr "Servidor de Impresi�n:"
 
-#: ../samba_wizard/samba.wiz_.c:15
+#: ../samba_wizard/samba.wiz_.c:17
 msgid "Workgroup:"
 msgstr "Grupo de trabajo:"
 
-#: ../samba_wizard/samba.wiz_.c:16
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba necesita saber el Grupo de Trabajo Windows al que va a servir."
-
-#: ../samba_wizard/samba.wiz_.c:18
+#: ../samba_wizard/samba.wiz_.c:20
 msgid ""
 "* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
 "* Ejemplo 3: permitir algunos hosts\\n hosts allow = lapland, arvidsjaur"
 
-#: ../samba_wizard/samba.wiz_.c:20
+#: ../samba_wizard/samba.wiz_.c:22
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1277,7 +1287,7 @@ msgstr ""
 "personales por medio de Samba que Usted/ellos deben usuar smbpasswd para "
 "configurar una contrase�a."
 
-#: ../samba_wizard/samba.wiz_.c:21
+#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
 "150.203. EXCEPT 150.203.6.66"
@@ -1285,19 +1295,19 @@ msgstr ""
 "* Ejemplo 1: permitir todas las IP en 150.203.*.*; excepto una\\n hosts "
 "allow = 150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/samba.wiz_.c:23
+#: ../samba_wizard/samba.wiz_.c:24
 msgid "Printers:"
 msgstr "Impresoras:"
 
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../samba_wizard/samba.wiz_.c:25
 msgid "The Server Banner is incorrect"
 msgstr "El Cartel del Servidor es incorrecto"
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:26
 msgid "Samba Configuration Wizard"
 msgstr "Asistente de configuraci�n de Samba"
 
-#: ../samba_wizard/samba.wiz_.c:26
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1305,11 +1315,12 @@ msgstr ""
 "Samba permite que su servidor se comporte como un servidor de archivos e "
 "impresoras para las estaciones de trabajo que no corren sistemas Linux."
 
-#: ../samba_wizard/samba.wiz_.c:27
+#: ../samba_wizard/samba.wiz_.c:28
 msgid "Deny hosts:"
 msgstr "Negar hosts:"
 
 #: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr ""
@@ -1388,10 +1399,19 @@ msgid "Allow hosts:"
 msgstr "Hosts permitidos:"
 
 #: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
+"Ingrese usuarios o grupos separados por una coma (los grupos deben "
+"precederse por una \\'@\\', por ejemplo:\\nroot, fred, @usuarios, @wheel "
+"para cada tipo de permiso."
+
+#: ../samba_wizard/samba.wiz_.c:50
 msgid "Access control"
 msgstr "Control de acceso"
 
-#: ../samba_wizard/samba.wiz_.c:51
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
 "from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
@@ -1400,19 +1420,10 @@ msgstr ""
 "negar el acceso desde un host en particular\\nhosts allow = @foonet\\nhosts "
 "deny = pirata"
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:53
 msgid "Enable file sharing area"
 msgstr "Habilitar el �rea para compartir archivos"
 
-#: ../samba_wizard/samba.wiz_.c:54
-msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
-msgstr ""
-"Ingrese usuarios o grupos separados por una coma (los grupos deben "
-"precederse por una \\'@\\', por ejemplo:\\nroot, fred, @usuarios, @wheel "
-"para cada tipo de permiso."
-
 #: ../samba_wizard/samba.wiz_.c:56
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
@@ -1429,27 +1440,39 @@ msgstr "Compartir archivos:"
 msgid "File permissions"
 msgstr "Permisos de archivo"
 
-#: ../server_wizard/server.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:2
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "Este asistente ajustar� los par�metros b�sicos de red de su servidor."
+
+#: ../server_wizard/server.wiz_.c:4
 msgid "Host Name:"
 msgstr "Nombre de host:"
 
-#: ../server_wizard/server.wiz_.c:6
+#: ../server_wizard/server.wiz_.c:7
 msgid "Basic Network Configuration Wizard"
 msgstr "Asistente de configuraci�n b�sica de red"
 
-#: ../server_wizard/server.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:8
 msgid "The network address is wrong"
 msgstr "La direcci�n de red es incorrecta"
 
-#: ../server_wizard/server.wiz_.c:8
+#: ../server_wizard/server.wiz_.c:9
 msgid "Server IP address:"
 msgstr "Direcci�n IP del servidor:"
 
-#: ../server_wizard/server.wiz_.c:9
+#: ../server_wizard/server.wiz_.c:10
 msgid "Network Address"
 msgstr "Direcci�n de red"
 
-#: ../server_wizard/server.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:12
+msgid ""
+"You should not run any other applications while running this wizard and at "
+"the end of the wizard you should exit your session and login again."
+msgstr ""
+"No deber�a correr otras aplicaciones mientras corre este asistente y al "
+"final del asistente deber�a salir de su sesi�n y volver a conectarse."
+
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
 "The wizard successfully configured the basic networking services of your "
 "server."
@@ -1457,13 +1480,13 @@ msgstr ""
 "El asistente configur� exitosamente los servicios de red b�sicos de su "
 "servidor."
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:14
 msgid ""
 "(you can change here these values if you know exactly what you're doing)"
 msgstr ""
 "(aqu� puede cambiar estos valores si sabe exactamente lo que est� haciendo)"
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:15
 msgid ""
 "The network address is a number identifying your network; the proposed value "
 "is designed for a configuration not connected to Internet, or connected "
@@ -1475,15 +1498,15 @@ msgstr ""
 "utilizando enmascarado de IP; a menos que sepa lo que est� haciendo, acepte "
 "el valor predeterminado."
 
-#: ../server_wizard/server.wiz_.c:13
+#: ../server_wizard/server.wiz_.c:16
 msgid "Note about networking"
 msgstr "Nota acerca de las redes"
 
-#: ../server_wizard/server.wiz_.c:14
+#: ../server_wizard/server.wiz_.c:17
 msgid "Server Address"
 msgstr "Direcci�n del servidor"
 
-#: ../server_wizard/server.wiz_.c:15
+#: ../server_wizard/server.wiz_.c:18
 msgid ""
 "Network addresses are a list of four numbers smaller than 256, separated by "
 "dots; the last number of the list must be zero."
@@ -1491,7 +1514,7 @@ msgstr ""
 "Las direcciones de red son una lista de cuatro n�meros menores a 256, "
 "separados por puntos; el �ltimo n�mero de la lista debe ser cero."
 
-#: ../server_wizard/server.wiz_.c:16
+#: ../server_wizard/server.wiz_.c:19
 msgid ""
 "Note: the gateway IP address should be non empty if you want an access to "
 "outside world."
@@ -1499,39 +1522,37 @@ msgstr ""
 "Nota: la direcci�n IP de la pasarela no deber�a estar vac�a si desea acceder "
 "al mundo exterior."
 
-#: ../server_wizard/server.wiz_.c:17
+#: ../server_wizard/server.wiz_.c:20
 msgid "The Server IP address is incorrect"
 msgstr "La direcci�n IP del servidor es incorrecta"
 
-#: ../server_wizard/server.wiz_.c:18
+#: ../server_wizard/server.wiz_.c:21
 msgid "Configuring your network"
 msgstr "Configurando su red"
 
-#: ../server_wizard/server.wiz_.c:19
+#: ../server_wizard/server.wiz_.c:22
 msgid "Gateway IP:"
 msgstr "IP de la pasarela:"
 
-#: ../server_wizard/server.wiz_.c:20
-msgid ""
-"You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+#: ../server_wizard/server.wiz_.c:23
+msgid "This page computes the default server address; it should be invisible."
 msgstr ""
-"No deber�a correr otras aplicaciones mientras corre este asistente y al "
-"final del asistente deber�a salir de su sesi�n y volver a conectarse."
+"Esta p�gina computa la direcci�n predeterminada del servidor; la misma "
+"deber�a ser invisible."
 
-#: ../server_wizard/server.wiz_.c:21
+#: ../server_wizard/server.wiz_.c:24
 msgid "IP net address:"
 msgstr "Direcci�n IP de la red:"
 
-#: ../server_wizard/server.wiz_.c:23
+#: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Pasarela externa"
 
-#: ../server_wizard/server.wiz_.c:24
+#: ../server_wizard/server.wiz_.c:26
 msgid "Server Wizard"
 msgstr "Asistente del servidor"
 
-#: ../server_wizard/server.wiz_.c:25
+#: ../server_wizard/server.wiz_.c:27
 msgid ""
 "So, it's very probable that domain name and IP adresses for this local "
 "network are DIFFERENT from the server \\qexternal\\q connection."
@@ -1540,7 +1561,7 @@ msgstr ""
 "esta red local sea DIFERENTE que la de la conexi�n \\qexterna\\q del "
 "servidor."
 
-#: ../server_wizard/server.wiz_.c:26
+#: ../server_wizard/server.wiz_.c:28
 msgid ""
 "Choose the network device (usually a card) the server should use to connect "
 "to your network. It's the device for the local network, probably not the "
@@ -1550,7 +1571,7 @@ msgstr ""
 "el servidor para conectar a su red. Es el dispositivo para la red local, "
 "probablemente no el mismo dispositivo utilizado para el acceso a la Internet."
 
-#: ../server_wizard/server.wiz_.c:27
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1558,7 +1579,7 @@ msgstr ""
 "Los dispositivos se presentan con el nombre Linux y, si se conoce, con la "
 "descripci�n de la tarjeta."
 
-#: ../server_wizard/server.wiz_.c:28
+#: ../server_wizard/server.wiz_.c:30
 msgid ""
 "Here is your current value for the external gateway (value specified during "
 "the initial installation). The device (network card or modem) should be "
@@ -1568,15 +1589,15 @@ msgstr ""
 "durante la instalaci�n inicial) El dispositivo (tarjeta de red o m�dem) "
 "deber�a ser diferente de la utilizada para la red interna."
 
-#: ../server_wizard/server.wiz_.c:29
+#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"This wizard will help you in configuring the basic networking services of "
+"your server."
 msgstr ""
-"Para estos asistentes, su computadora es vista como un servidor "
-"administrando su propia red local (red de clase C)"
+"Este asistente lo ayudar� a configurar los servicios de red b�sicos de su "
+"servidor."
 
-#: ../server_wizard/server.wiz_.c:30
+#: ../server_wizard/server.wiz_.c:32
 msgid ""
 "The server IP address is a number identifing your server in your network; "
 "the proposed value designed for a private network , with no internet "
@@ -1588,11 +1609,11 @@ msgstr ""
 "desde la Internet, o conectada utilizando enmascarado de IP; a menos que "
 "sepa lo que est� haciendo, acepte el valor predeterminado."
 
-#: ../server_wizard/server.wiz_.c:32
+#: ../server_wizard/server.wiz_.c:34
 msgid "The host name is not correct"
 msgstr "El nombre del host es incorrecto"
 
-#: ../server_wizard/server.wiz_.c:33
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1602,28 +1623,28 @@ msgstr ""
 "las otras estaciones de trabajo en su red y tal vez desde la Internet "
 "(dependiendo de su configuraci�n del canal de subida)"
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:36
 msgid "Wizard Error."
 msgstr "Error del asistente."
 
-#: ../server_wizard/server.wiz_.c:35
+#: ../server_wizard/server.wiz_.c:37
 msgid "net device"
 msgstr "dispositivo de red"
 
-#: ../server_wizard/server.wiz_.c:36
-msgid "This page compute the domainname; it should be invisible"
-msgstr ""
-"Esta p�gina computa el nombre de dominio; la misma deber�a ser invisible"
-
-#: ../server_wizard/server.wiz_.c:37
+#: ../server_wizard/server.wiz_.c:38
 msgid "Computed domain Name"
 msgstr "Nombre de dominio computado"
 
-#: ../server_wizard/server.wiz_.c:38
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr ""
+"Esta p�gina computa el nombre de dominio; la misma deber�a ser invisible"
+
+#: ../server_wizard/server.wiz_.c:40
 msgid "Gateway device:"
 msgstr "Dispositivo pasarela:"
 
-#: ../server_wizard/server.wiz_.c:39
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
@@ -1631,16 +1652,6 @@ msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su red"
 
-#: ../server_wizard/server.wiz_.c:40
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-"Esta p�gina computa la direcci�n predeterminada del servidor; la misma "
-"deber�a ser invisible."
-
-#: ../server_wizard/server.wiz_.c:42
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "Este asistente ajustar� los par�metros b�sicos de red de su servidor."
-
 #: ../server_wizard/server.wiz_.c:43
 msgid "Warning"
 msgstr "Advertencia"
@@ -1650,16 +1661,16 @@ msgid "Device:"
 msgstr "Dispositivo:"
 
 #: ../server_wizard/server.wiz_.c:46
-msgid "Server Address:"
-msgstr "Direcci�n del servidor:"
-
-#: ../server_wizard/server.wiz_.c:47
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"Este asistente lo ayudar� a configurar los servicios de red b�sicos de su "
-"servidor."
+"Para estos asistentes, su computadora es vista como un servidor "
+"administrando su propia red local (red de clase C)"
+
+#: ../server_wizard/server.wiz_.c:47
+msgid "Server Address:"
+msgstr "Direcci�n del servidor:"
 
 #: ../server_wizard/server.wiz_.c:49
 msgid ""
@@ -1740,85 +1751,85 @@ msgid "University of Regina, Regina, Saskatchewan, Canada"
 msgstr "University of Regina, Regina, Saskatchewan, Canad�"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Si el servidor de la hora no est� disponible de inmediato (red u otra "
-"raz�n), esperar� aproximadamente 30 segundos."
-
-#: ../time_wizard/time.wiz_.c:11
 msgid "Trinity College, Dublin, Ireland"
 msgstr "Trinity College, Dublin, Irlanda"
 
-#: ../time_wizard/time.wiz_.c:12
+#: ../time_wizard/time.wiz_.c:11
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../time_wizard/time.wiz_.c:13
+#: ../time_wizard/time.wiz_.c:12
 msgid "Secondary Time Server:"
 msgstr "Servidor de la hora secundario:"
 
-#: ../time_wizard/time.wiz_.c:14
+#: ../time_wizard/time.wiz_.c:13
 msgid "Try again"
 msgstr "Probar de nuevo"
 
-#: ../time_wizard/time.wiz_.c:15
+#: ../time_wizard/time.wiz_.c:14
 msgid "The Chinese University of Hong Kong"
 msgstr "The Chinese University of Hong Kong"
 
-#: ../time_wizard/time.wiz_.c:16
+#: ../time_wizard/time.wiz_.c:15
 msgid "UNLV College of Engineering, Las Vegas, NV"
 msgstr "UNLV College of Engineering, Las Vegas, NV"
 
-#: ../time_wizard/time.wiz_.c:17
+#: ../time_wizard/time.wiz_.c:16
 msgid "Altea (Alicante/SPAIN)"
 msgstr "Altea (Alicante/ESPA�A)"
 
-#: ../time_wizard/time.wiz_.c:18
+#: ../time_wizard/time.wiz_.c:17
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "National Research Council of Canada, Ottawa, Ontario, Canad�"
 
-#: ../time_wizard/time.wiz_.c:19
+#: ../time_wizard/time.wiz_.c:18
 msgid "Select a primary and secondary server from the list."
 msgstr "Seleccione un servidor primario y uno secundario de la lista."
 
-#: ../time_wizard/time.wiz_.c:20
+#: ../time_wizard/time.wiz_.c:19
 msgid "CISM, Lyon, France"
 msgstr "CISM, Lyon, Francia"
 
-#: ../time_wizard/time.wiz_.c:21
+#: ../time_wizard/time.wiz_.c:20
 msgid "Inet, Inc., Seoul, Korea"
 msgstr "Inet, Inc., Se�l, Corea"
 
-#: ../time_wizard/time.wiz_.c:22
+#: ../time_wizard/time.wiz_.c:21
 msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
 msgstr "Centro Cient�fico en Chernogolovka, regi�n de Mosc�, Rusia"
 
-#: ../time_wizard/time.wiz_.c:23
+#: ../time_wizard/time.wiz_.c:22
 msgid "Washington State University Tri-Cities, Richland, Wa"
 msgstr "Washington State University Tri-Cities, Richland, Wa"
 
-#: ../time_wizard/time.wiz_.c:24
+#: ../time_wizard/time.wiz_.c:23
 msgid "University of Adelaide, South Australia"
 msgstr "Universidad de Adelaide, Sur de Australia"
 
-#: ../time_wizard/time.wiz_.c:25
+#: ../time_wizard/time.wiz_.c:24
 msgid "Time zone:"
 msgstr "Zona horaria:"
 
-#: ../time_wizard/time.wiz_.c:26
+#: ../time_wizard/time.wiz_.c:25
 msgid "The time servers are not responding. The causes could be:"
 msgstr "Los servidores de la hora no responden. Las causas pueden ser:"
 
-#: ../time_wizard/time.wiz_.c:27
+#: ../time_wizard/time.wiz_.c:26
 msgid "CRIUC, Universite de Caen, France"
 msgstr "CRIUC, Universite de Caen, Francia"
 
-#: ../time_wizard/time.wiz_.c:28
+#: ../time_wizard/time.wiz_.c:27
 msgid "- other reasons..."
 msgstr "- otras razones..."
 
+#: ../time_wizard/time.wiz_.c:28
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Si el servidor de la hora no est� disponible de inmediato (red u otra "
+"raz�n), esperar� aproximadamente 30 segundos."
+
 #: ../time_wizard/time.wiz_.c:29
 msgid "WARNING"
 msgstr "ATENCI�N"
@@ -1923,7 +1934,7 @@ msgstr "Computer Science Department, University of Wisconsin-Madison"
 
 #: ../web_wizard/web.wiz_.c:2
 msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
+"* User module : allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
@@ -1948,50 +1959,70 @@ msgid "Modules :"
 msgstr "M�dulos:"
 
 #: ../web_wizard/web.wiz_.c:6
+#, fuzzy
+msgid "Document root:"
+msgstr "Ra�z de los documentos:"
+
+#: ../web_wizard/web.wiz_.c:7
 msgid "user http sub-directory : ~/"
 msgstr "subdirectorio http del usuario : ~/"
 
-#: ../web_wizard/web.wiz_.c:8
+#: ../web_wizard/web.wiz_.c:9
 msgid "Enable the Web Server for the Intranet"
 msgstr "Habilitar el servidor web para la Intranet"
 
-#: ../web_wizard/web.wiz_.c:11
+#: ../web_wizard/web.wiz_.c:12
 msgid "Configuring the Web Server"
 msgstr "Configurando el servidor web"
 
-#: ../web_wizard/web.wiz_.c:12
+#: ../web_wizard/web.wiz_.c:13
 msgid "Web Server"
 msgstr "Servidor web"
 
-#: ../web_wizard/web.wiz_.c:13
+#: ../web_wizard/web.wiz_.c:14
 msgid "Enable the Web Server for the Internet"
 msgstr "Habilitar el servidor web para la Internet"
 
-#: ../web_wizard/web.wiz_.c:14
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Directorio compartido:"
+
+#: ../web_wizard/web.wiz_.c:16
+#, fuzzy
 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/web.wiz_.c:15
+#: ../web_wizard/web.wiz_.c:17
 msgid "Web wizard"
 msgstr "Asistente web"
 
-#: ../web_wizard/web.wiz_.c:16
+#: ../web_wizard/web.wiz_.c:18
 msgid "Intranet web server:"
 msgstr "Servidor web Intranet:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
+msgid ""
+"Type the name of the directory users should create in their homes (whitout "
+"~/) to get it available via http://www.yourserver.com/~user"
+msgstr ""
+"Ingrese el nombre del directorio que los usuarios deber�an crear en sus "
+"directorios personales (sin ~/) para que est�n disponibles por medio de "
+"http://www.suservidor.com/~usuario"
+
+#: ../web_wizard/web.wiz_.c:25
 msgid "activate user module"
 msgstr "activar m�dulo de usuario"
 
-#: ../web_wizard/web.wiz_.c:23
+#: ../web_wizard/web.wiz_.c:26
 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/web.wiz_.c:24
+#: ../web_wizard/web.wiz_.c:27
 msgid "Select the kind of Web service you want to activate:"
 msgstr "Seleccione el tipo de servicio web que desea activar:"
 
-#: ../web_wizard/web.wiz_.c:25
+#: ../web_wizard/web.wiz_.c:28
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "Server"
@@ -1999,40 +2030,23 @@ msgstr ""
 "El asistente recolect� los siguientes par�metros necesarios para configurar "
 "su servidor web"
 
-#: ../web_wizard/web.wiz_.c:26
-msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
-"~/) to get it available via http://www.yourserver.com/~user"
-msgstr ""
-"Ingrese el nombre del directorio que los usuarios deber�an crear en sus "
-"directorios personales (sin ~/) para que est�n disponibles por medio de "
-"http://www.suservidor.com/~usuario"
-
-#: ../web_wizard/web.wiz_.c:27
+#: ../web_wizard/web.wiz_.c:29
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr "El asistente configur� exitosamente su servidor web Intranet/Internet"
 
-#: ../web_wizard/web.wiz_.c:28
-msgid "user dir:"
-msgstr "dir. de usuario:"
-
-#: ../web_wizard/web.wiz_.c:29
+#: ../web_wizard/web.wiz_.c:30
 msgid "Document Root:"
 msgstr "Ra�z de los documentos:"
 
-#: ../web_wizard/web.wiz_.c:30
+#: ../web_wizard/web.wiz_.c:31
 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/web.wiz_.c:31
+#: ../web_wizard/web.wiz_.c:32
 msgid "Web Server Configuration Wizard"
 msgstr "Asistente de configuraci�n del servidor web"
 
-#: ../web_wizard/web.wiz_.c:32
-msgid "document root:"
-msgstr "ra�z de los documentos:"
-
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2048,6 +2062,12 @@ msgstr "habilitado"
 msgid "disabled"
 msgstr "deshabilitado"
 
+#~ msgid "user dir:"
+#~ msgstr "dir. de usuario:"
+
+#~ msgid "document root:"
+#~ msgstr "ra�z de los documentos:"
+
 #~ msgid ""
 #~ "%s is not installed\n"
 #~ "Click \"Next\" to install or \"Cancel\" to quit"
@@ -2100,7 +2120,7 @@ msgstr "deshabilitado"
 #~ msgid "this address are given by your Internet provider."
 #~ msgstr "Las direcciones son dadas por su proveedor de Internet."
 
-#~ msgid "This wizard will help you configuring the DNS"
+#~ msgid "This wizard will help you in configuring the DNS"
 #~ msgstr "Este asistente le ayudara a configurar el DNS"
 
 #~ msgid "services of your server. This configuration will"
diff --git a/po/et.po b/po/et.po
index 8c115380..7cf8a265 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-11-12 19:17+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -14,224 +14,212 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Lokaalvõrgu klient on arvuti, mis on ühendatud võrku ja millel on oma nimi "
-"ning IP-aadress."
+"Vajutage nende parameetrite seadistamiseks nupule 'Järgmine' või nupule "
+"'Loobu', kui soovite nõustajast väljuda."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "See ei ole korrektne aadress... vajutage jätkamiseks nupule 'Järgmine'"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "Olgu"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"Vajutage nupule 'Järgmine', kui soovite muuta olemasolevat väärtust, või "
-"nupule 'Tagasi' valiku parandamiseks."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Õnnitlused"
+"Kui valite praegu seadistamise kasuks, jätkate automaatselt kliendi "
+"seadistamisega"
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "DNS kliendi nõustaja"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr ""
+"Vajutage alustamiseks nupule 'Järgmine' või nupule 'Loobu', kui soovite "
+"nõustajast väljuda."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"Klient tuvastatakse võrgus nime järgi (nt kliendinimi.firma.ee). Igal "
+"arvutil peab võrgus olema (unikaalne) IP-aadress, mis tavaliselt esitatakse "
+"punktidega eraldatud kujul."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "Nõustaja kogus järgmised parameetrid, mida on vaja kliendi lisamiseks võrku:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Süsteemi viga, seadistused jäid tegemata"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "Kliendi nimi"
+msgid "The wizard successfully added the client."
+msgstr "Nõustaja lisas edukalt kliendi."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Uue kliendi lisamine võrku"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(nime järele pole vaja kirjutada domeeni)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Seadista"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr "Pange tähele, et IP-aadress ja kliendinimi peavad olema unikaalsed."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Kliendi andmed:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Hoiatus:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(nime järele pole vaja kirjutada domeeni)"
+msgid "Name of the machine:"
+msgstr "Arvuti nimi:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Kui valite praegu seadistamise kasuks, jätkate automaatselt kliendi "
-"seadistamisega"
+msgid "Adding a new client to your network"
+msgstr "Uue kliendi lisamine võrku"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Server kasutab siia sisestatud infot kliendi nime teatamiseks teistele võrku "
-"kuuluvatele masinatele."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Süsteemi viga, seadistused jäid tegemata"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Sisestatud arvuti nimi või IP-aadress on juba kasutusel."
+msgid "Client identification:"
+msgstr "Kliendi andmed:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "Nõustaja lisas edukalt kliendi."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr "See nõustaja aitab Teil lisada uue kliendi kohalikule DNS-ile."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "Arvuti nimi:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "Olgu"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"Klient tuvastatakse võrgus nime järgi (nt kliendinimi.firma.ee). Igal "
-"arvutil peab võrgus olema (unikaalne) IP-aadress, mis tavaliselt esitatakse "
-"punktidega eraldatud kujul."
+"Lokaalvõrgu klient on arvuti, mis on ühendatud võrku ja millel on oma nimi "
+"ning IP-aadress."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
-msgstr "Pange tähele, et IP-aadress ja kliendinimi peavad olema unikaalsed."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
+msgstr ""
+"Nende väärtustega nõustumiseks ja kliendi lisamiseks vajutage nupule "
+"'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta."
 
-#: ../client_wizard/client.wiz_.c:21
-msgid "DNS Wizard (add client)"
-msgstr "DNS nõustaja (kliendi lisamine)"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "See ei ole korrektne aadress... vajutage jätkamiseks nupule 'Järgmine'"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr "Hoiatus\\nTe olete dhcp-s, server ei pruugi Teie seadistusega töötada."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "Kliendi IP:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "Arvuti IP-aadress:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Seadista"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Välju"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "Selle nõustaja käivitamiseks peate olema administraator"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Võrk ei ole veel seadistatud"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "See nõustaja aitab Teil lisada uue kliendi kohalikule DNS-ile."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Sisestatud arvuti nimi või IP-aadress on juba kasutusel."
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
-msgstr ""
-"Nende väärtustega nõustumiseks ja kliendi lisamiseks vajutage nupule "
-"'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta."
+#: ../client_wizard/client.wiz_.c:25
+msgid "DNS Wizard (add client)"
+msgstr "DNS nõustaja (kliendi lisamine)"
 
-#: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr ""
-"Vajutage alustamiseks nupule 'Järgmine' või nupule 'Loobu', kui soovite "
-"nõustajast väljuda."
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Välju"
 
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
+msgstr "Hoiatus\\nTe olete dhcp-s, server ei pruugi Teie seadistusega töötada."
+
+#: ../client_wizard/client.wiz_.c:28
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Vajutage nende parameetrite seadistamiseks nupule 'Järgmine' või nupule "
-"'Loobu', kui soovite nõustajast väljuda."
+"Server kasutab siia sisestatud infot kliendi nime teatamiseks teistele võrku "
+"kuuluvatele masinatele."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "Selle nõustaja käivitamiseks peate olema administraator"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Õnnitlused"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "Arvuti IP-aadress:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "Kliendi IP:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Vajutage nupule 'Järgmine', kui soovite muuta olemasolevat väärtust, või "
+"nupule 'Tagasi' valiku parandamiseks."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
 msgstr ""
 "Enne selle nõustaja käivitamist tuleb seadistada võrgu põhiparameetrid."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Hoiatus:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Seadistuste nõustaja"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "MySQL andmebaasi server"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Kasutaja lisamiseks sisestage palun kasutajanimi ja parool"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "Kliendi nimi"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Kasutaja lisamine"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -239,76 +227,68 @@ msgstr ""
 "Selle väärtusega nõustmiseks ja serveri seadistamiseks vajutage nupule "
 "\\qKinnita\\q või nupule 'Tagasi', kui soovite midagi muuta."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Palun sisestage administraatori parool:"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "MySQL andmebaasi serveri seadistamine"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "Nõustaja seadistas edukalt MySQL andmebaasi serveri"
+msgid "Confirm"
+msgstr "Kinnita"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Andmebaasi server"
+msgid "Password:"
+msgstr "Parool:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Administraatori parool:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "Nõustaja seadistas edukalt MySQL andmebaasi serveri"
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Kinnita"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "Vabandust, selleks peab olema administraator..."
+msgid "Username:"
+msgstr "Kasutajanimi:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Parool:"
+msgid "Add"
+msgstr "Lisa"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Kui valite praegu seadistamise kasuks, jätkate automaatselt MySQL andmbaasi "
-"seadistamisega"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "Vabandust, selleks peab olema administraator..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
-"See nõustaja aitab seadistada MySQL andmebaasi serveri Teie võrgus "
-"kasutamiseks."
+msgid "Database Server"
+msgstr "Andmebaasi server"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Kasutajanimi:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Märkus: sel kasutajal on kõik õigused"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Lisa"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Palun sisestage administraatori parool:"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "MySQL andmebaasi nõustaja"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "MySQL andmebaasi serveri seadistamine"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Seadistuste nõustaja"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr "Serveri käivitamiseks tuleb esmalt määrata administraatori parool"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "MySQL andmebaasi nõustaja"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Administraatori parool:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "MySQL andmebaasi server"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -316,35 +296,60 @@ msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja MySQL andmebaasi serveri "
 "seadistamiseks"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
 msgstr ""
-"IP-aadressid on punktidega eraldatud neli arvu, mis on väiksemad kui 256."
+"See nõustaja aitab seadistada MySQL andmebaasi serveri Teie võrgus "
+"kasutamiseks."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Kasutaja lisamiseks sisestage palun kasutajanimi ja parool"
+
+#: ../db_wizard/db.wiz_.c:27
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
 msgstr ""
-"Valige aadresside vahemik, mida DHCP teenus eraldab tööjaamadele; kui Teil "
-"ei ole just erilisi vajadusi, võite rahumeeli nõustuda pakutavate "
-"väärtustega."
+"Kui valite praegu seadistamise kasuks, jätkate automaatselt MySQL andmbaasi "
+"seadistamisega"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr ""
+"Nõustaja kogus järgmised andmed, mida on vaja DHCP teenuse seadistamiseks:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Paranda"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
+msgstr ""
+"Kas server kasutab autoriseerimist ? Küsige järgi süsteemi administaatorilt."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Suurim IP-aadress:"
+msgid "Lowest IP Address:"
+msgstr "Väikseim IP-aadress:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "DHCP poolt kasutatav aadresside vahemik"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr ""
+"IP-aadressid on punktidega eraldatud neli arvu, mis on väiksemad kui 256."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -352,92 +357,82 @@ msgstr ""
 "Nende väärtustega nõustumiseks ja serveri seadistamiseks vajutage nupule "
 "'Järgmine' või nupule 'Tagasi', kui soovite midagi muuta."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr "DHCP on teenus, mis automaatselt omistab tööjaamadele võrguaadressid."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "DHCP nõustaja"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Paranda"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "See nõustaja aitab seadistada serveri DHCP teenused."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "DHCP poolt kasutatav aadresside vahemik"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Nõustaja seadistas edukalt serveri DHCP teenused."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "See nõustaja aitab seadistada serveri DHCP teenused."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"Nõustaja kogus järgmised andmed, mida on vaja DHCP teenuse seadistamiseks:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Väikseim IP-aadress:"
+"Valige aadresside vahemik, mida DHCP teenus eraldab tööjaamadele; kui Teil "
+"ei ole just erilisi vajadusi, võite rahumeeli nõustuda pakutavate "
+"väärtustega."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "DHCP seadistamise nõustaja"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "Määratud IP-aadresside vahemik ei ole korrektne"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
-msgstr ""
-"Kas server kasutab autoriseerimist ? Küsige järgi süsteemi administaatorilt."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
+msgstr "DHCP on teenus, mis automaatselt omistab tööjaamadele võrguaadressid."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "Määratud IP-aadresside vahemik ei ole korrektne"
+msgid "Highest IP Address:"
+msgstr "Suurim IP-aadress:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
-msgstr "DHCP nõustaja"
+msgid "DHCP Configuration Wizard"
+msgstr "DHCP seadistamise nõustaja"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "DHCP serveri seadistamine"
 
-#: ../dns_wizard/dns.wiz_.c:2
-msgid "DNS Wizard (configuration)"
-msgstr "DNS nõustaja (seadistamine)"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"Nõustaja kogus järgmised andmed, mida on vaja DNS teenuse seadistamiseks:"
+"Seadistus võib olla aktsepteeritav, kuid Te ei saa tuvastada masinanimesid "
+"väljaspool kohtvõrku."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr ""
+"Vajutage nupule 'Järgmine', kui soovite need väljad tühjaks jätta, või "
+"nupule 'Tagasi', kui soovite need siiski määrata."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Primaarse nimeserveri aadress:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "DNS serveri seadistamine"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Sekundaarne DNS-aadress:"
+msgid "DNS Configuration Wizard"
+msgstr "DNS seadistamise nõustaja"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "DNS serveri aadressid"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"See nõustaja aitab seadistada serveri DNS teenuse (nimeserver), millega "
-"tagatakse kohalikus võrgus aadresside korrektne lahendamine, suunates samas "
-"kõik muud nimepäringud väljaspool asuvale nimeserverile."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -449,43 +444,51 @@ msgstr ""
 "tuleb määrata primaarse ja sekundaarse nimeserveri IP-aadress. Tavaliselt "
 "annab need Teile internetiteenuse pakkuja."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "Nõustaja seadistas edukalt serveri DNS teenused."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "DNS serverile ei ole aadressi sisestatud."
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
-"Vajutage nupule 'Järgmine', kui soovite need väljad tühjaks jätta, või "
-"nupule 'Tagasi', kui soovite need siiski määrata."
-
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "DNS seadistamise nõustaja"
+"Nõustaja kogus järgmised andmed, mida on vaja DNS teenuse seadistamiseks:"
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Primaarse nimeserveri aadress:"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
+msgstr "DNS serveri aadressid"
 
-#: ../dns_wizard/dns.wiz_.c:20
+#: ../dns_wizard/dns.wiz_.c:17
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Seadistus võib olla aktsepteeritav, kuid Te ei saa tuvastada masinanimesid "
-"väljaspool kohtvõrku."
+"DNS (DomeeniNime Server ehk lihtsalt nimeserver) on teenus, mis määrab "
+"vastavuse arvuti ning Interneti masinanime vahel."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Sekundaarne DNS-aadress:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"DNS (DomeeniNime Server ehk lihtsalt nimeserver) on teenus, mis määrab "
-"vastavuse arvuti ning Interneti masinanime vahel."
+"See nõustaja aitab seadistada serveri DNS teenuse (nimeserver), millega "
+"tagatakse kohalikus võrgus aadresside korrektne lahendamine, suunates samas "
+"kõik muud nimepäringud väljaspool asuvale nimeserverile."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "Nõustaja seadistas edukalt serveri DNS teenused."
+msgid "DNS Wizard (configuration)"
+msgstr "DNS nõustaja (seadistamine)"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -496,62 +499,67 @@ msgid "Please select a wizard"
 msgstr "Palun valige nõustaja"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Seade"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "Keskmine  - veeb, ftp ja ssh on näha väljapoole"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr "Tugev - väljast pole näha, kasutajad on piiratud veebiga"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Juhtus midagi kohutavat"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Tulemüüri seadistamise nõustaja"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"Nõustaja kogus järgmised andmed, mida on vaja tulemüüri seadistamiseks:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr ""
+"Tulemüür kaitseb Teie sisevõrku autoriseerimata ligipääsu eest Internetist."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "Interneti võrguseade:"
+msgid "Device"
+msgstr "Seade"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Paranda"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Tulemüüri nõustaja"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Puudub - kaitset ei ole"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "Kaitse tase:"
+msgid "Internet Network Device:"
+msgstr "Interneti võrguseade:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Tulemüüri nõustaja"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Tulemüüri saab seadistada erinevatele kaitstuse tasemetele. Valige tase, mis "
+"kõige paremini vastab Teie vajadustele.  Kui Te ei ole kindel, on enamasti "
+"kohane valida keskmine tase."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "Nõustaja seadistas edukalt serveri tulemüüri."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "Keskmine  - veeb, ftp ja ssh on näha väljapoole"
+msgid "The device name is not correct"
+msgstr "Seadme nimi ei ole korrektne"
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "Kaitse tase"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Paranda"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Välju"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Tulemüüri seadistamise nõustaja"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "Seadme nimi ei ole korrektne"
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -559,146 +567,135 @@ msgstr ""
 "Tulemüür peab teadma, kuidas Teie server on internetti ühendatud. Palun "
 "valige seade, mida kasutate välisühenduse jaoks."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr ""
-"Tulemüür kaitseb Teie sisevõrku autoriseerimata ligipääsu eest Internetist."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "Kaitse tase"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "Tulemüüri seadistamine"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Juhtus midagi kohutavat"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "Tulemüüri võrguseade"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Puudub - kaitset ei ole"
+msgid "The wizard successfully configured your server firewall."
+msgstr "Nõustaja seadistas edukalt serveri tulemüüri."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
-msgid "This wizard will help you configuring your server firewall."
-msgstr "See nõustaja aitab seadistada serveri tulemüüri."
+msgid "Configuring the Firewall"
+msgstr "Tulemüüri seadistamine"
 
-#: ../firewall_wizard/firewall.wiz_.c:23
-msgid "Low - Light filtering, standard services available"
-msgstr "Madal - kerge filtreerimine, tavapäraste teenuste saadavus"
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Välju"
 
 #: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "Tulemüüri võrguseade"
+#, fuzzy
+msgid "This wizard will help you configuring your server firewall."
+msgstr "See nõustaja aitab seadistada serveri tulemüüri."
 
 #: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
-msgstr ""
-"Nõustaja kogus järgmised andmed, mida on vaja tulemüüri seadistamiseks:"
+msgid "Low - Light filtering, standard services available"
+msgstr "Madal - kerge filtreerimine, tavapäraste teenuste saadavus"
 
 #: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Tulemüüri saab seadistada erinevatele kaitstuse tasemetele. Valige tase, mis "
-"kõige paremini vastab Teie vajadustele.  Kui Te ei ole kindel, on enamasti "
-"kohane valida keskmine tase."
+msgid "Protection Level:"
+msgstr "Kaitse tase:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "Valige FTP teenus, mida soovite aktiveerida:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
+msgstr "See nõustaja aitab seadistada Teie võrgu FTP-serveri."
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr "Sisestatud asukohta ei ole olemas."
+#: ../ftp_wizard/ftp.wiz_.c:3
+msgid "Public directory:"
+msgstr "Avalik kataloog:"
 
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:4
 msgid "Internet FTP Server:"
 msgstr "Interneti FTP-server:"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
-msgstr "Server toimib FTP-serverina nii kohtvõrgus (intranet) kui Internetis."
+#: ../ftp_wizard/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "FTP-serveri lubamine intraneti jaoks"
+
+#: ../ftp_wizard/ftp.wiz_.c:7
+msgid "FTP wizard"
+msgstr "FTP nõustaja"
+
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "FTP-server"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
-msgstr "Nõustaja seadistas edukalt intraneti/Interneti FTP-serveri"
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr ""
+"Ärge märkige ühtegi kastikest, kui Te ei soovi oma FTP-serverit aktiveerida."
 
 #: ../ftp_wizard/ftp.wiz_.c:12
-msgid "Public directory:"
-msgstr "Avalik kataloog:"
+msgid "Configuring the FTP Server"
+msgstr "FTP-serveri seadistamine"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
-msgstr "Sisestage kataloogi asukoht, mida soovite jagada."
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "FTP-serveri lubamine Interneti jaoks"
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "Intraneti FTP-server:"
 
 #: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "FTP-serveri lubamine intraneti jaoks"
+msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgstr "Nõustaja seadistas edukalt intraneti/Interneti FTP-serveri"
+
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "Valige FTP teenus, mida soovite aktiveerida:"
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr "Jagatud kataloog:"
+
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja FTP-serveri seadistamiseks"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "FTP nõustaja"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
-msgstr "See nõustaja aitab seadistada Teie võrgu FTP-serveri."
-
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "FTP-serveri lubamine Interneti jaoks"
-
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "Intraneti FTP-server:"
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
+msgstr "Sisestatud asukohta ei ole olemas."
 
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP-serveri seadistamise nõustaja"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "FTP-serveri seadistamine"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Ärge märkige ühtegi kastikest, kui Te ei soovi oma FTP-serverit aktiveerida."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "FTP-server"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr "Sisestage kataloogi asukoht, mida soovite jagada."
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
-msgstr "Jagatud kataloog:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"Your server can act as an FTP Server toward your internal network (intranet) "
+"and as an FTP Server for the Internet."
+msgstr "Server toimib FTP-serverina nii kohtvõrgus (intranet) kui Internetis."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Uudisteserveri nimi:"
+msgid "Polling Interval:"
+msgstr "Pollimise intervall:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "Tere tulemast uudistegruppide nõustajasse"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Pollimise periood (tundides):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "Uudisteserver"
+msgid "Polling Period"
+msgstr "Pollimise periood"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -708,29 +705,30 @@ msgstr ""
 "uudistegruppidest. Pollimisperiood määrab intervalli kahe järjestikuse "
 "pollimise vahel."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr "See nõustaja aitab seadistada uudisegruppide teenused."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "Uudisegruppide nõustaja"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "Pollimisperiood ei ole korrektne"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "Uudisteserveri nimi ei ole korrektne"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Pollimise intervall:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Interneti masinanimed peavad olema kujul \\qhost.domeen.domeenitüüp\\q. Kui "
-"selleks on näiteks \\qpakkuja.ee\\q, siis on uudisegruppide server "
-"tavaliselt \\qnews.pakkuja.ee\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Pollimise periood"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Uudisegruppide seadistamine"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -738,15 +736,7 @@ msgstr ""
 "Sõltuvalt Teie internetiühendusest võib kohane pollimisperiood kõikuda 6 ja "
 "24 tunni vahel."
 
-#: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "Pollimisperiood ei ole korrektne"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "Uudisteserver:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -754,7 +744,12 @@ msgstr ""
 "Uudisteserveri nimi on masina nimi, mis pakub teie võrgule uudisegruppe. "
 "Tavaliselt annab selle internetiteenuse pakkuja."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr "Nõustaja seadistas edukalt serveri uudisegruppide teenuse."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -762,56 +757,45 @@ msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja uudisegruppide teenuse "
 "seadistamiseks:"
 
-#: ../news_wizard/news.wiz_.c:22
-msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
-msgstr "See nõustaja aitab seadistada uudisegruppide teenused."
-
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Uudisegruppide seadistamine"
-
-#: ../news_wizard/news.wiz_.c:24
-msgid ""
-"The wizard successfully configured your Internet News service of your server."
-msgstr "Nõustaja seadistas edukalt serveri uudisegruppide teenuse."
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Pollimise periood (tundides):"
 
-#: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "Uudisegruppide nõustaja"
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Uudisteserveri nimi:"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../news_wizard/news.wiz_.c:20
 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."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"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."
+"Interneti masinanimed peavad olema kujul \\qhost.domeen.domeenitüüp\\q. Kui "
+"selleks on näiteks \\qpakkuja.ee\\q, siis on uudisegruppide server "
+"tavaliselt \\qnews.pakkuja.ee\\q."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
-msgid "NFS Server Configuration Wizard"
-msgstr "NFS serveri seadistamise nõustaja"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "Tere tulemast uudistegruppide nõustajasse"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
-msgstr "Võrgumask :"
+#: ../news_wizard/news.wiz_.c:24
+msgid "News Server"
+msgstr "Uudisteserver"
 
-#: ../nfs_wizard/nfs.wiz_.c:5
-msgid "NFS Server"
-msgstr "NFS server"
+#: ../news_wizard/news.wiz_.c:25
+msgid "News Server:"
+msgstr "Uudisteserver:"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "Nõustaja seadistas edukalt Teie NFS serveri"
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Autoriseeritud võrk:"
 
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
-msgid "All - No access restriction"
-msgstr "Kõik - ei mingeid ligipääsupiiranguid"
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Ligipääsu kontroll"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
 "Access will be allowed for hosts on the network. Here is the information "
 "found about your current local network, you can modify it if needed."
@@ -819,106 +803,149 @@ msgstr ""
 "Ligipääs lubatakse kõigile võrgu masinatele. Siin on info, mis leiti Teie "
 "praeguse kohtvõrgu kohta; vajadusel võite seda muuta."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Ligipääsu kontroll"
-
-#: ../nfs_wizard/nfs.wiz_.c:11
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr "See nõustaja aitab seadistada NFS serveri."
+#: ../nfs_wizard/nfs.wiz_.c:4
+msgid "Access :"
+msgstr "Ligipääs :"
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
 msgid "Local Network - access for local network (recommended)"
 msgstr "Kohtvõrk - ligipääs kohtvõrgule (soovitatav)"
 
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr "NFS võib olla piiratud teatud ip-klassiga"
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "Autoriseeritud võrk:"
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+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."
 
-#: ../nfs_wizard/nfs.wiz_.c:15
+#: ../nfs_wizard/nfs.wiz_.c:8
 msgid "Exported dir:"
 msgstr "Eksporditud kataloog:"
 
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
+#: ../nfs_wizard/nfs.wiz_.c:9
+msgid "The wizard collected the following parameters."
+msgstr "Nõustaja kogus järgmised andmed."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
+msgid "NFS Server Configuration Wizard"
+msgstr "NFS serveri seadistamise nõustaja"
+
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
+msgstr "NFS võib olla piiratud teatud ip-klassiga"
+
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "NFS nõustaja"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
 msgid "Grant access on local network"
 msgstr "Ligipääsu võimaldamine kohtvõrgule"
 
+#: ../nfs_wizard/nfs.wiz_.c:15
+msgid "NFS Server"
+msgstr "NFS server"
+
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
+msgid "All - No access restriction"
+msgstr "Kõik - ei mingeid ligipääsupiiranguid"
+
 #: ../nfs_wizard/nfs.wiz_.c:18
-msgid "The wizard collected the following parameters."
-msgstr "Nõustaja kogus järgmised andmed."
+msgid "Netmask :"
+msgstr "Võrgumask :"
 
 #: ../nfs_wizard/nfs.wiz_.c:19
-msgid "Access :"
-msgstr "Ligipääs :"
-
-#: ../nfs_wizard/nfs.wiz_.c:20
 msgid "Directory:"
 msgstr "Kataloog:"
 
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
+msgid "This wizard will help you configuring the NFS Server for your network."
+msgstr "See nõustaja aitab seadistada NFS serveri."
+
 #: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "NFS nõustaja"
+msgid "The wizard successfully configured your NFS Server"
+msgstr "Nõustaja seadistas edukalt Teie NFS serveri"
 
-#: ../postfix_wizard/postfix.wiz_.c:1
-msgid "Do It"
-msgstr "Tee"
+#: ../postfix_wizard/postfix.wiz_.c:2
+#, fuzzy
+msgid "There seems to be a problem..."
+msgstr ""
+"Tundub, et siin on mingi probleem... minge küsige abi \"suurelt arvutiisalt\""
 
 #: ../postfix_wizard/postfix.wiz_.c:3
-msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
-msgstr ""
-"Võite valida aadressi, mida väljuv kiri näitab väljadel \\qKellelt:\\q ja "
-"\\qVastus:\\q."
+msgid "Internet Mail Gateway"
+msgstr "Meililüüs"
 
 #: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "E-posti serveri seadistamine"
+msgid "Outgoing Mail Address"
+msgstr "Väljuva kirja aadress"
 
 #: ../postfix_wizard/postfix.wiz_.c:6
-msgid "Postfix wizard"
-msgstr "Postfixi nõustaja"
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr "Nõustaja seadistas edukalt Teie e-posti teenuse."
 
 #: ../postfix_wizard/postfix.wiz_.c:7
-msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
-msgstr ""
-"Server saadab väljuvad kirjad läbi meililüüsi, mis hoolitseb nende "
-"päralejõudmise eest."
+msgid "Do It"
+msgstr "Tee"
 
 #: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"This wizard will help you configuring the Internet Mail services for your "
-"network."
-msgstr "See nõustaja aitab seadistada Teie võrgu e-posti teenused."
-
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Väljuva kirja aadress"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
-msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr ""
 "See peaks olema kooskõlas aadressiga, mida Te kasutate sissetulevate kirjade "
 "jaoks."
 
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
+
 #: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
-msgstr ""
-"Tundub, et siin on mingi probleem... minge küsige abi \"suurelt arvutiisalt\""
+msgid "You entered an empty address for the mail gateway."
+msgstr "Meililüüsi aadress on tühi."
 
 #: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "Selline ei ole hea maskeraad!"
+msgid "Internet Mail Configuration Wizard"
+msgstr "E-posti teenuse seadistamise nõustaja"
 
 #: ../postfix_wizard/postfix.wiz_.c:13
+msgid "Postfix wizard"
+msgstr "Postfixi nõustaja"
+
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Meiliserveri nimi:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
+msgid ""
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
+msgstr ""
+"Valik võib olla aktsepteeritav, kuid see ei luba Teil saata kirju väljapoole "
+"oma kohtvõrku. Jätkamiseks vajutage nupule 'Järgmine' või nupule 'Tagasi', "
+"kui soovite midagi muuta."
+
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet Mail services for your "
+"network."
+msgstr "See nõustaja aitab seadistada Teie võrgu e-posti teenused."
+
+#: ../postfix_wizard/postfix.wiz_.c:18
+msgid ""
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
+msgstr ""
+"Server saadab väljuvad kirjad läbi meililüüsi, mis hoolitseb nende "
+"päralejõudmise eest."
+
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -926,11 +953,7 @@ msgstr ""
 "Kui valite praegu seadistamise kasuks, jätkate automaatselt Postfixi "
 "seadistamisega"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Aadressi vorm"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -940,136 +963,131 @@ msgstr ""
 "näiteks teenusepakkuja on \\qpakkuja.ee\\q, siis on meiliserver tavaliselt "
 "\\qsmtp.pakkuja.ee\\q või \\qmail.pakkuja.ee\\q"
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "E-posti teenuse seadistamise nõustaja"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Võite valida aadressi, mida väljuv kiri näitab väljadel \\qKellelt:\\q ja "
+"\\qVastus:\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "E-posti serveri seadistamine"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr ""
 "Nõustaja kogus järgmised andmed, mida on vaja e-posti teenuse seadistamiseks:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
-msgid "Mail Address:"
-msgstr "E-posti aadress:"
-
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Meililüüsi aadress on tühi."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
-msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
-msgstr "Nõustaja seadistas edukalt Teie e-posti teenuse."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Meililüüs"
-
 #: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Meiliserveri nimi:"
+msgid "Masquerade not good!"
+msgstr "Selline ei ole hea maskeraad!"
 
 #: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"Valik võib olla aktsepteeritav, kuid see ei luba Teil saata kirju väljapoole "
-"oma kohtvõrku. Jätkamiseks vajutage nupule 'Järgmine' või nupule 'Tagasi', "
-"kui soovite midagi muuta."
+msgid "Form of the Address"
+msgstr "Aadressi vorm"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../postfix_wizard/postfix.wiz_.c:29
+msgid "Mail Address:"
+msgstr "E-posti aadress:"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"Vahemälu on muutmälu (RAM) kogus, mida eraldatakse "
-"puhverdamisoperatsioonideks (pange tähele, et kogu squid-protsessi tegelik "
-"mälunõudlus on paar korda suurem)."
-
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Vahendaja port:"
+"Kui valite praegu seadistamise kasuks, jätkate automaatselt vahendaja "
+"seadistamisega."
 
 #: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "Nõustaja seadistas edukalt Teie vahendaja serveri."
-
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "Sisestatud port võib olla kasulik selleks teenuseks:"
+msgid "Proxy Configuration Wizard"
+msgstr "Vahendaja seadistamise nõustaja"
 
 #: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Vahendaja serverite hierarhia"
-
-#: ../proxy_wizard/proxy.wiz_.c:9
-msgid ""
-"Squid is a web caching proxy server, it allows faster web access for your "
-"local network."
+msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr ""
-"Squid on veebivahendaja server, mis lubab kohtvõrgule kiiremat pääsu veebi."
+"Valida tuleb port, mille number on suurem kui 1024 ja väiksem kui 65535"
+
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Selle nõustaja peab käivitama administraatorina"
 
 #: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Ligipääsu kontroll:"
+
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "Vahendaja seadistamine"
+
+#: ../proxy_wizard/proxy.wiz_.c:13
 msgid "Define an upper level proxy"
 msgstr "Ülemise taseme (teenusepakkuja poolse) vahendaja määramine"
 
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "Failisüsteem            Suurus  Kasutatud Saadaval Kasutus% Ühendatud"
+
 #: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Kettaruum (MB):"
+msgid ""
+"Squid is a web caching proxy server, it allows faster web access for your "
+"local network."
+msgstr ""
+"Squid on veebivahendaja server, mis lubab kohtvõrgule kiiremat pääsu veebi."
 
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "Ülemise taseme vahendaja nimi:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "See nõustaja aitab seadistada Teie vahendaja serveri."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Ülemise taseme vahendaja port:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Lihtsalt teadmiseks, et /var/spool/squid kataloogis on kettaruumi:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr "Ketta vahemälu on kettaruum, mida kasutatakse puhverdamiseks kettal."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "Vahendaja seadistamine"
+msgid "Proxy Port"
+msgstr "Vahendaja port"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"Vahendaja pordi väärtus määrab, millisel pordil vahendaja server kuulab HTTP-"
-"päringuid. Vaikimisi on see 3128, teine levinud väärtus on 8080, aga igal "
-"juhul peab pordi number olema suurem kui 1024."
+"Kasutada võib nii numbrilist vormingut (nt \\q192.168.1.0/255.255.255.0\\q) "
+"või tekstivormingut (nt \\qdomeen.ee\\q)."
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Squidi nõustaja"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Port:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"Selle väärtusega nõustumiseks vajutage nupule 'Järgmine' või nupule "
+"'Tagasi', kui soovite midagi muuta."
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "Failisüsteem            Suurus  Kasutatud Saadaval Kasutus% Ühendatud"
+msgid "You have entered a port that may be useful for this service:"
+msgstr "Sisestatud port võib olla kasulik selleks teenuseks:"
 
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Selle nõustaja peab käivitama administraatorina"
+#: ../proxy_wizard/proxy.wiz_.c:27
+msgid "/etc/services:"
+msgstr "/etc/services:"
 
-#: ../proxy_wizard/proxy.wiz_.c:26
+#: ../proxy_wizard/proxy.wiz_.c:28
+msgid "Cache hierarchy"
+msgstr "Vahendaja serverite hierarhia"
+
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
@@ -1077,190 +1095,158 @@ msgstr ""
 "Võite julgelt valida \\qÜlemise taseme vahendaja puudub\\q, kui Te seda ei "
 "vaja."
 
-#: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Vahemälu (MB):"
-
-#: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Ligipääsu kontroll:"
+#: ../proxy_wizard/proxy.wiz_.c:30
+msgid "Port:"
+msgstr "Port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Kui valite praegu seadistamise kasuks, jätkate automaatselt vahendaja "
-"seadistamisega."
-
-#: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Vahendaja port"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Väärtuse muutmiseks vajutage nupule 'Tagasi'."
+"Lisavõimalusena võib Squidi seadistada ühena hierarhias. Võite lisada "
+"ülemise taseme vahendaja, millele HTTP-päringud edasi suunatakse. Selleks "
+"peate määrama ülemise taseme vahendaja nime ja pordi."
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
-"Sisestage sobilik nimi (nt \\qcache.domeen.ee\\q) ja kasutatav vahendaja "
-"port."
+"Nõustaja kogus järgmised andmed, mida on vaja vahendaja seadistamiseks:"
 
-#: ../proxy_wizard/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Vahemälu (MB):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Ülemise taseme vahendaja puudub (soovitatav)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr ""
-"Valida tuleb port, mille number on suurem kui 1024 ja väiksem kui 65535"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Vahendaja vahemälu suurus"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Väärtuse muutmiseks vajutage nupule 'Tagasi'."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Selle väärtusega nõustumiseks vajutage nupule 'Järgmine' või nupule "
-"'Tagasi', kui soovite midagi muuta."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Localhost - ligipääs on lubatud ainult käesolevale serverile"
+"Vahendaja pordi väärtus määrab, millisel pordil vahendaja server kuulab HTTP-"
+"päringuid. Vaikimisi on see 3128, teine levinud väärtus on 8080, aga igal "
+"juhul peab pordi number olema suurem kui 1024."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Kasutada võib nii numbrilist vormingut (nt \\q192.168.1.0/255.255.255.0\\q) "
-"või tekstivormingut (nt \\qdomeen.ee\\q)."
+msgid "Squid wizard"
+msgstr "Squidi nõustaja"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Vahendaja seadistamise nõustaja"
+msgid "Proxy port:"
+msgstr "Vahendaja port:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Kettaruum (MB):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "Ülemise taseme vahendaja nimi:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Localhost - ligipääs on lubatud ainult käesolevale serverile"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"Lisavõimalusena võib Squidi seadistada ühena hierarhias. Võite lisada "
-"ülemise taseme vahendaja, millele HTTP-päringud edasi suunatakse. Selleks "
-"peate määrama ülemise taseme vahendaja nime ja pordi."
+"Vahemälu on muutmälu (RAM) kogus, mida eraldatakse "
+"puhverdamisoperatsioonideks (pange tähele, et kogu squid-protsessi tegelik "
+"mälunõudlus on paar korda suurem)."
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"Nõustaja kogus järgmised andmed, mida on vaja vahendaja seadistamiseks:"
+"Sisestage sobilik nimi (nt \\qcache.domeen.ee\\q) ja kasutatav vahendaja "
+"port."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 "Vahendajat võib seadistada erinevaid ligipääsu kontrolli tasemeid kasutades."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Ülemise taseme vahendaja port:"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "See nõustaja aitab seadistada Teie vahendaja serveri."
-
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Lihtsalt teadmiseks, et /var/spool/squid kataloogis on kettaruumi:"
-
-#: ../samba_wizard/samba.wiz_.c:1
-msgid "Enable file sharing area"
-msgstr "Failide jagamisala lubamine"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
-"* Näide 2: masinate lubamine, mis vastavad antud võrgule/võrgumaskile\\n "
-"lubatud masinad = 150.203.15.0/255.255.255.0"
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "Nõustaja seadistas edukalt Teie vahendaja serveri."
 
 #: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr "Minu reeglid - küsi minu käest lubatud ja keelatud masinaid"
+msgid "Home:"
+msgstr "Kodukataloog:"
+
+#: ../samba_wizard/samba.wiz_.c:4
+msgid "Enable all printer"
+msgstr "Kõigi printerite lubamine"
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Töögrupp:"
+msgid "Make home directories available for their owners"
+msgstr "Kodukataloog on kättesaadav nende omanikele"
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr ""
-"Kui valite praegu seadistamise kasuks, jätkate automaatselt SAMBA "
-"seadistamisega."
-
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
-msgstr ""
-"Valige, millised printerid peaksid olema kättesaadavad tuntud kasutajatele"
+msgid "Configuring Samba"
+msgstr "Samba seadistamine"
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "Serveri nimetus ei ole korrektne"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
+msgstr "Minu reeglid - küsi minu käest lubatud ja keelatud masinaid"
 
 #: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
-msgstr "See nõustaja aitab seadistada serveri Samba-teenused."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba peab teadma Windowsi töögruppi, mida ta teenindab."
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
+msgstr "Märkus: ligipääs nõuab siiski sobivat kasutaja parooli."
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Samba-teenused on lubatud"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+"Samba võib pakkuda Teie Windows-tööjaamadele ühist failijagamisala, samuti "
+"Teie serveriga ühendatud printerite jagamist."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr "Lubatud masinad:"
+msgid "The wizard successfully configured your Samba server."
+msgstr "Nõustaja seadistas edukalt Teie Samba-serveri."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr "Nõustaja kogus järgmised andmed, mida on vaja Samba seadistamiseks."
+msgid "Server Banner."
+msgstr "Serveri nimetus."
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Nimetus:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Trükiserver:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Töögrupp"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Töögrupp:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-"* Näide 4: ainult masinate lubamine, mis on NIS grupis \\qfoonet\\q, kuid "
-"ühe konkreetse masina keelamine\\nlubatud masinad = @foonet\\nkeelatud "
-"masinad = pirate"
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"Nimetus on identiteet, millena see server näitab ennast Windowsi tööjaamades."
+"* Näide 3: kahe kasutaja lubamine\\nlubatud kasutajad = laplane, tuhajuss"
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Failijagamine:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1268,11 +1254,27 @@ msgstr ""
 "Te lubasite kasutajatele ligipääsu nende kodukataloogile, kuid Teil/neil "
 "tuleb kasutada sinna pääsemise parooli määramiseks smbpasswordi."
 
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+"* Näide 1: kõigi IP-de lubamine aadressil 150.203.*.*, välja arvatud üks"
+"\\nlubatud masinad = 150.203. EXCEPT 150.203.6.66"
+
+#: ../samba_wizard/samba.wiz_.c:24
+msgid "Printers:"
+msgstr "Printerid:"
+
 #: ../samba_wizard/samba.wiz_.c:25
-msgid "Enable all printer"
-msgstr "Kõigi printerite lubamine"
+msgid "The Server Banner is incorrect"
+msgstr "Serveri nimetus ei ole korrektne"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Samba seadistamise nõustaja"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1280,278 +1282,254 @@ msgstr ""
 "Samba võimaldab Teie serveril toimida faili- ja trükiserverina tööjaamadele, "
 "mis kasutavad mitte-Linuxi süsteeme."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
-msgstr "Faili loabitid"
-
 #: ../samba_wizard/samba.wiz_.c:28
-msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
-msgstr ""
-"* Näide 1: kõigi IP-de lubamine aadressil 150.203.*.*, välja arvatud üks"
-"\\nlubatud masinad = 150.203. EXCEPT 150.203.6.66"
+msgid "Deny hosts:"
+msgstr "Keelatud masinad:"
 
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "Samba seadistamine"
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr "See nõustaja aitab seadistada serveri Samba-teenused."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr "kirjutamisnimekiri:"
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr "Serveri nimetus:"
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
-msgstr "Serveri nimetus."
+msgid "Enabled Samba Services"
+msgstr "Samba-teenused on lubatud"
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
-msgstr "Märkus: ligipääs nõuab siiski sobivat kasutaja parooli."
+msgid "Enable Server Printer Sharing"
+msgstr "Serveri printeri(te) jagamine on lubatud"
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "Töögrupp on vale"
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
+msgstr ""
+"Valige, millised printerid peaksid olema kättesaadavad tuntud kasutajatele"
 
-#: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
-msgstr "Keelatud masinad:"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Kui valite praegu seadistamise kasuks, jätkate automaatselt SAMBA "
+"seadistamisega."
 
-#: ../samba_wizard/samba.wiz_.c:40
-msgid "Access control"
-msgstr "Ligipääsu kontroll"
+#: ../samba_wizard/samba.wiz_.c:38
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
+msgstr "Nõustaja kogus järgmised andmed, mida on vaja Samba seadistamiseks."
 
-#: ../samba_wizard/samba.wiz_.c:41
+#: ../samba_wizard/samba.wiz_.c:39
 msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+"The banner is the way this server will be described in the Windows "
+"workstations."
 msgstr ""
-"Samba võib pakkuda Teie Windows-tööjaamadele ühist failijagamisala, samuti "
-"Teie serveriga ühendatud printerite jagamist."
+"Nimetus on identiteet, millena see server näitab ennast Windowsi tööjaamades."
+
+#: ../samba_wizard/samba.wiz_.c:41
+msgid "read list:"
+msgstr "lugemisnimekiri:"
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Nimetus:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "Nõustaja seadistas edukalt Teie Samba-serveri."
+msgid "The Workgroup is wrong"
+msgstr "Töögrupp on vale"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba peab teadma Windowsi töögruppi, mida ta teenindab."
+msgid "Samba wizard"
+msgstr "Samba nõustaja"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Serveri nimetus:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 msgid "Access level :"
 msgstr "Ligipääsu tase :"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Trükiserver:"
-
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Samba nõustaja"
-
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Samba seadistamise nõustaja"
+msgid "Workgroup"
+msgstr "Töögrupp"
 
-#: ../samba_wizard/samba.wiz_.c:52
-msgid "Make home directories available for their owners"
-msgstr "Kodukataloog on kättesaadav nende omanikele"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr "Lubatud masinad:"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:49
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
 "\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
 msgstr ""
 "Kirjutage kasutajad või grupp, eraldajaks koma (gruppidele peab eelnema märk "
 "\\'@\\'), näiteks :\\nroot, fred, @users, @wheel igat liiki loa jaoks."
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Serveri printeri(te) jagamine on lubatud"
-
-#: ../samba_wizard/samba.wiz_.c:56
-msgid "Printers:"
-msgstr "Printerid:"
-
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Kodukataloog:"
-
-#: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr "lugemisnimekiri:"
+#: ../samba_wizard/samba.wiz_.c:50
+msgid "Access control"
+msgstr "Ligipääsu kontroll"
 
-#: ../samba_wizard/samba.wiz_.c:60
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
-"* Näide 3: kahe kasutaja lubamine\\nlubatud kasutajad = laplane, tuhajuss"
+"* Näide 4: ainult masinate lubamine, mis on NIS grupis \\qfoonet\\q, kuid "
+"ühe konkreetse masina keelamine\\nlubatud masinad = @foonet\\nkeelatud "
+"masinad = pirate"
 
-#: ../server_wizard/server.wiz_.c:2
+#: ../samba_wizard/samba.wiz_.c:53
+msgid "Enable file sharing area"
+msgstr "Failide jagamisala lubamine"
+
+#: ../samba_wizard/samba.wiz_.c:56
 msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
 msgstr ""
-"Valige võrguliides (tavaliselt kaart), mida server peaks kasutama võrguga "
-"ühenduse loomiseks. See on seade kohtvõrgu jaoks, mis ei pruugi olla sama "
-"seade, mida Te kasutate pääsuks Internetti."
+"* Näide 2: masinate lubamine, mis vastavad antud võrgule/võrgumaskile\\n "
+"lubatud masinad = 150.203.15.0/255.255.255.0"
 
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "Serveri IP-aadress ei ole korrektne"
+#: ../samba_wizard/samba.wiz_.c:58
+msgid "File Sharing:"
+msgstr "Failijagamine:"
 
-#: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "Lüüsi (gateway) seade:"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
+msgstr "Faili loabitid"
 
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Serveri nõustaja"
+#: ../server_wizard/server.wiz_.c:2
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "See nõustaja määrab Teie serveri peamised võrguparameetrid."
 
-# väga veider definitsioon... RK
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
-"Võrguaadressid koosnevad neljast arvust, millest igaüks on väiksem kui 256 "
-"ja mida eraldavad punktid; viimane peab olema null."
+#: ../server_wizard/server.wiz_.c:4
+msgid "Host Name:"
+msgstr "Masina nimi:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "võrguseade"
+msgid "Basic Network Configuration Wizard"
+msgstr "Võrgu üldseadistuse nõustaja"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "Võrguaadress on vale"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Nonii, on kohe päris usutav, et selle kohtvõrgu domeeninimi ja IP aadressid "
-"ERINEVAD serveri \\qvälise\\q ühenduse vastavatest parameetritest."
+msgid "Server IP address:"
+msgstr "Serveri IP-aadress:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Võrguaadress"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "Selle nõustaja töötamise ajal ei peaks töötama ükski muu rakendus ning "
 "nõustajaga töö lõpetades tuleks seanss lõpetada ja uuesti sisse logida."
 
-#: ../server_wizard/server.wiz_.c:11
-msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
-msgstr ""
-"See on välise lüüsi (gateway) praegune väärtus (määrati kindlaks esialgse "
-"paigalduse ajal). Seade (võrgukaart või modem) peaks olema erinev sellest, "
-"mida kasutatakse sisevõrgu jaoks."
-
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
-msgstr ""
-"Need nõustajad vaatlevad Teie arvutit kui serverit, mis haldab oma kohtvõrku "
-"(C-klassi võrk)."
+"The wizard successfully configured the basic networking services of your "
+"server."
+msgstr "Nõustaja seadistas edukalt Teie serveri põhilised võrguteenused."
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Seade:"
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
+msgstr "(siin saab neid väärtusi muuta, kui Te ikka teate täpselt, mida teete)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Hoiatus"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"Võrguaadress on number, mis identifitseerib Teie võrku. Pakutav väärtus on "
+"mõeldud seadistusele, mis ei ole ühendatud internetti või on ühendatud IP "
+"maskeraadi kaudu. Kui Te just ei tea täpselt, mida teete, rahulduge pakutud "
+"väärtusega."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "See lehekülg arvutab domeeninime ja peaks olema mittenähtav"
+msgid "Note about networking"
+msgstr "Märkus võrgu kohta"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Serveri aadress:"
+msgid "Server Address"
+msgstr "Serveri aadress"
 
+# väga veider definitsioon... RK
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Arvutatud domeeni nimi"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"Võrguaadressid koosnevad neljast arvust, millest igaüks on väiksem kui 256 "
+"ja mida eraldavad punktid; viimane peab olema null."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "Masina nimi"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Märkus: lüüsi IP-aadress ei peaks olema tühi, kui Te soovite ligipääsu ka "
+"muule maailmale."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-"See lehekülg arvutab vaikimisi serveri aadressi ja peaks olema mittenähtav."
+msgid "The Server IP address is incorrect"
+msgstr "Serveri IP-aadress ei ole korrektne"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Võrgu üldseadistuse nõustaja"
+msgid "Configuring your network"
+msgstr "Võrgu seadistamine"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "Lüüsi (gateway) IP:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "Masina nimi ei ole korrektne"
+msgid "This page computes the default server address; it should be invisible."
+msgstr ""
+"See lehekülg arvutab vaikimisi serveri aadressi ja peaks olema mittenähtav."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"Interneti nimed peavad olema kujul \\qmasin.domeen.domeenitüüp\\q. Kui Teie "
-"server on Interneti server, siis peab domeeni nimi olema Teie teenusepakkuja "
-"juures registreeritud. Kui see on vaid intranetiserver, sobib igasugune "
-"nimi, näiteks \\qfirma.ee\\q."
+msgid "IP net address:"
+msgstr "IP võrgu aadress:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Väline lüüs"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"Võrguaadress on number, mis identifitseerib Teie võrku. Pakutav väärtus on "
-"mõeldud seadistusele, mis ei ole ühendatud internetti või on ühendatud IP "
-"maskeraadi kaudu. Kui Te just ei tea täpselt, mida teete, rahulduge pakutud "
-"väärtusega."
+msgid "Server Wizard"
+msgstr "Serveri nõustaja"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
-msgstr "See nõustaja aitab seadistada peamised võrguteenused."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
+msgstr ""
+"Nonii, on kohe päris usutav, et selle kohtvõrgu domeeninimi ja IP aadressid "
+"ERINEVAD serveri \\qvälise\\q ühenduse vastavatest parameetritest."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "See nõustaja määrab Teie serveri peamised võrguparameetrid."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Märkus võrgu kohta"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Märkus: lüüsi IP-aadress ei peaks olema tühi, kui Te soovite ligipääsu ka "
-"muule maailmale."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Nõustaja viga."
+"Valige võrguliides (tavaliselt kaart), mida server peaks kasutama võrguga "
+"ühenduse loomiseks. See on seade kohtvõrgu jaoks, mis ei pruugi olla sama "
+"seade, mida Te kasutate pääsuks Internetti."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1559,19 +1537,38 @@ msgstr ""
 "Seadmed on näidatud nende Linuxi nimega ja (kui on teada, siis ka) kaardi "
 "kirjeldusega."
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Võrguaadress:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"See on välise lüüsi (gateway) praegune väärtus (määrati kindlaks esialgse "
+"paigalduse ajal). Seade (võrgukaart või modem) peaks olema erinev sellest, "
+"mida kasutatakse sisevõrgu jaoks."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "Võrgu seadistamine"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr "See nõustaja aitab seadistada peamised võrguteenused."
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "Lüüsi (gateway) IP:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"Serveri IP-aadress on number, mis tuvastab Teie serveri võrgus; pakutud "
+"väärtus on mõeldud eravõrgule, mis ei ole Internetis nähtav või on ühenduses "
+"IP maskeraadi abil; kui Te ei ole eneses kindel, jätke kehtima vaikeväärtus."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "Masina nimi ei ole korrektne"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1580,406 +1577,423 @@ msgstr ""
 "Masinanimi on nimi, mis eristab Teie serverit teistest tööjaamadest "
 "kohtvõrgus ja võib-olla ka Internetis (sõltuvalt Teie väljavooluseadetest)."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "Masina nimi:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Nõustaja viga."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "võrguseade"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "Arvutatud domeeni nimi"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "See lehekülg arvutab domeeninime ja peaks olema mittenähtav"
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "Lüüsi (gateway) seade:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
 msgstr "Nõustaja kogus järgmised andmed, mida on vaja võrgu seadistamiseks"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"Välisühendus on võrk, mille suhtes arvuti on klient (Internet või "
-"väljavooluvõrk) ja millega arvuti on ühendatud mõne teise võrgu või modemi "
-"kaudu."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Hoiatus"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr "(siin saab neid väärtusi muuta, kui Te ikka teate täpselt, mida teete)"
+msgid "Device:"
+msgstr "Seade:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"Serveri IP-aadress on number, mis tuvastab Teie serveri võrgus; pakutud "
-"väärtus on mõeldud eravõrgule, mis ei ole Internetis nähtav või on ühenduses "
-"IP maskeraadi abil; kui Te ei ole eneses kindel, jätke kehtima vaikeväärtus."
+"Need nõustajad vaatlevad Teie arvutit kui serverit, mis haldab oma kohtvõrku "
+"(C-klassi võrk)."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Serveri nimi:"
+msgid "Server Address:"
+msgstr "Serveri aadress:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "Võrguaadress on vale"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"Välisühendus on võrk, mille suhtes arvuti on klient (Internet või "
+"väljavooluvõrk) ja millega arvuti on ühendatud mõne teise võrgu või modemi "
+"kaudu."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Serveri aadress"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
-msgstr "Nõustaja seadistas edukalt Teie serveri põhilised võrguteenused."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
+msgstr ""
+"Interneti nimed peavad olema kujul \\qmasin.domeen.domeenitüüp\\q. Kui Teie "
+"server on Interneti server, siis peab domeeni nimi olema Teie teenusepakkuja "
+"juures registreeritud. Kui see on vaid intranetiserver, sobib igasugune "
+"nimi, näiteks \\qfirma.ee\\q."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "Võrguseade"
+msgid "Host Name"
+msgstr "Masina nimi"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "IP võrgu aadress:"
+msgid "Network Address:"
+msgstr "Võrguaadress:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Võrguaadress"
+msgid "Network Device"
+msgstr "Võrguseade"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "Serveri IP-aadress:"
+msgid "Server Name:"
+msgstr "Serveri nimi:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "Adelaide'i ülikool, Lõuna-Austraalia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Paris Sud ülikool, Prantsusmaa"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Ajaserveri testi alustamiseks vajutage nupule 'Järgmine'."
+msgid "University of Manchester, Manchester, England"
+msgstr "Manchesteri ülikool, Manchester, Inglismaa"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Ajaserverid"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Limoges' ülikool, Prantsusmaa"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Sekundaarne ajaserver:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Kanada Meteoroloogiakeskus, Dorval (Quebec), Kanada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr "Seega on Teie server kohalik ajaserver Teie võrgu jaoks."
+msgid "Press next to start the time servers test."
+msgstr "Ajaserveri testi alustamiseks vajutage nupule 'Järgmine'."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
-"Teie server on nüüd valmis täitma kohtvõrgu jaoks ajaserveri ülesandeid."
+"Võite proovida veel kord ühendust saada ajaserveritega või salvestada "
+"seadistuse ilma aega tegelikult määramata."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Tšernogolovka teaduskeskus, Moskva oblast, Venemaa"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(palun valige serverid Teie lähedases geograafilises piirkonnas)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylori meditsiinikolledž, Houston (Texas), USA"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "Oklahoma Ülikool, Norman (Oklahoma), USA"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Valige ajavöönd:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "Regina ülikool, Regina (Saskatchewan), Kanada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr ""
-"vajutage alustamiseks nupule 'Järgmine' või nõustajast lahkumiseks 'Loobu'"
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Trinity kolledž, Dublin, Iirimaa"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, Prantsusmaa"
+msgid "Singapore"
+msgstr "Singapur"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Limoges' ülikool, Prantsusmaa"
+msgid "Secondary Time Server:"
+msgstr "Sekundaarne ajaserver:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT infosüsteemid, Cambridge (Massachusetts), USA"
+msgid "Try again"
+msgstr "Proovi uuesti"
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
-msgstr "Valige nimekirjast primaarne ja sekundaarne server."
+msgid "The Chinese University of Hong Kong"
+msgstr "Hongkongi Hiina Ülikool"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(palun valige serverid Teie lähedases geograafilises piirkonnas)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNVL insenerikolledž, Las Vegas (Nevada), USA"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, Prantsusmaa"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante), Hispaania"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Kanada Meteoroloogiakeskus, Dorval (Quebec), Kanada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "Kanada Rahvuslik Teadusnõukogu, Ottawa (Ontario), Kanada"
 
+#: ../time_wizard/time.wiz_.c:18
+msgid "Select a primary and secondary server from the list."
+msgstr "Valige nimekirjast primaarne ja sekundaarne server."
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "Manchesteri ülikool, Manchester, Inglismaa"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, Prantsusmaa"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- väline võrk puudub"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Inc., Soul, Korea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Kui ajaserver otsekohe ei vasta (võrguvea või mõne muu põhjuse tõttu), tuleb "
-"Teil oodata umbes 30 sekundit."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Tšernogolovka teaduskeskus, Moskva oblast, Venemaa"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Ajaserverite saadavuse testimine"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washingtoni osariigi ülikool, Richland (Washington), USA"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "Oslo ülikool, Norra"
+msgid "University of Adelaide, South Australia"
+msgstr "Adelaide'i ülikool, Lõuna-Austraalia"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "Arvutiteaduskond, Wisconsin-Madisoni ülikool, USA"
+msgid "Time zone:"
+msgstr "Ajavöönd:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Trinity kolledž, Dublin, Iirimaa"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Ajaserverid ei vasta. Põhjuseks võib olla:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "Regina ülikool, Regina (Saskatchewan), Kanada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Caeni ülikool, Prantsusmaa"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Ajaserverid ei vasta. Põhjuseks võib olla:"
+msgid "- other reasons..."
+msgstr "- muud põhjused..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Šveitsi Föderaalne Tehnoloogiainstituut"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Kui ajaserver otsekohe ei vasta (võrguvea või mõne muu põhjuse tõttu), tuleb "
+"Teil oodata umbes 30 sekundit."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Caeni ülikool, Prantsusmaa"
+msgid "WARNING"
+msgstr "HOIATUS"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, Prantsusmaa"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, Prantsusmaa"
 
 #: ../time_wizard/time.wiz_.c:31
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
-"See nõustaja abistab määrata Teie serveri aja sünkroniseeritult välise "
-"ajaserveriga."
+"Teie server on nüüd valmis täitma kohtvõrgu jaoks ajaserveri ülesandeid."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "HOIATUS"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Fukuoka Ülikool, Fukuoka, Jaapan"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Inc., Soul, Korea"
+msgid "Time Servers"
+msgstr "Ajaserverid"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "Oklahoma Ülikool, Norman (Oklahoma), USA"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Šveitsi Föderaalne Tehnoloogiainstituut"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "Hongkongi Hiina Ülikool"
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"See nõustaja abistab määrata Teie serveri aja sünkroniseeritult välise "
+"ajaserveriga."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- muud põhjused..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, Prantsusmaa"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- olematud ajaserverid"
+msgid "Testing the time servers availability"
+msgstr "Ajaserverite saadavuse testimine"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Ajavöönd:"
+msgid "Save config without test"
+msgstr "Seadete salvestamine testimata"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Arvutiteaduse teaduskond, Strathclyde'i Ülikool, Glasgow, Šotimaa"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Võite proovida veel kord ühendust saada ajaserveritega või salvestada "
-"seadistuse ilma aega tegelikult määramata."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn State University, University Park (Pennsylvania), USA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT infosüsteemid, Cambridge (Massachusetts), USA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Primaarne ajaserver:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylori meditsiinikolledž, Houston (Texas), USA"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Proovi uuesti"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn State University, University Park (Pennsylvania), USA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washingtoni osariigi ülikool, Richland (Washington), USA"
+msgid "- non existent time servers"
+msgstr "- olematud ajaserverid"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Ajaserveri seaded salvestatud"
+msgid "Time wizard"
+msgstr "Aja nõustaja"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Paris Sud ülikool, Prantsusmaa"
+msgid "University of Oslo, Norway"
+msgstr "Oslo ülikool, Norra"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr "Seega on Teie server kohalik ajaserver Teie võrgu jaoks."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Seadete salvestamine testimata"
+msgid "- no outside network"
+msgstr "- väline võrk puudub"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapur"
+msgid "Primary Time Server:"
+msgstr "Primaarne ajaserver:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Fukuoka Ülikool, Fukuoka, Jaapan"
+msgid "Time server configuration saved"
+msgstr "Ajaserveri seaded salvestatud"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNVL insenerikolledž, Las Vegas (Nevada), USA"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr ""
+"vajutage alustamiseks nupule 'Järgmine' või nõustajast lahkumiseks 'Loobu'"
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante), Hispaania"
+msgid "Choose a time zone:"
+msgstr "Valige ajavöönd:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Aja nõustaja"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr "kasutaja http-alamkataloog : ~/"
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr "Arvutiteaduskond, Wisconsin-Madisoni ülikool, USA"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
-msgstr "Moodulid :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
+msgstr ""
+"Kasutajamoodul: lubab kasutajatel muuta kataloogi nende kodukataloogides "
+"kättesaadavaks Teie http-serveril aadressil http://www.teieserver.ee/"
+"~kasutaja, selle kataloogi nime päritakse hiljem."
 
 #: ../web_wizard/web.wiz_.c:3
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid ""
+"Your server can act as a Web Server toward your internal network (intranet) "
+"and as a Web Server for the Internet."
 msgstr ""
-"Ärge märkige ühtegi kastikest, kui Te ei soovi oma veebiserverit aktiveerida."
+"Server võib toimida veebiserverina nii Teie kohtvõrgu (intranet) kui "
+"Interneti jaoks."
 
 #: ../web_wizard/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr "Nõustaja seadistas edukalt intraneti/Interneti veebiserveri"
+msgid "Internet web server:"
+msgstr "Interneti veebiserver:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
-msgstr "kasutaja kataloog:"
+msgid "Modules :"
+msgstr "Moodulid :"
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
-msgstr ""
-"Nõustaja kogus järgmised andmed, mida on vaja veebiserveri seadistamiseks"
+#: ../web_wizard/web.wiz_.c:6
+#, fuzzy
+msgid "Document root:"
+msgstr "dokumentide juurkataloog:"
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Veebinõustaja"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
+msgstr "kasutaja http-alamkataloog : ~/"
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
-msgstr "See nõustaja aitab seadistada veebiserveri."
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Veebiserveri lubamine intranetile"
 
 #: ../web_wizard/web.wiz_.c:12
-msgid "Internet web server:"
-msgstr "Interneti veebiserver:"
+msgid "Configuring the Web Server"
+msgstr "Veebiserveri seadistamine"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Veebiserveri lubamine intranetile"
+msgid "Web Server"
+msgstr "Veebiserver"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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/web.wiz_.c:15
 msgid "Enable the Web Server for the Internet"
 msgstr "Veebiserveri lubamine Internetile"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Jagatud kataloog:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "Valige veebiteenus, mida soovite aktiveerida:"
+#, fuzzy
+msgid "This wizard will help you configuring the Web Server for your network."
+msgstr "See nõustaja aitab seadistada veebiserveri."
 
 #: ../web_wizard/web.wiz_.c:17
-msgid "document root:"
-msgstr "dokumentide juurkataloog:"
+msgid "Web wizard"
+msgstr "Veebinõustaja"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 msgid "Intranet web server:"
 msgstr "Intraneti veebiserver:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 "Kirjutage kataloogi nimi, mida kasutajad võivad luua oma kodukataloogi (ilma "
 "~/), et muuta see kättesaadavaks aadressil http://www.teieserver.ee/~kasutaja"
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "Veebiserveri seadistamine"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
-msgstr ""
-"Kasutajamoodul: lubab kasutajatel muuta kataloogi nende kodukataloogides "
-"kättesaadavaks Teie http-serveril aadressil http://www.teieserver.ee/"
-"~kasutaja, selle kataloogi nime päritakse hiljem."
+msgid "activate user module"
+msgstr "kasutajamooduli aktiveerimine"
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Veebiserver"
+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."
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Veebiserveri seadistamise nõustaja"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "Valige veebiteenus, mida soovite aktiveerida:"
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr ""
+"Nõustaja kogus järgmised andmed, mida on vaja veebiserveri seadistamiseks"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
-msgstr "Sisestage kataloogi asukoht, mis peaks olema dokumentide juurkataloog."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr "Nõustaja seadistas edukalt intraneti/Interneti veebiserveri"
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
+msgstr "Dokumentide juurkataloog:"
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
-msgstr "kasutajamooduli aktiveerimine"
+msgid "Type the path of the directory you want being the document root."
+msgstr "Sisestage kataloogi asukoht, mis peaks olema dokumentide juurkataloog."
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr "Dokumentide juurkataloog:"
+msgid "Web Server Configuration Wizard"
+msgstr "Veebiserveri seadistamise nõustaja"
 
 msgid "Cancel"
 msgstr "Loobu"
@@ -1996,6 +2010,9 @@ msgstr "lubatud"
 msgid "disabled"
 msgstr "keelatud"
 
+#~ msgid "user dir:"
+#~ msgstr "kasutaja kataloog:"
+
 #~ msgid ""
 #~ "%s is not installed\n"
 #~ "Click \"Next\" to install or \"Cancel\" to quit"
diff --git a/po/eu.po b/po/eu.po
index e7d4f6ac..25b93dd6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard VERSION\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-10-20 14:20+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -14,200 +14,201 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Zure bertako sareko bezeroa, bere izen eta IP zenbaki propioa duen sarera "
-"konektatutako makina da."
+"Sakatu Hurrengoa parametro hauek orain konfiguratzeko, edo Etsi morroia "
+"uzteko."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "Hau ez da helbide zuzena... sakatu hurrengoa jarraitzeko"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "Ados"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"Sakatu hurrengoa orain dagoen balioa aldatzeko, edo atzera zure aukera "
-"zuzentzeko."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Zorionak"
+"Orain konfiguratzea hautatzen baduzu, automatikoki Bezeroaren "
+"konfigurazioarekin jarraituko duzu"
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "DNS Bezero Morroia"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr "Sakatu hurrengoa hasteko edo Etsi morroi hau uzteko."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"Zure bezeroa sarean izenaren arabera identifikatuko da, bezeroizena."
+"kompainia.net adibidean bezala. Sareko makina orok izan behar du IP helbidea "
+"(desberdina), ohiko puntudun eran."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "Morroiak zure sarera bezero bat gehitzeko behar diren hurrengo parametroak "
 "bildu ditu:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Sistemaren okerra, ez da konfiguratu"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "Bezero izena"
+msgid "The wizard successfully added the client."
+msgstr "Morroiak bezeroa gehitu du."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Zure sarera bezero berria gehitzen"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(ez daukazu izenaren ondoren domeinua jarri beharrik)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Konfiguratu"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"Ohartu emaniko IP zenbakia eta bezero izena sarean daudenen desberdina izan "
+"behar dela."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Bezero identifikazioa:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Oharra:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(ez daukazu izenaren ondoren domeinua jarri beharrik)"
+msgid "Name of the machine:"
+msgstr "Makinaren izena:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Orain konfiguratzea hautatzen baduzu, automatikoki Bezeroaren "
-"konfigurazioarekin jarraituko duzu"
+msgid "Adding a new client to your network"
+msgstr "Zure sarera bezero berria gehitzen"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Zerbitzariak, hemen sartzen dituzun informazioak, bezeroaren izena sareko "
-"beste makinei eskaintzeko erabiliko du."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Sistemaren okerra, ez da konfiguratu"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Erabileran dagoen makina izena edo IP zenbakia sartu duzu."
+msgid "Client identification:"
+msgstr "Bezero identifikazioa:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "Morroiak bezeroa gehitu du."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr ""
+"Morroi honek zure bertoko DNSn bezero berri bat gehitzen lagunduko dizu."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "Makinaren izena:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "Ados"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"Zure bezeroa sarean izenaren arabera identifikatuko da, bezeroizena."
-"kompainia.net adibidean bezala. Sareko makina orok izan behar du IP helbidea "
-"(desberdina), ohiko puntudun eran."
+"Zure bertako sareko bezeroa, bere izen eta IP zenbaki propioa duen sarera "
+"konektatutako makina da."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"Ohartu emaniko IP zenbakia eta bezero izena sarean daudenen desberdina izan "
-"behar dela."
+"Balio hauek onartu, eta zure bezeroa gehitzeko, klikatu Hurrengoa botoia edo "
+"erabili Atzera botoia hauek zuzentzeko."
 
-#: ../client_wizard/client.wiz_.c:21
-msgid "DNS Wizard (add client)"
-msgstr "DNS Morroia (bezeroa gehitu)"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "Hau ez da helbide zuzena... sakatu hurrengoa jarraitzeko"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Adi\\ndhcp moduan zaude, zerbitzariak ezin du lan egin zure "
-"konfigurazioarekin."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "Bezeroaren IP:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "Makinaren IP zenbakia:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Konfiguratu"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Irten"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "root izan behar duzu morroi hau exekutatzeko"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Sarea ez dago oraindik konfiguratuta"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr ""
-"Morroi honek zure bertoko DNSn bezero berri bat gehitzen lagunduko dizu."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Erabileran dagoen makina izena edo IP zenbakia sartu duzu."
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+msgid "DNS Wizard (add client)"
+msgstr "DNS Morroia (bezeroa gehitu)"
+
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Irten"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"Balio hauek onartu, eta zure bezeroa gehitzeko, klikatu Hurrengoa botoia edo "
-"erabili Atzera botoia hauek zuzentzeko."
+"Adi\\ndhcp moduan zaude, zerbitzariak ezin du lan egin zure "
+"konfigurazioarekin."
 
 #: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Sakatu hurrengoa hasteko edo Etsi morroi hau uzteko."
-
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Sakatu Hurrengoa parametro hauek orain konfiguratzeko, edo Etsi morroia "
-"uzteko."
+"Zerbitzariak, hemen sartzen dituzun informazioak, bezeroaren izena sareko "
+"beste makinei eskaintzeko erabiliko du."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "root izan behar duzu morroi hau exekutatzeko"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Zorionak"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "Makinaren IP zenbakia:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "Bezeroaren IP:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Sakatu hurrengoa orain dagoen balioa aldatzeko, edo atzera zure aukera "
+"zuzentzeko."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
@@ -215,28 +216,15 @@ msgstr ""
 "Sareko oinarrizko parametroak konfiguratu behar dituzu morroi honi deitu "
 "aurretik."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Oharra:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Ezarpen Morroia"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "MySQL Datubase Zerbitzaria"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Mesedez sartu erabiltzaile-izena eta pasahitza erabiltzailea gehitzeko"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "Bezero izena"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Erabiltzailea gehitzeko"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -244,77 +232,69 @@ msgstr ""
 "Balio hauek onartu, eta zure bezeroa gehitzeko, klikatu \\qOnartu\\q gainean "
 "edo erabili Atzera botoia hauek zuzentzeko."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Mesedez idatzi pasahitza root erabiltzailearentzat:"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "MySQL Datubase Zerbitzaria ezartzen"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "Morroiak MySQL Datubase Zerbitzaria konfiguratu du"
+msgid "Confirm"
+msgstr "Baieztatu"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Datubase Zerbitzaria"
+msgid "Password:"
+msgstr "Pasahitza:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Root Pasahitza:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "Morroiak MySQL Datubase Zerbitzaria konfiguratu du"
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Baieztatu"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "Barkatu, root izan behar duzu hau egiteko..."
+msgid "Username:"
+msgstr "Erabiltzaile-izena:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Pasahitza:"
+msgid "Add"
+msgstr "Gehitu"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Orain konfiguratzea hautatzen baduzu, automatikoki MySQL Datubasearen "
-"konfigurazioarekin jarraituko duzu"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "Barkatu, root izan behar duzu hau egiteko..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
-"Morroi honek MySQL Datubase Zerbitzaria zure sarerako konfiguratzen "
-"lagunduko dizu."
+msgid "Database Server"
+msgstr "Datubase Zerbitzaria"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Erabiltzaile-izena:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Oharra: Erabiltzaile honek baimen guztiak izango ditu"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Gehitu"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Mesedez idatzi pasahitza root erabiltzailearentzat:"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "MySQL Datubase morroia"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "MySQL Datubase Zerbitzaria ezartzen"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Ezarpen Morroia"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr ""
 "Zure zerbitzaria exekutatzeko, lehenengo root pasahitza zehaztu behar duzu"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "MySQL Datubase morroia"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Root Pasahitza:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "MySQL Datubase Zerbitzaria"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -322,35 +302,61 @@ msgstr ""
 "Morroiak, zure MySQL Datubase Zerbitzaria konfiguratzeko behar diren "
 "ondorengo parametroak bildu ditu"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
 msgstr ""
-"IP helbideak puntuz banatuta, 256 baino txikiago diren lau zenbakiz "
-"osatutako zerrendak dira"
+"Morroi honek MySQL Datubase Zerbitzaria zure sarerako konfiguratzen "
+"lagunduko dizu."
+
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Mesedez sartu erabiltzaile-izena eta pasahitza erabiltzailea gehitzeko"
+
+#: ../db_wizard/db.wiz_.c:27
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
+msgstr ""
+"Orain konfiguratzea hautatzen baduzu, automatikoki MySQL Datubasearen "
+"konfigurazioarekin jarraituko duzu"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../dhcp_wizard/dhcp.wiz_.c:1
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr ""
+"Morroiak, zure DHCP zerbitzua konfiguratzeko behar diren ondorengo "
+"parametroak bildu ditu:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Konpondu"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
-"Aukeratu DHCP zerbitzuak lanestazioei emango dien helbideen tartea, behar "
-"bereziak ez badituzu, arazorik gabe onartu ditzakezu proposaturiko balioak."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "IP Helbide Handiena:"
+msgid "Lowest IP Address:"
+msgstr "IP Helbide Txikiena:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "dhcp-k erabilitako helbide tartea"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr ""
+"IP helbideak puntuz banatuta, 256 baino txikiago diren lau zenbakiz "
+"osatutako zerrendak dira"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -358,98 +364,84 @@ msgstr ""
 "Balio hauek onartu, eta zure zerbitzaria konfiguratzeko, klikatu Hurrengoa "
 "botoia edo erabili Atzera botoia hauek zuzentzeko."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"DHCP, zure lanestazioei sareko helbideak era automatikoan banatzen dien "
-"zerbitzu bat da."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "DHCP Morroia"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Konpondu"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr ""
+"Morroi honek zure zerbitzariaren DHCP zerbitzuak konfiguratzen lagunduko "
+"dizu."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "dhcp-k erabilitako helbide tartea"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Morroiak zure zerbitzariaren DHCP zerbitzuak konfiguratu ditu."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr ""
-"Morroi honek zure zerbitzariaren DHCP zerbitzuak konfiguratzen lagunduko "
-"dizu."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"Morroiak, zure DHCP zerbitzua konfiguratzeko behar diren ondorengo "
-"parametroak bildu ditu:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "IP Helbide Txikiena:"
+"Aukeratu DHCP zerbitzuak lanestazioei emango dien helbideen tartea, behar "
+"bereziak ez badituzu, arazorik gabe onartu ditzakezu proposaturiko balioak."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "DHCP Ezarpen Morroia"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "Zehaztutako IP tartea ez da zuzena"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
+"DHCP, zure lanestazioei sareko helbideak era automatikoan banatzen dien "
+"zerbitzu bat da."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "Zehaztutako IP tartea ez da zuzena"
+msgid "Highest IP Address:"
+msgstr "IP Helbide Handiena:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
-msgstr "DHCP Morroia"
+msgid "DHCP Configuration Wizard"
+msgstr "DHCP Ezarpen Morroia"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "DHCP Zerbitzaria ezartzen"
 
-#: ../dns_wizard/dns.wiz_.c:2
-msgid "DNS Wizard (configuration)"
-msgstr "DNS Morroia (ezarpena)"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"Morroiak zure DNS zerbitzua konfiguratzeko behar diren hurrengo parametroak "
-"bildu ditu:"
+"Zure ezarpena onargarria da, baino ez duzu zure bertako saretik kanpo dauden "
+"makinak identifikatzerik izango."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr ""
+"Sakatu Hurrengoa balio hauek hutsik uzteko, edo Atzera balioa sartzeko."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Lehenengo DNS Helbidea:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "DNS Zerbitzaria ezartzen"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Bigarren DNS Helbidea:"
+msgid "DNS Configuration Wizard"
+msgstr "DNS Ezarpen Morroia"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "DNS Zerbitzari Helbideak"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Morroi honek zure zerbitzariaren DNS zerbitzuak konfiguratzen lagunduko "
-"dizu. Konfigurazio honek bertako DNS zerbitzua eskainiko du bertako "
-"konputagailuen izenentzako, bertokoak ez diren izenen eskaerak kanpoko DNS "
-"batera berbidaliko ditu."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -461,42 +453,53 @@ msgstr ""
 "lehen eta bigarren mailako DNS zerbitzarien helbideak eman behar dituzu. "
 "Normalean helbide hauek Internet hornitzaileak ematen ditu."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "Morroiak arrakastaz ezarri du zure zerbitzariaren DNS zerbitzua."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "DNS zerbitzariarentzako helbide hutsa sartu duzu."
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
-"Sakatu Hurrengoa balio hauek hutsik uzteko, edo Atzera balioa sartzeko."
-
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "DNS Ezarpen Morroia"
+"Morroiak zure DNS zerbitzua konfiguratzeko behar diren hurrengo parametroak "
+"bildu ditu:"
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Lehenengo DNS Helbidea:"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
+msgstr "DNS Zerbitzari Helbideak"
 
-#: ../dns_wizard/dns.wiz_.c:20
+#: ../dns_wizard/dns.wiz_.c:17
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Zure ezarpena onargarria da, baino ez duzu zure bertako saretik kanpo dauden "
-"makinak identifikatzerik izango."
+"DNS (Domain Name Server / Domeinuko Izen Zerbitzua) zerbitzuak egiten du "
+"baliokide makina bat interneteko ostalari izen batekin."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Bigarren DNS Helbidea:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"DNS (Domain Name Server / Domeinuko Izen Zerbitzua) zerbitzuak egiten du "
-"baliokide makina bat interneteko ostalari izen batekin."
+"Morroi honek zure zerbitzariaren DNS zerbitzuak konfiguratzen lagunduko "
+"dizu. Konfigurazio honek bertako DNS zerbitzua eskainiko du bertako "
+"konputagailuen izenentzako, bertokoak ez diren izenen eskaerak kanpoko DNS "
+"batera berbidaliko ditu."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "Morroiak arrakastaz ezarri du zure zerbitzariaren DNS zerbitzua."
+msgid "DNS Wizard (configuration)"
+msgstr "DNS Morroia (ezarpena)"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -507,62 +510,69 @@ msgid "Please select a wizard"
 msgstr "Hautatu morroi bat mesedez"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Gailua"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "Ertaina - web, ftp eta ssh erakutsi kanpo aldera"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr "Indartsua - kanpokoa ikusterik ez, erabiltzaileak web-era mugatuta"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Zeozer ikaragarria gertatu da"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Suhesi Ezarpen Morroia"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"Morroiak zure suhesia konfiguratzeko behar diren hurrengo parametroak bildu "
+"ditu:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr ""
+"Suhesiak zure barneko sarea babesten du Internetetik datozen eta baimenik ez "
+"duten sarrera saioetatik."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "Internet Sareko Gailua:"
+msgid "Device"
+msgstr "Gailua"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Konpondu"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Suhesi morroia"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Batere ez - Babesik ez"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "Babes Maila:"
+msgid "Internet Network Device:"
+msgstr "Internet Sareko Gailua:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Suhesi morroia"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Suhesia konfiguratu daiteke beste babes maila batzuk eskaintzeko; hautatu "
+"zure beharrei dagokion maila. Ez badakizu, maila Ertaina da normalean "
+"egokiena."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "Morroiak arrakastaz ezarri du zure zerbitzari suhesia."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "Ertaina - web, ftp eta ssh erakutsi kanpo aldera"
+msgid "The device name is not correct"
+msgstr "Gailuaren izena ez da zuzena"
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "Babes Maila"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Konpondu"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Amaitu"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Suhesi Ezarpen Morroia"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "Gailuaren izena ez da zuzena"
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -570,91 +580,102 @@ msgstr ""
 "Suhesiak jakin behar du zure zerbitzaria Internetera lotuta nola dagoen; "
 "hautatu kanpo loturan erabiltzen duzun gailua."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr ""
-"Suhesiak zure barneko sarea babesten du Internetetik datozen eta baimenik ez "
-"duten sarrera saioetatik."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "Babes Maila"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "Suhesia ezartzen"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Zeozer ikaragarria gertatu da"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "Sareko Suhesi Gailua"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Batere ez - Babesik ez"
+msgid "The wizard successfully configured your server firewall."
+msgstr "Morroiak arrakastaz ezarri du zure zerbitzari suhesia."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
+msgid "Configuring the Firewall"
+msgstr "Suhesia ezartzen"
+
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Amaitu"
+
+#: ../firewall_wizard/firewall.wiz_.c:24
+#, fuzzy
 msgid "This wizard will help you configuring your server firewall."
 msgstr "Morroi honek zure suhesi zerbitzaria konfiguratzen lagunduko dizu."
 
-#: ../firewall_wizard/firewall.wiz_.c:23
+#: ../firewall_wizard/firewall.wiz_.c:25
 msgid "Low - Light filtering, standard services available"
 msgstr "Apala - Iragazpen arina, zerbitzu estandarrak erabilgarri"
 
-#: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "Sareko Suhesi Gailua"
+#: ../firewall_wizard/firewall.wiz_.c:26
+msgid "Protection Level:"
+msgstr "Babes Maila:"
 
-#: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
-"Morroiak zure suhesia konfiguratzeko behar diren hurrengo parametroak bildu "
-"ditu:"
+"Morroi honek FTP Zerbitzaria zure sarerako konfiguratzen lagunduko dizu."
 
-#: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Suhesia konfiguratu daiteke beste babes maila batzuk eskaintzeko; hautatu "
-"zure beharrei dagokion maila. Ez badakizu, maila Ertaina da normalean "
-"egokiena."
+#: ../ftp_wizard/ftp.wiz_.c:3
+#, fuzzy
+msgid "Public directory:"
+msgstr "Direktorioa:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "Aukeratu gaitu nahi duzun FTP zerbitzu mota:"
+#: ../ftp_wizard/ftp.wiz_.c:4
+msgid "Internet FTP Server:"
+msgstr "Internet FTP Zerbitzaria:"
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr "Sartu duzun bidea ez da existitzen."
+#: ../ftp_wizard/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "Gaitu FTP Zerbitzaria Intraneterako"
 
 #: ../ftp_wizard/ftp.wiz_.c:7
-msgid "Internet FTP Server:"
-msgstr "Internet FTP Zerbitzaria:"
+msgid "FTP wizard"
+msgstr "FTP morroia"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "FTP Zerbitzaria"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
-msgstr "Morroiak zure Intranet/Internet FTP Zerbitzaria konfiguratu du"
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr "Ez markatu lauki bat ere ez baduzu FTP Zerbitzaria aktibatu nahi."
 
 #: ../ftp_wizard/ftp.wiz_.c:12
-#, fuzzy
-msgid "Public directory:"
-msgstr "Direktorioa:"
+msgid "Configuring the FTP Server"
+msgstr "FTP Zerbitzaria konfiguratzen"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
-msgstr "Idatzi elkarbanatua izan dadin nahi duzun direktorioaren bidea."
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "Gaitu FTP Zerbitzaria Interneterako"
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "Intranet FTP Zerbitzaria:"
 
 #: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "Gaitu FTP Zerbitzaria Intraneterako"
+msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgstr "Morroiak zure Intranet/Internet FTP Zerbitzaria konfiguratu du"
+
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "Aukeratu gaitu nahi duzun FTP zerbitzu mota:"
+
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr "Elkarbanatutako dir:"
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
@@ -662,60 +683,36 @@ msgstr ""
 "Morroiak, zure FTP Zerbitzaria konfiguratzeko behar diren hurrengo "
 "parametroak bildu ditu"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "FTP morroia"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
-msgstr ""
-"Morroi honek FTP Zerbitzaria zure sarerako konfiguratzen lagunduko dizu."
-
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "Gaitu FTP Zerbitzaria Interneterako"
-
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "Intranet FTP Zerbitzaria:"
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
+msgstr "Sartu duzun bidea ez da existitzen."
 
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP Zerbitzariaren Konfigurazio Morroia"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "FTP Zerbitzaria konfiguratzen"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Ez markatu lauki bat ere ez baduzu FTP Zerbitzaria aktibatu nahi."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "FTP Zerbitzaria"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr "Idatzi elkarbanatua izan dadin nahi duzun direktorioaren bidea."
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
-msgstr "Elkarbanatutako dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Berrien Zerbitzari Izena:"
+msgid "Polling Interval:"
+msgstr "Arakatzeko Tartea:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "Ongi etorri Berrien Morroira"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Arakatze Epea (Orduak):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "Berrien Zerbitzariak"
+msgid "Polling Period"
+msgstr "Arakatze Epea"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -725,29 +722,32 @@ msgstr ""
 "berriak lortzeko; arakatze epeak bi arakatze jarraien arteko tartea ezartzen "
 "du."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+"Morroi honek Internet Berrien Zerbitzua zure sarerako konfiguratzen "
+"lagunduko dizu."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "Berrien Morroia"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "Arakatze epea ez da zuzena"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "Berrien zerbitzari izena ez da zuzena"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Arakatzeko Tartea:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Internet ostalari izenak \\qostalaria.domeinua.domeinumota\\q erakoak izan "
-"behar dira; adibidez, zure hornitzailea \\qhornitzailea.com\\q bada, bere "
-"interneteko berrien zerbitzaria normalean \\qnews.hornitzailea.com\\q da."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Arakatze Epea"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Internet Berriak konfiguratzen"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -755,15 +755,7 @@ msgstr ""
 "Daukazun internet loturaren arabera, arakatzeko epe egokia 6 eta 24 ordu "
 "bitarteko izan daiteke."
 
-#: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "Arakatze epea ez da zuzena"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "Berrien Zerbitzaria:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -772,7 +764,13 @@ msgstr ""
 "ostalariaren izena da; izena normalean zure Internet hornitzaileak emango "
 "dizu."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr ""
+"Morroiak zure zerbitzariko Interneteko Berrien Zerbitzua konfiguratu du."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -780,31 +778,64 @@ msgstr ""
 "Morroiak zure Interneteko Berrien Zerbitzua konfiguratzeko behar diren "
 "hurrengo parametroak bildu ditu:"
 
-#: ../news_wizard/news.wiz_.c:22
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Arakatze Epea (Orduak):"
+
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Berrien Zerbitzari Izena:"
+
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Morroi honek Internet Berrien Zerbitzua zure sarerako konfiguratzen "
-"lagunduko dizu."
+"Internet ostalari izenak \\qostalaria.domeinua.domeinumota\\q erakoak izan "
+"behar dira; adibidez, zure hornitzailea \\qhornitzailea.com\\q bada, bere "
+"interneteko berrien zerbitzaria normalean \\qnews.hornitzailea.com\\q da."
 
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Internet Berriak konfiguratzen"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "Ongi etorri Berrien Morroira"
 
 #: ../news_wizard/news.wiz_.c:24
+msgid "News Server"
+msgstr "Berrien Zerbitzariak"
+
+#: ../news_wizard/news.wiz_.c:25
+msgid "News Server:"
+msgstr "Berrien Zerbitzaria:"
+
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Baimendutako sarea:"
+
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Sarrera Kontrola"
+
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
-"The wizard successfully configured your Internet News service of your server."
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr ""
-"Morroiak zure zerbitzariko Interneteko Berrien Zerbitzua konfiguratu du."
+"Sarrera baimenduko zaie sareko ostalariei. Hemen dago zure bertako sareari "
+"buruz aurkitu den informazioa, aldatu dezakezu beharrezkoa bada."
 
-#: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "Berrien Morroia"
+#: ../nfs_wizard/nfs.wiz_.c:4
+#, fuzzy
+msgid "Access :"
+msgstr "Sarrera Kontrola:"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
+msgstr "Bertako Sarea - sarrera bertako sarearentzat (gomendatua)"
+
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
 msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
+"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 ""
@@ -812,113 +843,123 @@ msgstr ""
 "\"maila da normalean egokiena. Kontu izan \"Guztiak\" maila segurua ez "
 "izatea posible dela."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:8
+#, fuzzy
+msgid "Exported dir:"
+msgstr "Elkarbanatutako dir:"
+
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
+msgstr ""
+"Morroiak Samba konfiguratzeko behar diren hurrengo parametroak bildu ditu."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "NFS Zerbitzariaren Konfigurazio Morroia"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
-msgstr ""
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
+msgstr "NFS can be restricted to a certain ip class"
+
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "NFS Morroia"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
+msgstr "Eman bertako sarean sarbidea"
 
-#: ../nfs_wizard/nfs.wiz_.c:5
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "NFS Zerbitzaria"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "Morroiak zure NFS Zerbitzaria konfiguratu du"
-
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "Guztiak - Sartzeko mugarik ez"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
-msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+#: ../nfs_wizard/nfs.wiz_.c:18
+msgid "Netmask :"
 msgstr ""
-"Sarrera baimenduko zaie sareko ostalariei. Hemen dago zure bertako sareari "
-"buruz aurkitu den informazioa, aldatu dezakezu beharrezkoa bada."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Sarrera Kontrola"
+#: ../nfs_wizard/nfs.wiz_.c:19
+msgid "Directory:"
+msgstr "Direktorioa:"
 
-#: ../nfs_wizard/nfs.wiz_.c:11
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 msgid "This wizard will help you configuring the NFS Server for your network."
 msgstr ""
 "Morroi honek NFS Zerbitzaria zure sarerako konfiguratzen lagunduko dizu."
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
-msgstr "Bertako Sarea - sarrera bertako sarearentzat (gomendatua)"
-
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr "NFS can be restricted to a certain ip class"
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "Baimendutako sarea:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
-#, fuzzy
-msgid "Exported dir:"
-msgstr "Elkarbanatutako dir:"
-
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
-msgstr "Eman bertako sarean sarbidea"
+#: ../nfs_wizard/nfs.wiz_.c:21
+msgid "The wizard successfully configured your NFS Server"
+msgstr "Morroiak zure NFS Zerbitzaria konfiguratu du"
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:2
 #, fuzzy
-msgid "The wizard collected the following parameters."
+msgid "There seems to be a problem..."
 msgstr ""
-"Morroiak Samba konfiguratzeko behar diren hurrengo parametroak bildu ditu."
+"Dirudienez arazo bat dago... joan eta galdetu eskilaratan behera dagoen "
+"gizon beltz handiari"
 
-#: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "Sarrera Kontrola:"
+#: ../postfix_wizard/postfix.wiz_.c:3
+msgid "Internet Mail Gateway"
+msgstr "Internet Posta Ataria"
 
-#: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr "Direktorioa:"
+#: ../postfix_wizard/postfix.wiz_.c:5
+msgid "Outgoing Mail Address"
+msgstr "Kanporantz zuzendutako Posta Helbidea"
 
-#: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "NFS Morroia"
+#: ../postfix_wizard/postfix.wiz_.c:6
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr "Morroiak zure zerbitzariaren Internet Posta Zerbitzua konfiguratu du."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "Egin"
 
-#: ../postfix_wizard/postfix.wiz_.c:3
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
-"Aukeratu dezakezu kanporantz zuzendutako postak \\qNork:\\q eta \\qErantzun-"
-"honi\\q eremuetan erakutsiko duen helbide mota."
+"Hau barrurantz zuzendutako postarentzako erabiltzen duzun helbidearekin bat "
+"etorri beharko litzateke"
 
-#: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "Internet Posta konfiguratzen"
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:11
+msgid "You entered an empty address for the mail gateway."
+msgstr "Helbide hutsa sartu duzu posta atariarentzat."
+
+#: ../postfix_wizard/postfix.wiz_.c:12
+msgid "Internet Mail Configuration Wizard"
+msgstr "Internet Posta Konfigurazio Morroia"
+
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Postfix morroia"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Posta Zerbitzari Izena:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"Zure zerbitzariak kanporantz zuzendurikoa posta atari baten bitartez "
-"bidaliko du, honek hartuko du azke emanaldiaren ardura."
+"Zure aukera onartu daiteke, baino honekin ezingo duzu posta zure bertako "
+"saretik kanpora bidali. Sakatu Hurrengoa jarraitzeko, edo Atzera balio bat "
+"sartzeko."
 
-#: ../postfix_wizard/postfix.wiz_.c:8
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
@@ -926,30 +967,15 @@ msgstr ""
 "Morroi honek Internet Posta Zerbitzuak zure sarerako konfiguratzen lagunduko "
 "dizu."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Kanporantz zuzendutako Posta Helbidea"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr ""
-"Hau barrurantz zuzendutako postarentzako erabiltzen duzun helbidearekin bat "
-"etorri beharko litzateke"
-
-#: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
-"Dirudienez arazo bat dago... joan eta galdetu eskilaratan behera dagoen "
-"gizon beltz handiari"
-
-#: ../postfix_wizard/postfix.wiz_.c:12
-#, fuzzy
-msgid "Masquerade not good!"
-msgstr "Maskaratzea ez da ona!"
+"Zure zerbitzariak kanporantz zuzendurikoa posta atari baten bitartez "
+"bidaliko du, honek hartuko du azke emanaldiaren ardura."
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -957,11 +983,7 @@ msgstr ""
 "Orain konfiguratzea hautatzen baduzu, automatikoki POSTFIX "
 "konfigurazioarekin jarraituko duzu."
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Helbidearen tankera"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -971,11 +993,19 @@ msgstr ""
 "behar dira; adibidez, zure hornitzailea \\qhornitzailea.com\\q bada, bere "
 "interneteko posta zerbitzaria normalean \\qsmtp.hornitzailea.com\\q da."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Internet Posta Konfigurazio Morroia"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Aukeratu dezakezu kanporantz zuzendutako postak \\qNork:\\q eta \\qErantzun-"
+"honi\\q eremuetan erakutsiko duen helbide mota."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "Internet Posta konfiguratzen"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -983,69 +1013,59 @@ msgstr ""
 "Morroiak zure Internet Posta Zerbitzua konfiguratzeko behar diren hurrengo "
 "parametroak bildu ditu:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
-msgid "Mail Address:"
-msgstr "Posta Helbidea:"
-
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Helbide hutsa sartu duzu posta atariarentzat."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
-msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
-msgstr "Morroiak zure zerbitzariaren Internet Posta Zerbitzua konfiguratu du."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Internet Posta Ataria"
-
 #: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Posta Zerbitzari Izena:"
+#, fuzzy
+msgid "Masquerade not good!"
+msgstr "Maskaratzea ez da ona!"
 
 #: ../postfix_wizard/postfix.wiz_.c:28
+msgid "Form of the Address"
+msgstr "Helbidearen tankera"
+
+#: ../postfix_wizard/postfix.wiz_.c:29
+msgid "Mail Address:"
+msgstr "Posta Helbidea:"
+
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"Zure aukera onartu daiteke, baino honekin ezingo duzu posta zure bertako "
-"saretik kanpora bidali. Sakatu Hurrengoa jarraitzeko, edo Atzera balio bat "
-"sartzeko."
+"Orain konfiguratzea hautatzen baduzu, automatikoki Proxy-aren "
+"konfigurazioarekin jarraituko duzu"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../proxy_wizard/proxy.wiz_.c:4
+msgid "Proxy Configuration Wizard"
+msgstr "Proxy Konfigurazio Morroia"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
-msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
+#: ../proxy_wizard/proxy.wiz_.c:8
+msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr ""
-"Memoria Katxea, katxe memoria eragiketera zuzenduriko RAM kopurua da (ohartu "
-"squid prozesu osoaren benetazko memoria erabilera handiagoa dela)."
+"Portu bat aukeratu behar duzu, 1024 baino handiagoa eta 65535 baino txikiagoa"
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Proxy portua:"
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Morroi hau root bezala exekutatu behar da"
 
-#: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "Morroiak zure proxy zerbitzaria konfiguratu du."
+#: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Sarrera Kontrola:"
 
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "Zerbitzu honetarako erabilgarri izan daitekeen portu bat sartu duzu:"
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "Proxya konfiguratzen"
 
-#: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Katxe hierarkia"
+#: ../proxy_wizard/proxy.wiz_.c:13
+msgid "Define an upper level proxy"
+msgstr "Definitu gaineko mailako proxy bat"
+
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr ""
+"Fitxategi-Sistema   Neurria Erabilita Eskuragarri % Erabilera Muntatze-Puntua"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -1053,56 +1073,55 @@ msgstr ""
 "Squid web katxe proxy zerbitzari bat da, zure sareari web sarbide azkarragoa "
 "eskaintzen dio."
 
-#: ../proxy_wizard/proxy.wiz_.c:10
-msgid "Define an upper level proxy"
-msgstr "Definitu gaineko mailako proxy bat"
-
-#: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Diskoan lekua (MB):"
-
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "Gaineko mailako proxyaren ostalari-izena:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Morroi honek zure proxy zerbitzaria konfiguratzen lagunduko dizu."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Gaineko mailako proxy portua:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Jakingarri gisa, /var/spool/squid espazioa diskoan:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr "Disko Katxea, diskoan katxeatzeko erabili daitekeen disko lekua da."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "Proxya konfiguratzen"
+msgid "Proxy Port"
+msgstr "Proxy Portua"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"Proxy portu balioak ezartzen du zein portutan entzungo dituen proxy "
-"zerbitzariak http eskariak. Jatorriz 3128 da, beste balio arrunta 8080 izan "
-"daiteke, portu balioa 1024 baino handiagoa izan behar da."
+"Zenbakizko formatua, \\q192.168.1.0/255.255.255.0\\q, edo testu formatua, "
+"\\q.domeinua.net\\q, erabil dezakezu"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Squid morroia"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Portua:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"Hurrengoa sakatu balio hau mantendu nahi baduzu, edo Atzera zure aukera "
+"zuzentzeko."
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr ""
-"Fitxategi-Sistema   Neurria Erabilita Eskuragarri % Erabilera Muntatze-Puntua"
+msgid "You have entered a port that may be useful for this service:"
+msgstr "Zerbitzu honetarako erabilgarri izan daitekeen portu bat sartu duzu:"
 
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Morroi hau root bezala exekutatu behar da"
+#: ../proxy_wizard/proxy.wiz_.c:27
+msgid "/etc/services:"
+msgstr "/etc/services:"
 
-#: ../proxy_wizard/proxy.wiz_.c:26
+#: ../proxy_wizard/proxy.wiz_.c:28
+msgid "Cache hierarchy"
+msgstr "Katxe hierarkia"
+
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
@@ -1110,186 +1129,158 @@ msgstr ""
 "Arazorik gabe hautatu dezakezu \\qGaineko mailako proxy-rik ez\\q ezaugarri "
 "hau behar ez baduzu."
 
-#: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Memoria katxea (MB):"
-
-#: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Sarrera Kontrola:"
+#: ../proxy_wizard/proxy.wiz_.c:30
+msgid "Port:"
+msgstr "Portua:"
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Orain konfiguratzea hautatzen baduzu, automatikoki Proxy-aren "
-"konfigurazioarekin jarraituko duzu"
-
-#: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Proxy Portua"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Sakatu Atzera balioa aldatzeko."
+"Aukera bezala, Squid proxy jauzi bezala konfiguratu daiteke. Gaineko mailako "
+"proxy berria gehitu dezakezu bere ostalari-izena eta portu zehaztuta."
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
-"Sartu erabili beharreko proxyaren ostalari-izen kualifikatua (\\qcache."
-"domeinua.net\\q erakoa) eta portu zenbakia."
+"Morroiak zure proxya konfiguratzeko behar diren hurrengo parametroak bildu "
+"ditu:"
 
-#: ../proxy_wizard/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Memoria katxea (MB):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Gaineko mailako proxy-rik ez (gomendatua)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr ""
-"Portu bat aukeratu behar duzu, 1024 baino handiagoa eta 65535 baino txikiagoa"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Proxy Katxe Neurria"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Sakatu Atzera balioa aldatzeko."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Hurrengoa sakatu balio hau mantendu nahi baduzu, edo Atzera zure aukera "
-"zuzentzeko."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Localhost - sarbidea mugatuta zerbitzari honetara soilik"
+"Proxy portu balioak ezartzen du zein portutan entzungo dituen proxy "
+"zerbitzariak http eskariak. Jatorriz 3128 da, beste balio arrunta 8080 izan "
+"daiteke, portu balioa 1024 baino handiagoa izan behar da."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Zenbakizko formatua, \\q192.168.1.0/255.255.255.0\\q, edo testu formatua, "
-"\\q.domeinua.net\\q, erabil dezakezu"
+msgid "Squid wizard"
+msgstr "Squid morroia"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Proxy Konfigurazio Morroia"
+msgid "Proxy port:"
+msgstr "Proxy portua:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Diskoan lekua (MB):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "Gaineko mailako proxyaren ostalari-izena:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Localhost - sarbidea mugatuta zerbitzari honetara soilik"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"Aukera bezala, Squid proxy jauzi bezala konfiguratu daiteke. Gaineko mailako "
-"proxy berria gehitu dezakezu bere ostalari-izena eta portu zehaztuta."
+"Memoria Katxea, katxe memoria eragiketera zuzenduriko RAM kopurua da (ohartu "
+"squid prozesu osoaren benetazko memoria erabilera handiagoa dela)."
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"Morroiak zure proxya konfiguratzeko behar diren hurrengo parametroak bildu "
-"ditu:"
+"Sartu erabili beharreko proxyaren ostalari-izen kualifikatua (\\qcache."
+"domeinua.net\\q erakoa) eta portu zenbakia."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 "Proxya sarrera kontrol maila desberdinak erabil ditzan konfiguratu daiteke."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Gaineko mailako proxy portua:"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Morroi honek zure proxy zerbitzaria konfiguratzen lagunduko dizu."
-
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Jakingarri gisa, /var/spool/squid espazioa diskoan:"
-
-#: ../samba_wizard/samba.wiz_.c:1
-msgid "Enable file sharing area"
-msgstr "Fitxategi elkarbanatze gunea gaitu"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "Morroiak zure proxy zerbitzaria konfiguratu du."
 
 #: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr ""
+msgid "Home:"
+msgstr "Ataria:"
+
+#: ../samba_wizard/samba.wiz_.c:4
+#, fuzzy
+msgid "Enable all printer"
+msgstr "Gaitu \"inprimagailu guztiak\""
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Lantaldea:"
+msgid "Make home directories available for their owners"
+msgstr "Jarri atariko direktorioak beraien jabeentzako eskuragarri"
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr ""
-"Orain konfiguratzea hautatzen baduzu, automatikoki SAMBA konfigurazioarekin "
-"jarraituko duzu"
+msgid "Configuring Samba"
+msgstr "Samba Konfiguratzen"
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "Zerbitariaren Goiburua oker dago"
-
 #: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Sambak jakin behar du zerbitzatzen duen Windows Lantaldea"
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
-"Morroiak zure zerbitzariaren Samba zerbitzuak konfiguratzen lagunduko dizu."
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Aktibatu Samba Zerbitzuak"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+"Sambak fitxategiak elkarbanatzeko gunea hornitu dezake zure Windows "
+"lanestazioentzako, eta era berean inprimagailu elkarbanatzea hornitu dezake "
+"zure zerbitzarira lotutako inprimagailuentzako."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+msgid "The wizard successfully configured your Samba server."
+msgstr "Morroiak zure Samba zerbitzaria konfiguratu du"
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
-"Morroiak Samba konfiguratzeko behar diren hurrengo parametroak bildu ditu."
+msgid "Server Banner."
+msgstr "Zerbitzariaren Goiburua."
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Goiburua:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Inprimaketa Zerbitzaria:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Lantaldea"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Lantaldea:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"Goiburuaren bitartez deskribatuko da zerbitzaria Windows lanestazioetan"
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Fitxategi Elkarbanatzea:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1298,12 +1289,26 @@ msgstr ""
 "izan dezaten hautatu duzu, baino zuk/beraiek smbpasswd erabili beharko duzu "
 "pasahitza ezartzeko."
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "Gaitu \"inprimagailu guztiak\""
+msgid "Printers:"
+msgstr "Inprimaketa Zerbitzaria:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "Zerbitariaren Goiburua oker dago"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Samba Konfigurazio Morroia"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1311,289 +1316,259 @@ msgstr ""
 "Sambak zure zerbitzaria, Linux erabiltzen ez duten lanestazioentzako, "
 "fitxategi eta inprimaketa zerbitzari bezala lanegin dezan modua jartzen du."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
-msgstr "Fitxategi baimenak"
-
 #: ../samba_wizard/samba.wiz_.c:28
-msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "Samba Konfiguratzen"
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr ""
+"Morroiak zure zerbitzariaren Samba zerbitzuak konfiguratzen lagunduko dizu."
 
 #: ../samba_wizard/samba.wiz_.c:31
 #, fuzzy
 msgid "write list:"
 msgstr "idazteko zerrenda:"
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr "Zerbitzariaren Goiburua:"
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
-msgstr "Zerbitzariaren Goiburua."
+msgid "Enabled Samba Services"
+msgstr "Aktibatu Samba Zerbitzuak"
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "Gaitu Zerbitzari Inprimagailuen Elkarbanatzea"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "Lantaldea gaizki dago"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Orain konfiguratzea hautatzen baduzu, automatikoki SAMBA konfigurazioarekin "
+"jarraituko duzu"
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
+"Morroiak Samba konfiguratzeko behar diren hurrengo parametroak bildu ditu."
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "Sarrera Kontrola"
-
-#: ../samba_wizard/samba.wiz_.c:41
+#: ../samba_wizard/samba.wiz_.c:39
 msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+"The banner is the way this server will be described in the Windows "
+"workstations."
 msgstr ""
-"Sambak fitxategiak elkarbanatzeko gunea hornitu dezake zure Windows "
-"lanestazioentzako, eta era berean inprimagailu elkarbanatzea hornitu dezake "
-"zure zerbitzarira lotutako inprimagailuentzako."
+"Goiburuaren bitartez deskribatuko da zerbitzaria Windows lanestazioetan"
+
+#: ../samba_wizard/samba.wiz_.c:41
+#, fuzzy
+msgid "read list:"
+msgstr "irakurtzeko zerrenda:"
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Goiburua:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "Morroiak zure Samba zerbitzaria konfiguratu du"
+msgid "The Workgroup is wrong"
+msgstr "Lantaldea gaizki dago"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Sambak jakin behar du zerbitzatzen duen Windows Lantaldea"
+msgid "Samba wizard"
+msgstr "Samba morroia"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Zerbitzariaren Goiburua:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "Sarrera Kontrola:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Inprimaketa Zerbitzaria:"
-
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Samba morroia"
-
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Samba Konfigurazio Morroia"
+msgid "Workgroup"
+msgstr "Lantaldea"
 
-#: ../samba_wizard/samba.wiz_.c:52
-msgid "Make home directories available for their owners"
-msgstr "Jarri atariko direktorioak beraien jabeentzako eskuragarri"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:49
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
 "\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
 msgstr ""
 "Idatzi erabiltzaileak edo taldeak koma bitartez banatuta (taldeak \\'@'\\ "
 "aurrizkiarekin) honela: \\nroot, fred, @users, @wheel baimen mota "
 "bakoitzarentzako."
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Gaitu Zerbitzari Inprimagailuen Elkarbanatzea"
-
-#: ../samba_wizard/samba.wiz_.c:56
-#, fuzzy
-msgid "Printers:"
-msgstr "Inprimaketa Zerbitzaria:"
-
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Ataria:"
-
-#: ../samba_wizard/samba.wiz_.c:58
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "read list:"
-msgstr "irakurtzeko zerrenda:"
+msgid "Access control"
+msgstr "Sarrera Kontrola"
 
-#: ../samba_wizard/samba.wiz_.c:60
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../server_wizard/server.wiz_.c:2
+#: ../samba_wizard/samba.wiz_.c:53
+msgid "Enable file sharing area"
+msgstr "Fitxategi elkarbanatze gunea gaitu"
+
+#: ../samba_wizard/samba.wiz_.c:56
 msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
 msgstr ""
-"Aukeratu zerbitzariak zure sarera lotzeko erabili beharko lukeen sareko "
-"gailua (normalean txartel bat). Hau da zure bertako sarerako gailua, "
-"seguraski ez internet sarbiderako erabiltzen den berdina."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "Zerbitzariaren IP helbidea okerra da"
 
-#: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "Atari gailua:"
+#: ../samba_wizard/samba.wiz_.c:58
+msgid "File Sharing:"
+msgstr "Fitxategi Elkarbanatzea:"
 
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Zerbitzari Morroia"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
+msgstr "Fitxategi baimenak"
 
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
+#: ../server_wizard/server.wiz_.c:2
+msgid "This wizard will set the basic networking parameters of your server."
 msgstr ""
-"Sareko helbideak 256 baino txikiago eta puntuz banatutako lau zenbakiz "
-"osatutako zerrendak dira; zerrendako azken zenbakia zero izan behar da."
+"Morroi honek zure zerbitzariaren sareko oinarrizko parametroak ezartzen "
+"lagunduko dizu."
+
+#: ../server_wizard/server.wiz_.c:4
+msgid "Host Name:"
+msgstr "Ostalari Izena:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "sareko gailua"
+msgid "Basic Network Configuration Wizard"
+msgstr "Oinarrizko Sare Konfigurazio Morroia"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "Sareko helbidea gaizki dago"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Beraz, litekeena da bertako sare honentzako domeinu izena eta IP helbidea "
-"zerbitzariaren \\qkanpoko\\q loturarekiko DESBERDINAK izatea."
+msgid "Server IP address:"
+msgstr "Zerbitzariaren IP helbidea:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Sareko Helbidea"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "Morroi hau exekutatu bitartean ez zenuke beste aplikaziorik exekutatu behar, "
 "eta berarekin amaitutakoan zure saiotik irte eta berriro sartu beharko "
 "zinateke."
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
-msgstr ""
-"Hau da une honetan kanpoko atariarentzat duzun balioa (hasierako "
-"instalazioan zehaztutako balioa). Gailua (sareko txartela edo modema) "
-"barneko sarerako erabiltzen denaren desberdina izan beharko litzateke."
-
-#: ../server_wizard/server.wiz_.c:12
-msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"The wizard successfully configured the basic networking services of your "
+"server."
 msgstr ""
-"Morroi honi dagokionez, zure konputagailua bere bertako sarea (C motako "
-"sarea) kudeatzen duen zerbitzaria da."
+"Morroiak zure zerbitzariaren sareko oinarrizko zerbitzuak konfiguratu ditu."
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Gailua:"
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
+msgstr "(balio hauek hemen aldatu ditzakezu egin behar duzuna jakin badakizu)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Adi"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"Sareko helbidea zure sarea identifikatzen duen zenbakia da; proposatutako "
+"balioa Internetera lotuta ez dagoen konfigurazio baterako diseinatuta dago, "
+"edoIP maskaratzea erabiliz konektatzen denarentzako; zer egin ez badakizu, "
+"onartu balio lehenetsiak."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr ""
-"Orri honek domeinu-izena kalkulatzen du; ikustezina izan beharko litzateke"
+msgid "Note about networking"
+msgstr "Sareari buruzko oharra"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Zerbitzariaren Helbidea:"
+msgid "Server Address"
+msgstr "Zerbitzariren Helbidea"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Ondorioztatutako domeinu izena"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"Sareko helbideak 256 baino txikiago eta puntuz banatutako lau zenbakiz "
+"osatutako zerrendak dira; zerrendako azken zenbakia zero izan behar da."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "Ostalari Izena"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Oharra: atariaren IP helbidea ez da hutsik egon behar kanpoko mundura "
+"irteera nahi baduzu."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-"Orri honek zerbitzari helbide lehenetsia kalkulatzen du; ikustezina izan "
-"beharko litzateke."
+msgid "The Server IP address is incorrect"
+msgstr "Zerbitzariaren IP helbidea okerra da"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Oinarrizko Sare Konfigurazio Morroia"
+msgid "Configuring your network"
+msgstr "Zure sarea konfiguratzen"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "Atariaren IP:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "Ostalari izena okerra da"
+msgid "This page computes the default server address; it should be invisible."
+msgstr ""
+"Orri honek zerbitzari helbide lehenetsia kalkulatzen du; ikustezina izan "
+"beharko litzateke."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"Internet ostalari izenak \\qostalaria.domeinua.domeinumota\\q erakoak izan "
-"behar dira; zure zerbitzaria Interneteko zerbitzaria izango bada, domeinu "
-"izena zure hornitzailearekin erregistratutako izan beharko litzateke. Soilik "
-"intraneta izango baduzu, edozein izen ONAR daiteke, adibidez \\qkonpainia.net"
-"\\q."
+msgid "IP net address:"
+msgstr "IP sareko helbidea:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Kanpoko ataria"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"Sareko helbidea zure sarea identifikatzen duen zenbakia da; proposatutako "
-"balioa Internetera lotuta ez dagoen konfigurazio baterako diseinatuta dago, "
-"edoIP maskaratzea erabiliz konektatzen denarentzako; zer egin ez badakizu, "
-"onartu balio lehenetsiak."
+msgid "Server Wizard"
+msgstr "Zerbitzari Morroia"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
-"Morroi honek zure zerbitzariaren oinarrizko sareko zerbitzuak konfiguratzen "
-"lagunduko dizu."
+"Beraz, litekeena da bertako sare honentzako domeinu izena eta IP helbidea "
+"zerbitzariaren \\qkanpoko\\q loturarekiko DESBERDINAK izatea."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr ""
-"Morroi honek zure zerbitzariaren sareko oinarrizko parametroak ezartzen "
-"lagunduko dizu."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Sareari buruzko oharra"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Oharra: atariaren IP helbidea ez da hutsik egon behar kanpoko mundura "
-"irteera nahi baduzu."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Morroiaren Okerra."
+"Aukeratu zerbitzariak zure sarera lotzeko erabili beharko lukeen sareko "
+"gailua (normalean txartel bat). Hau da zure bertako sarerako gailua, "
+"seguraski ez internet sarbiderako erabiltzen den berdina."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1601,19 +1576,41 @@ msgstr ""
 "Gailuak Linux izenarekin azaltzen dira eta, ezaguna bada, txartelaren "
 "deskribapenarekin."
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Sareko Helbidea:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Hau da une honetan kanpoko atariarentzat duzun balioa (hasierako "
+"instalazioan zehaztutako balioa). Gailua (sareko txartela edo modema) "
+"barneko sarerako erabiltzen denaren desberdina izan beharko litzateke."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "Zure sarea konfiguratzen"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr ""
+"Morroi honek zure zerbitzariaren oinarrizko sareko zerbitzuak konfiguratzen "
+"lagunduko dizu."
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "Atariaren IP:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"Zerbitzariaren IP helbidea zure sarean zure zerbitzaria identifikatzen duen "
+"zenbakia da; proposatutako balioa sare pribatu baterako diseinatuta dago, "
+"Internet ikuspegirik gabe, edo IP maskaratzea erabiliz konektatzen "
+"denarentzako; zer egin ez badakizu, onartu balio lehenetsiak."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "Ostalari izena okerra da"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1623,11 +1620,28 @@ msgstr ""
 "konputagailuetatik zure zerbitzaria eta agian Interneten (konfigurazioan "
 "aurrez ezarritako balioen arabera)."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "Ostalari Izena:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Morroiaren Okerra."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "sareko gailua"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "Ondorioztatutako domeinu izena"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr ""
+"Orri honek domeinu-izena kalkulatzen du; ikustezina izan beharko litzateke"
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "Atari gailua:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
@@ -1635,402 +1649,402 @@ msgstr ""
 "Morroiak zure sarea konfiguratzeko behar diren hurrengo parametroak bildu "
 "ditu"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"Kanpo lotura, konputagailua sareko txartela edo modema erabiliz bezero "
-"bezala konektatzen den sarea da (Internet edo sare garaiagoa)."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Adi"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr "(balio hauek hemen aldatu ditzakezu egin behar duzuna jakin badakizu)"
+msgid "Device:"
+msgstr "Gailua:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"Zerbitzariaren IP helbidea zure sarean zure zerbitzaria identifikatzen duen "
-"zenbakia da; proposatutako balioa sare pribatu baterako diseinatuta dago, "
-"Internet ikuspegirik gabe, edo IP maskaratzea erabiliz konektatzen "
-"denarentzako; zer egin ez badakizu, onartu balio lehenetsiak."
+"Morroi honi dagokionez, zure konputagailua bere bertako sarea (C motako "
+"sarea) kudeatzen duen zerbitzaria da."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Zerbitzari Izena:"
+msgid "Server Address:"
+msgstr "Zerbitzariaren Helbidea:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "Sareko helbidea gaizki dago"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"Kanpo lotura, konputagailua sareko txartela edo modema erabiliz bezero "
+"bezala konektatzen den sarea da (Internet edo sare garaiagoa)."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Zerbitzariren Helbidea"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
 msgstr ""
-"Morroiak zure zerbitzariaren sareko oinarrizko zerbitzuak konfiguratu ditu."
+"Internet ostalari izenak \\qostalaria.domeinua.domeinumota\\q erakoak izan "
+"behar dira; zure zerbitzaria Interneteko zerbitzaria izango bada, domeinu "
+"izena zure hornitzailearekin erregistratutako izan beharko litzateke. Soilik "
+"intraneta izango baduzu, edozein izen ONAR daiteke, adibidez \\qkonpainia.net"
+"\\q."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "Sareko Gailua"
+msgid "Host Name"
+msgstr "Ostalari Izena"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "IP sareko helbidea:"
+msgid "Network Address:"
+msgstr "Sareko Helbidea:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Sareko Helbidea"
+msgid "Network Device"
+msgstr "Sareko Gailua"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "Zerbitzariaren IP helbidea:"
+msgid "Server Name:"
+msgstr "Zerbitzari Izena:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "Adelaide-ko Unibertsitatea, Hego Australia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Universite Paris Sud, Frantzia"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Sakatu Hurrengoa ordu zerbitzarien froga hasteko."
+msgid "University of Manchester, Manchester, England"
+msgstr "Manchesterreko Unibertsitatea, Manchester, Ingalaterra"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Ordu Zerbitzariak"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Limoges-eko Unibertsitatea, Frantzia"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Bigarren Ordu Zerbitzaria:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Kanadiar Meteorologia Zentrua, Dorval, Quebec, Kanada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr ""
-"Beraz zure zerbitzaria bertako ordu zerbitzaria izango da zure sarerako."
+msgid "Press next to start the time servers test."
+msgstr "Sakatu Hurrengoa ordu zerbitzarien froga hasteko."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
-"Zure zerbitzariak ordu zerbitzari bezala lanegin dezake zure bertako "
-"sarerako."
+"Ordu zerbitzariekin kontaktatzen berriro saiatu zaitezke, edo konfigurazioa "
+"gorde benetan ordua ezarri gabe."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Chernogolovka-ko Zentru Zientifikoa, Mosku eskualdea, Errusia"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(mesedez, aukeratu geografikoki gertuko zerbitzariak)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylor Medikuntza Eskola, Houston, Texas"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "Oklahoma-ko Unibertsitatea, Norman, Oklahoma, AEB"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Aukeratu ordu gune bat:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "Reginako Unibertsitatea, Regina, Saskatchewan, Kanada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr "sakatu Hurrengoa hasteko, edo etsi morroia uzteko"
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Trinity Eskola, Dublin, Irlanda"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, Frantzia"
+msgid "Singapore"
+msgstr "Singapur"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Limoges-eko Unibertsitatea, Frantzia"
+msgid "Secondary Time Server:"
+msgstr "Bigarren Ordu Zerbitzaria:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT Informazio Sistemak, Cambridge, MA"
+msgid "Try again"
+msgstr "Saiatu berriro"
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
-msgstr "Hautatu lehenengo eta bigarren zerbitzaria zerrendatik."
+msgid "The Chinese University of Hong Kong"
+msgstr "Hong Kong-eko Txinatar Unibertsitatea"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(mesedez, aukeratu geografikoki gertuko zerbitzariak)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV Injenierutza Eskola, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, Frantzia"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante/ESPAINIA)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Kanadiar Meteorologia Zentrua, Dorval, Quebec, Kanada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "Kanadako National Research Council, Ottawa, Ontario, Kanada"
 
+#: ../time_wizard/time.wiz_.c:18
+msgid "Select a primary and secondary server from the list."
+msgstr "Hautatu lehenengo eta bigarren zerbitzaria zerrendatik."
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "Manchesterreko Unibertsitatea, Manchester, Ingalaterra"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, Frantzia"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- kanpoko sarerik ez"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Inc., Seul, Korea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Ordu zerbitzaria bereala eskuragarri ez badago (sarea edo beste arrazoi "
-"bategatik), 30 segundu inguru itxoingo duzu."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Chernogolovka-ko Zentru Zientifikoa, Mosku eskualdea, Errusia"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Ordu zerbitzarien eskuragarritasuna frogatzen"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washingtongo Tri-Cities Estatu Unibertsitatea, Richland, Washington"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "Oslo-ko Unibertsitatea, Norvegia"
+msgid "University of Adelaide, South Australia"
+msgstr "Adelaide-ko Unibertsitatea, Hego Australia"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr ""
-"Konputagailu Zientzia Departamendua, Wisconsin-Madison-eko Unibertsitatea"
+msgid "Time zone:"
+msgstr "Ordu gunea:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Trinity Eskola, Dublin, Irlanda"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Ordu zerbitzariek ez dute erantzuten. Honen zergatia izan daiteke:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "Reginako Unibertsitatea, Regina, Saskatchewan, Kanada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Caen-eko Unibertsitatea, Frantzia"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Ordu zerbitzariek ez dute erantzuten. Honen zergatia izan daiteke:"
+msgid "- other reasons..."
+msgstr "- beste arrazoi batzu..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Teknologia Inst Fed Suitzarra"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Ordu zerbitzaria bereala eskuragarri ez badago (sarea edo beste arrazoi "
+"bategatik), 30 segundu inguru itxoingo duzu."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Caen-eko Unibertsitatea, Frantzia"
+msgid "WARNING"
+msgstr "ADI"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, Frantzia"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, Frantzia"
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
-"Morroi honek zure zerbitzariaren ordua ezartzen lagunduko dizu, bai lokalki "
-"edo kanpoko ordu zerbitzari batekin sinkronizatuta."
+"Zure zerbitzariak ordu zerbitzari bezala lanegin dezake zure bertako "
+"sarerako."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "ADI"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Fukuoka Unibertsitatea, Fukuoka, Japon"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Inc., Seul, Korea"
+msgid "Time Servers"
+msgstr "Ordu Zerbitzariak"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "Oklahoma-ko Unibertsitatea, Norman, Oklahoma, AEB"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Teknologia Inst Fed Suitzarra"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "Hong Kong-eko Txinatar Unibertsitatea"
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Morroi honek zure zerbitzariaren ordua ezartzen lagunduko dizu, bai lokalki "
+"edo kanpoko ordu zerbitzari batekin sinkronizatuta."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- beste arrazoi batzu..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, Frantzia"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- existitzen ez diren ordu zerbitzariak"
+msgid "Testing the time servers availability"
+msgstr "Ordu zerbitzarien eskuragarritasuna frogatzen"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Ordu gunea:"
+msgid "Save config without test"
+msgstr "Gorde konfig frogatu gabe"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Dept. Computer Science, Strathclyde University, Glasgow, Eskozia"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Ordu zerbitzariekin kontaktatzen berriro saiatu zaitezke, edo konfigurazioa "
-"gorde benetan ordua ezarri gabe."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT Informazio Sistemak, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Lehenengo Ordu Zerbitzaria:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylor Medikuntza Eskola, Houston, Texas"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Saiatu berriro"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn State University, University Park, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washingtongo Tri-Cities Estatu Unibertsitatea, Richland, Washington"
+msgid "- non existent time servers"
+msgstr "- existitzen ez diren ordu zerbitzariak"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Ordu zerbitzariaren konfigurazioa gorde da"
+msgid "Time wizard"
+msgstr "Ordu morroia"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Universite Paris Sud, Frantzia"
+msgid "University of Oslo, Norway"
+msgstr "Oslo-ko Unibertsitatea, Norvegia"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr ""
+"Beraz zure zerbitzaria bertako ordu zerbitzaria izango da zure sarerako."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Gorde konfig frogatu gabe"
+msgid "- no outside network"
+msgstr "- kanpoko sarerik ez"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapur"
+msgid "Primary Time Server:"
+msgstr "Lehenengo Ordu Zerbitzaria:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Fukuoka Unibertsitatea, Fukuoka, Japon"
+msgid "Time server configuration saved"
+msgstr "Ordu zerbitzariaren konfigurazioa gorde da"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV Injenierutza Eskola, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr "sakatu Hurrengoa hasteko, edo etsi morroia uzteko"
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante/ESPAINIA)"
+msgid "Choose a time zone:"
+msgstr "Aukeratu ordu gune bat:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Ordu morroia"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr "erabiltzaile http azpidirektorioa : ~/"
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr ""
+"Konputagailu Zientzia Departamendua, Wisconsin-Madison-eko Unibertsitatea"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
-msgstr "Moduluak :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
+msgstr ""
+"* Erabiltzaile modulua: erabiltzaileei beraien atariko direktorioan zure "
+"http zerbitzariaren \"http://www.zurezerbitzaria.com/~erabiltzailea\"  "
+"helbidearen bitartez eskuragarri egongo den direktorio bat jartzeko aukera "
+"emango die, direktorio honen izena aurrerago eskatuko zaizu."
 
 #: ../web_wizard/web.wiz_.c:3
-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."
+msgid ""
+"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/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr "Morroiak zure Intranet/Internet Web Zerbitzariak konfiguratu ditu"
+msgid "Internet web server:"
+msgstr "Internet Web Zerbitzaria:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
-msgstr "erabiltzaile dir:"
+msgid "Modules :"
+msgstr "Moduluak :"
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
-msgstr ""
-"Morroiak Web Zerbitzaria konfiguratzeko behar diren ondorengo datuak bildu "
-"ditu"
+#: ../web_wizard/web.wiz_.c:6
+#, fuzzy
+msgid "Document root:"
+msgstr "dokumentu erroa:"
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Web morroia"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
+msgstr "erabiltzaile http azpidirektorioa : ~/"
 
-#: ../web_wizard/web.wiz_.c:11
-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/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Gaitu Intraneterako Web Zerbitzaria"
 
 #: ../web_wizard/web.wiz_.c:12
-msgid "Internet web server:"
-msgstr "Internet Web Zerbitzaria:"
+msgid "Configuring the Web Server"
+msgstr "Web Zerbitzaria konfiguratzen"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Gaitu Intraneterako Web Zerbitzaria"
+msgid "Web Server"
+msgstr "Web Zerbitzaria"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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/web.wiz_.c:15
 msgid "Enable the Web Server for the Internet"
 msgstr "Gaitu Web Zerbitzaria Interneterako"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Elkarbanatutako dir:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "Aukeratu aktibatu nahi duzun Web zerbitzua:"
+#, fuzzy
+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/web.wiz_.c:17
-msgid "document root:"
-msgstr "dokumentu erroa:"
+msgid "Web wizard"
+msgstr "Web morroia"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 msgid "Intranet web server:"
 msgstr "Intranet web zerbitzaria:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 "Idatzi erabiltzaileek beren atarikoan sortu behar luketen direktorioaren "
 "izena (~/ gabe) http://www.yourserver.com/~user  bitartez eskura izan dezaten"
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "Web Zerbitzaria konfiguratzen"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
-msgstr ""
-"* Erabiltzaile modulua: erabiltzaileei beraien atariko direktorioan zure "
-"http zerbitzariaren \"http://www.zurezerbitzaria.com/~erabiltzailea\"  "
-"helbidearen bitartez eskuragarri egongo den direktorio bat jartzeko aukera "
-"emango die, direktorio honen izena aurrerago eskatuko zaizu."
+msgid "activate user module"
+msgstr "gaitu erabiltzaile modulua"
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Web Zerbitzaria"
+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/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Web Zerbitzari Ezarpen Morroia"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "Aukeratu aktibatu nahi duzun Web zerbitzua:"
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr ""
+"Morroiak Web Zerbitzaria konfiguratzeko behar diren ondorengo datuak bildu "
+"ditu"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
-msgstr "Idatzi dokumentuen erro izatea nahi duzun direktorioaren bidea."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr "Morroiak zure Intranet/Internet Web Zerbitzariak konfiguratu ditu"
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
+msgstr "Dokumentuen Erroa:"
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
-msgstr "gaitu erabiltzaile modulua"
+msgid "Type the path of the directory you want being the document root."
+msgstr "Idatzi dokumentuen erro izatea nahi duzun direktorioaren bidea."
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr "Dokumentuen Erroa:"
+msgid "Web Server Configuration Wizard"
+msgstr "Web Zerbitzari Ezarpen Morroia"
 
 msgid "Cancel"
 msgstr "Utzi"
@@ -2047,6 +2061,9 @@ msgstr "gaituta"
 msgid "disabled"
 msgstr "ezgaituta"
 
+#~ msgid "user dir:"
+#~ msgstr "erabiltzaile dir:"
+
 #~ msgid ""
 #~ "You can set the time of your machine in two ways: Locally means that the "
 #~ "setting will simply set the system clock, without synchronizing with the "
diff --git a/po/fi.po b/po/fi.po
index b8054081..ba7f5c01 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard-fi - MDK Release 9.1\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-11-06 18:59+0200\n"
 "Last-Translator: Thomas Backlund <thomas.backlund@inritel.com>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -17,227 +17,215 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta2\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Paikallisverkkosi asiakas on tietokone yhdistetty verkkoon omalla nimellä ja "
-"IP-osoitteella."
+"Paina 'Seuraava' asettaaksesi näitä parametreja nyt, tai 'Peruuta' "
+"poistuaaksesi Velhosta."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "Tämä ei ole oikeanmuotoinen osoite... paina 'seuraava' jatkaaksesi"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "OK"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"Paina 'seuraava' jos haluat muuttaa olemassa olevaa arvoa, tai 'edellinen' "
-"korjataaksesi valintaasi"
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Onnittelut"
+"Jos päätät tehdä asetuksia nyt, jatkat automaattisesti asiakas-asetuksiin"
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "DNS asiakas Velho"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr "Paina 'Seuraava' aloittaaksesi, tai 'Peruuta' poistuaaksesi Velhosta."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"Asiakastasi tunnistetaan verkossa nimellä, muodossa asiakasnimi.yritys.net "
+"Joka kone verkossa vaatii ainutlaatuinen IP osoite, yleisessä piste-muodossa "
+"(aaa.bbb.ccc.ddd)."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "Velho keräsi seuraavat parametrit joita vaaditaan lisätääkseen asiakasta "
 "verkkoosi: "
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Järjestelmävirhe, asetusta ei tehty"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "Asiakas-nimi"
+msgid "The wizard successfully added the client."
+msgstr "Velho lisäsi asiakasta onnistuneesti."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Lisätään uusi asiakasta verkkoosi"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(sinun ei tarvitse kirjoittaa verkkoaluetta nimen jälkeen)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Aseta"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"Huomaa että annettu IP-osoite ja asiakas-nimi pitää olla ainutlaatuinen "
+"verkossa."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Asiakas tietoja:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Varoitus:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(sinun ei tarvitse kirjoittaa verkkoaluetta nimen jälkeen)"
+msgid "Name of the machine:"
+msgstr "Koneen nimi:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Jos päätät tehdä asetuksia nyt, jatkat automaattisesti asiakas-asetuksiin"
+msgid "Adding a new client to your network"
+msgstr "Lisätään uusi asiakasta verkkoosi"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Palvelin tulee käyttämään syöttämäsi tietoja, tehdäkseen asiakas-nimi "
-"tunnettu kaikille tietokoneille verkossasi."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Järjestelmävirhe, asetusta ei tehty"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Olet syöttänyt kone-nimi tai IP-osoite joka on jo käytössä."
+msgid "Client identification:"
+msgstr "Asiakas tietoja:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "Velho lisäsi asiakasta onnistuneesti."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr ""
+"Tämä Velho auttaa sinua lisäämään asiakasta paikalliseen DNS palveluun."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "Koneen nimi:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "OK"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"Asiakastasi tunnistetaan verkossa nimellä, muodossa asiakasnimi.yritys.net "
-"Joka kone verkossa vaatii ainutlaatuinen IP osoite, yleisessä piste-muodossa "
-"(aaa.bbb.ccc.ddd)."
+"Paikallisverkkosi asiakas on tietokone yhdistetty verkkoon omalla nimellä ja "
+"IP-osoitteella."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"Huomaa että annettu IP-osoite ja asiakas-nimi pitää olla ainutlaatuinen "
-"verkossa."
+"Hyväksy asetukset ja lisää asiakastasi painamalla 'Seuraava', tai paina "
+"'Edellinen' korjataaksesi asetukset."
 
-#: ../client_wizard/client.wiz_.c:21
-msgid "DNS Wizard (add client)"
-msgstr "DNS Velho (Lisää asiakas)"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "Tämä ei ole oikeanmuotoinen osoite... paina 'seuraava' jatkaaksesi"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Varoitus\\nOlet dhcp-osoiteavaruudessa, voi olla ettei palvelin toimii  "
-"asetuksillasi."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "Asiakas IP:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "Koneen IP-osoite:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Aseta"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Lopeta"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "Sinun pitää olla pääkäyttäjänä (root) suorittaaksesi tätä Velhoa"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Verkko ei ole asetettu vielä"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr ""
-"Tämä Velho auttaa sinua lisäämään asiakasta paikalliseen DNS palveluun."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Olet syöttänyt kone-nimi tai IP-osoite joka on jo käytössä."
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+msgid "DNS Wizard (add client)"
+msgstr "DNS Velho (Lisää asiakas)"
+
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Lopeta"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"Hyväksy asetukset ja lisää asiakastasi painamalla 'Seuraava', tai paina "
-"'Edellinen' korjataaksesi asetukset."
+"Varoitus\\nOlet dhcp-osoiteavaruudessa, voi olla ettei palvelin toimii  "
+"asetuksillasi."
 
 #: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Paina 'Seuraava' aloittaaksesi, tai 'Peruuta' poistuaaksesi Velhosta."
-
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Paina 'Seuraava' asettaaksesi näitä parametreja nyt, tai 'Peruuta' "
-"poistuaaksesi Velhosta."
+"Palvelin tulee käyttämään syöttämäsi tietoja, tehdäkseen asiakas-nimi "
+"tunnettu kaikille tietokoneille verkossasi."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "Sinun pitää olla pääkäyttäjänä (root) suorittaaksesi tätä Velhoa"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Onnittelut"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "Koneen IP-osoite:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "Asiakas IP:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Paina 'seuraava' jos haluat muuttaa olemassa olevaa arvoa, tai 'edellinen' "
+"korjataaksesi valintaasi"
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
 msgstr ""
 "Sinun pitää asettaa verkon perusasetukset ennen kuin suoritat tämä Velho."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Varoitus:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Asetus Velho"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "MySQL Tietokanta Palvelin"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Syötä käyttäjätunnus ja salasana lisätääksesi käyttäjää"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "Asiakas-nimi"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Käyttäjä lisäys"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -245,76 +233,70 @@ msgstr ""
 "Hyväksy tämä arvo, ja aseta palvelimesi painamalla \\qVahvista\\q tai paina "
 "'Takaisin' ja korjaa asetukset."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Aseta salasana pääkäyttäjälle (root):"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "Asetetaan MySQL Tietokanta Palvelinta"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "Velho asetti MySQL Tietokanta Palvelimesi onnistuneesti."
+msgid "Confirm"
+msgstr "Vahvista"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Tietokanta Palvelin"
+msgid "Password:"
+msgstr "Salasana:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Pääkäyttäjän (root) Salasana:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "Velho asetti MySQL Tietokanta Palvelimesi onnistuneesti."
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Vahvista"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "Valitan, sinun pitää olla pääkäyttäjä tehdäksesi tämän..."
+msgid "Username:"
+msgstr "Käyttäjänimi:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Salasana:"
+msgid "Add"
+msgstr "Lisää"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Jos päätät tehdä asetuksia nyt, jatkat automaattisesti MySQL Tietokanta-"
-"asetuksiin"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "Valitan, sinun pitää olla pääkäyttäjä tehdäksesi tämän..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr "Tämä Velho auttaa sinua asettamaan MySQL Tietokantapalvelin verkkoosi."
+msgid "Database Server"
+msgstr "Tietokanta Palvelin"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Käyttäjänimi:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Huomautus: Tällä käyttäjällä on täydet oikeudet"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Lisää"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Aseta salasana pääkäyttäjälle (root):"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "MySQL Tietokanta Velho"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "Asetetaan MySQL Tietokanta Palvelinta"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Asetus Velho"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr ""
 "Käynnistääksesi palvelinta, sinun pitää ensin asettaa pääkäyttäjän (root) "
 "salasanaa"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "MySQL Tietokanta Velho"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Pääkäyttäjän (root) Salasana:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "MySQL Tietokanta Palvelin"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -322,35 +304,58 @@ msgstr ""
 "Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen MySQL "
 "Tietokanta Palvelimesi."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
+msgstr "Tämä Velho auttaa sinua asettamaan MySQL Tietokantapalvelin verkkoosi."
+
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Syötä käyttäjätunnus ja salasana lisätääksesi käyttäjää"
+
+#: ../db_wizard/db.wiz_.c:27
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
 msgstr ""
-"IP osoitteet ovat lista nejästä numerosta pienemmät kuin 256 pistemuodossa."
+"Jos päätät tehdä asetuksia nyt, jatkat automaattisesti MySQL Tietokanta-"
+"asetuksiin"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../dhcp_wizard/dhcp.wiz_.c:1
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
 msgstr ""
-"Valitse osoiteavaruutta josta määrätään työasemien osoitteita DHCP "
-"palvelulla; mikäli sinulla ei ole erityistarpeita, voit turvallisesti "
-"hyväksyä suositut arvot."
+"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen DHCP "
+"palvelusi:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Korjaa"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
+msgstr "Onko palvelin käynnssä? Ota yhteyttä järjestelmän ylläpitäjään."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Korkein IP Osoite:"
+msgid "Lowest IP Address:"
+msgstr "Matalin IP Osoite:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "Osoiteavaruutta dhcp:n käytössä"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr ""
+"IP osoitteet ovat lista nejästä numerosta pienemmät kuin 256 pistemuodossa."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -358,94 +363,84 @@ msgstr ""
 "Hyväksy asetukset ja aseta palvelimesi painamalla 'Seuraava', tai paina "
 "'Edellinen' korjataaksesi asetukset."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"DHCP on palvelu joka automaattisesti jakaa IP-osoitteita verkkosi "
-"työasemille."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "DHCP Velho"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Korjaa"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "Tämä Velho auttaa sinua asettamaan palvelimesi DHCP palvelu."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "Osoiteavaruutta dhcp:n käytössä"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Velho asetti palvelimesi DHCP-palvelua onnistuneesti."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Tämä Velho auttaa sinua asettamaan palvelimesi DHCP palvelu."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen DHCP "
-"palvelusi:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Matalin IP Osoite:"
+"Valitse osoiteavaruutta josta määrätään työasemien osoitteita DHCP "
+"palvelulla; mikäli sinulla ei ole erityistarpeita, voit turvallisesti "
+"hyväksyä suositut arvot."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "DHCP Asetus Velho"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "Annettu IP-osoiteavaruutta on virheellinen."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
-msgstr "Onko palvelin käynnssä? Ota yhteyttä järjestelmän ylläpitäjään."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
+msgstr ""
+"DHCP on palvelu joka automaattisesti jakaa IP-osoitteita verkkosi "
+"työasemille."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "Annettu IP-osoiteavaruutta on virheellinen."
+msgid "Highest IP Address:"
+msgstr "Korkein IP Osoite:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
-msgstr "DHCP Velho"
+msgid "DHCP Configuration Wizard"
+msgstr "DHCP Asetus Velho"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "Asetetaan DHCP palvelin"
 
-#: ../dns_wizard/dns.wiz_.c:2
-msgid "DNS Wizard (configuration)"
-msgstr "DNS Asetusvelho"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen DNS palvelusi."
+"Asetuksesi voidaan hyväksyä, mutta et pysty tunnistamaan kone- nimet "
+"paikallisverkkosi ulkopuolella."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr ""
+"Paina 'Seuraava' jättääksesi näitä arvoja tyhjäksi, tai 'Takaisin' "
+"syöttääksesi arvon."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Ensisijainen DNS Osoite:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "Asetetaan DNS Palvelin"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Toissijainen DNS osoite"
+msgid "DNS Configuration Wizard"
+msgstr "DNS Asetus Velho"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "DNS Palvelin Osoitteita"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Tämä Velho auttaa sinua asettamaan palvelimesi DNS palvelut. Tämä asetus "
-"tarjoaa paikallinen DNS-palvelu paikalliselle työasemille, sekä ei-"
-"paikallisten hakujen edelleenlähettäminen ulkoiselle DNS palvelimelle."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -457,43 +452,51 @@ msgstr ""
 "ja toissijaisen DNS-palvelimien IP-osoitteet. Yleensä saat näitä osoitteita "
 "Internet palvelu tarjoajaltasi."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "Velho asetti palvelimesi DNS-palvelu onnistuneesti."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Olet syöttänyt tyhjän osoitteen DNS-palvelimelle."
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
-"Paina 'Seuraava' jättääksesi näitä arvoja tyhjäksi, tai 'Takaisin' "
-"syöttääksesi arvon."
-
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "DNS Asetus Velho"
+"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen DNS palvelusi."
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Ensisijainen DNS Osoite:"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
+msgstr "DNS Palvelin Osoitteita"
 
-#: ../dns_wizard/dns.wiz_.c:20
+#: ../dns_wizard/dns.wiz_.c:17
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Asetuksesi voidaan hyväksyä, mutta et pysty tunnistamaan kone- nimet "
-"paikallisverkkosi ulkopuolella."
+"DNS (Domain Name Server, eli Nimi-Palvelin) on palvelu joka yhdistää koneen "
+"IP-numero vastaavaan Internet Palvelimen nimeen."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Toissijainen DNS osoite"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"DNS (Domain Name Server, eli Nimi-Palvelin) on palvelu joka yhdistää koneen "
-"IP-numero vastaavaan Internet Palvelimen nimeen."
+"Tämä Velho auttaa sinua asettamaan palvelimesi DNS palvelut. Tämä asetus "
+"tarjoaa paikallinen DNS-palvelu paikalliselle työasemille, sekä ei-"
+"paikallisten hakujen edelleenlähettäminen ulkoiselle DNS palvelimelle."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "Velho asetti palvelimesi DNS-palvelu onnistuneesti."
+msgid "DNS Wizard (configuration)"
+msgstr "DNS Asetusvelho"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -504,64 +507,67 @@ msgid "Please select a wizard"
 msgstr "Ole hyvä ja valitse Velho"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Laite"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "Keskitaso - webbi, ftp ja ssh näkyy verkkoon päin"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr ""
 "Korkea taso - palvelin ei näy verkkoon päin, käyttäjät rajoitettu webbi-"
 "selailuun"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Jotain kauheaa tapahtui"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Palomuuri Asetus Velho"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen palomuurisi:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr "Palomuuri suojaa sisäverkkosi asiattomilta yhteyksiltä Internetistä."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "Internet Verkko Laite:"
+msgid "Device"
+msgstr "Laite"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Korjaa"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Palomuuri Velho"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Ei käytössä . Ei suojausta"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "Suojaus Taso:"
+msgid "Internet Network Device:"
+msgstr "Internet Verkko Laite:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Palomuuri Velho"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Palomuuri voidaan asettaa eri suojaustasoihin; Valitse taso joka sopii sinun "
+"tarpeitasi varten. Jos et tiedä, Keskitaso on yleensä sopivin."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "Velho asetti palvelimesi palomuurin onnistuneesti."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "Keskitaso - webbi, ftp ja ssh näkyy verkkoon päin"
+msgid "The device name is not correct"
+msgstr "Laitteen nimi on väärä."
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "Suojaus Taso"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Korjaa"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Lopeta"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Palomuuri Asetus Velho"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "Laitteen nimi on väärä."
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -569,86 +575,100 @@ msgstr ""
 "Palomuuri tarvitsee tietää miten palvelimesi on kytketty Internettiin; "
 "Valitse laite joka on käytössä ulkoisen yhteyden kanssa."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr "Palomuuri suojaa sisäverkkosi asiattomilta yhteyksiltä Internetistä."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "Suojaus Taso"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "Asetetaan Palomuuri"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Jotain kauheaa tapahtui"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "Palomuurin Verkko Laite"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Ei käytössä . Ei suojausta"
+msgid "The wizard successfully configured your server firewall."
+msgstr "Velho asetti palvelimesi palomuurin onnistuneesti."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
-msgid "This wizard will help you configuring your server firewall."
-msgstr "Tämä Velho auttaa sinua asettamaan palvelimesi palomuurin"
+msgid "Configuring the Firewall"
+msgstr "Asetetaan Palomuuri"
 
-#: ../firewall_wizard/firewall.wiz_.c:23
-msgid "Low - Light filtering, standard services available"
-msgstr "Matala taso - Kevyt suodatus, vakiopalvelut käytössä."
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Lopeta"
 
 #: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "Palomuurin Verkko Laite"
+#, fuzzy
+msgid "This wizard will help you configuring your server firewall."
+msgstr "Tämä Velho auttaa sinua asettamaan palvelimesi palomuurin"
 
 #: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
-msgstr ""
-"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen palomuurisi:"
+msgid "Low - Light filtering, standard services available"
+msgstr "Matala taso - Kevyt suodatus, vakiopalvelut käytössä."
 
 #: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Palomuuri voidaan asettaa eri suojaustasoihin; Valitse taso joka sopii sinun "
-"tarpeitasi varten. Jos et tiedä, Keskitaso on yleensä sopivin."
+msgid "Protection Level:"
+msgstr "Suojaus Taso:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "Valitse FTP-palvelun tyyppi jota haluat käyttää:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
+msgstr "Tämä Velho auttaa sinua asettamaan FTP Palvelinta verkkoosi."
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr "Annettua hakemistoa ei ole."
+#: ../ftp_wizard/ftp.wiz_.c:3
+msgid "Public directory:"
+msgstr "Hakemisto:"
 
-#: ../ftp_wizard/ftp.wiz_.c:7
+#: ../ftp_wizard/ftp.wiz_.c:4
 msgid "Internet FTP Server:"
 msgstr "Internet FTP Palvelin:"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "Ota käyttöön FTP Palvelin paikallisverkolle"
+
+#: ../ftp_wizard/ftp.wiz_.c:7
+msgid "FTP wizard"
+msgstr "FTP Velho"
+
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "FTP Palvelin"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
-msgstr "Velho asetti paikallisverkko / Internetti palvelimesi onnistuneesti."
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr "Älä aseta yhtäkään ruutua jos et halua käynnistää FTP-Palvelinta."
 
 #: ../ftp_wizard/ftp.wiz_.c:12
-msgid "Public directory:"
-msgstr "Hakemisto:"
+msgid "Configuring the FTP Server"
+msgstr "Asetetaan FTP Palvelin"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
-msgstr "Syötä hakemisto jonka haluat jakaa."
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "Ota käyttöön FTP Palvelin Internettiin."
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "Intranet FTP Palvelin:"
 
 #: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "Ota käyttöön FTP Palvelin paikallisverkolle"
+msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgstr "Velho asetti paikallisverkko / Internetti palvelimesi onnistuneesti."
+
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "Valitse FTP-palvelun tyyppi jota haluat käyttää:"
+
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr "Jaettu hakemisto:"
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
@@ -656,59 +676,36 @@ msgstr ""
 "Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen FTP "
 "Palvelimesi:"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "FTP Velho"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
-msgstr "Tämä Velho auttaa sinua asettamaan FTP Palvelinta verkkoosi."
-
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "Ota käyttöön FTP Palvelin Internettiin."
-
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "Intranet FTP Palvelin:"
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
+msgstr "Annettua hakemistoa ei ole."
 
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP Palvelin Asetus Velho"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "Asetetaan FTP Palvelin"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Älä aseta yhtäkään ruutua jos et halua käynnistää FTP-Palvelinta."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "FTP Palvelin"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr "Syötä hakemisto jonka haluat jakaa."
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
-msgstr "Jaettu hakemisto:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Uutispalvelimen Nimi:"
+msgid "Polling Interval:"
+msgstr "Haku aikaväli:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "Tervetuloa Uutispalvelin Velhoon"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Haku aikaväli (Tuntia):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "Uutispalvelin"
+msgid "Polling Period"
+msgstr "Haku aikaväli"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -717,29 +714,31 @@ msgstr ""
 "Palvelimesi hakee säännöllisesti Uutispalvelimelta uusimat uutiset; Haku "
 "aikaväli määrittää ajan kahden peräkkäisten hakujen välillä."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+"Tämä Velho auttaa sinua asettamaan Internet Uutis-palvelusi verkollesi."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "Uutispalvelin Velho"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "Haku aikaväli on virheellinen."
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "Uutispalvelimen nimi on virheellinen"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Haku aikaväli:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Internet Palvelin Nimet pitää olla muodossa \\qpalvelin.verkkoalue.aluetyyppi"
-"\\q; eli jos esimerkiksi palveluntarjoajasi on \\qtarjoaja.fi\\q, niin "
-"uutispalvelimen nimi on yleensä \\qnews.tarjoaja.fi\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Haku aikaväli"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Asetetaan Internet Uutis-palvelu"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -747,15 +746,7 @@ msgstr ""
 "Riippuen Internet yhteystyypistäsi, sopiva haku aikaväli voisi olla 6-24 "
 "tuntia."
 
-#: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "Haku aikaväli on virheellinen."
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "Uutispalvelin:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -763,7 +754,12 @@ msgstr ""
 "Uutispalvelimen nimi on sen palvelimen nimi joka tarjoaa Internet Uutiset "
 "verkollesi; tämä nimi saat yleensä yhteydentarjoajaltasi."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr "Velho asetti Internet Uutis-palvelusi onnistuneesti."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -771,57 +767,45 @@ msgstr ""
 "Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen Internet "
 "Uutis-palvelusi:"
 
-#: ../news_wizard/news.wiz_.c:22
-msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
-msgstr ""
-"Tämä Velho auttaa sinua asettamaan Internet Uutis-palvelusi verkollesi."
-
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Asetetaan Internet Uutis-palvelu"
-
-#: ../news_wizard/news.wiz_.c:24
-msgid ""
-"The wizard successfully configured your Internet News service of your server."
-msgstr "Velho asetti Internet Uutis-palvelusi onnistuneesti."
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Haku aikaväli (Tuntia):"
 
-#: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "Uutispalvelin Velho"
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Uutispalvelimen Nimi:"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../news_wizard/news.wiz_.c:20
 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."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Valitse taso joka vastaa tarpeitasi. Jos et tiedä, Paikallisverkko-taso on "
-"yleensä paras vaihtoehto. Huomaa että taso 'Kaikki', voi olla turvaton."
+"Internet Palvelin Nimet pitää olla muodossa \\qpalvelin.verkkoalue.aluetyyppi"
+"\\q; eli jos esimerkiksi palveluntarjoajasi on \\qtarjoaja.fi\\q, niin "
+"uutispalvelimen nimi on yleensä \\qnews.tarjoaja.fi\\q."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
-msgid "NFS Server Configuration Wizard"
-msgstr "NFS Palvelin Asetus Velho"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "Tervetuloa Uutispalvelin Velhoon"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
-msgstr "Netmask :"
+#: ../news_wizard/news.wiz_.c:24
+msgid "News Server"
+msgstr "Uutispalvelin"
 
-#: ../nfs_wizard/nfs.wiz_.c:5
-msgid "NFS Server"
-msgstr "NFS Palvelin"
+#: ../news_wizard/news.wiz_.c:25
+msgid "News Server:"
+msgstr "Uutispalvelin:"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "Velho asetti NFS Palvelimesi onnistuneesti."
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Tunnistettu verkko:"
 
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
-msgid "All - No access restriction"
-msgstr "Kaikki - Ei käyttörajoituksia"
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Käyttö Rajoitus"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
 "Access will be allowed for hosts on the network. Here is the information "
 "found about your current local network, you can modify it if needed."
@@ -829,118 +813,157 @@ msgstr ""
 "Välimuistin käyttö sallitaan verkostasi. Tässä on löydetyt tiedot nykyisestä "
 "paikallisverkostasi, voit muokata niitä jos tarvitset."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Käyttö Rajoitus"
-
-#: ../nfs_wizard/nfs.wiz_.c:11
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr "Tämä Velho auttaa sinua asettamaan NFS Palvelin verkollesi."
+#: ../nfs_wizard/nfs.wiz_.c:4
+msgid "Access :"
+msgstr "Sallittu :"
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
 msgid "Local Network - access for local network (recommended)"
 msgstr "Paikallisverkko - Käyttö sallittu paikallisverkosta (suositeltu)"
 
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr "NFS voidaan rajoittaa tietylle ip-luokalle"
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "Tunnistettu verkko:"
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+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."
 
-#: ../nfs_wizard/nfs.wiz_.c:15
+#: ../nfs_wizard/nfs.wiz_.c:8
 msgid "Exported dir:"
 msgstr "Viety hakemisto:"
 
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
+#: ../nfs_wizard/nfs.wiz_.c:9
+msgid "The wizard collected the following parameters."
+msgstr "Velho keräsi seuraavat parametrit."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
+msgid "NFS Server Configuration Wizard"
+msgstr "NFS Palvelin Asetus Velho"
+
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
+msgstr "NFS voidaan rajoittaa tietylle ip-luokalle"
+
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "NFS Velho"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
 msgid "Grant access on local network"
 msgstr "Salli käyttö paikallisverkosta"
 
+#: ../nfs_wizard/nfs.wiz_.c:15
+msgid "NFS Server"
+msgstr "NFS Palvelin"
+
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
+msgid "All - No access restriction"
+msgstr "Kaikki - Ei käyttörajoituksia"
+
 #: ../nfs_wizard/nfs.wiz_.c:18
-msgid "The wizard collected the following parameters."
-msgstr "Velho keräsi seuraavat parametrit."
+msgid "Netmask :"
+msgstr "Netmask :"
 
 #: ../nfs_wizard/nfs.wiz_.c:19
-msgid "Access :"
-msgstr "Sallittu :"
-
-#: ../nfs_wizard/nfs.wiz_.c:20
 msgid "Directory:"
 msgstr "Hakemisto:"
 
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
+msgid "This wizard will help you configuring the NFS Server for your network."
+msgstr "Tämä Velho auttaa sinua asettamaan NFS Palvelin verkollesi."
+
 #: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "NFS Velho"
+msgid "The wizard successfully configured your NFS Server"
+msgstr "Velho asetti NFS Palvelimesi onnistuneesti."
+
+#: ../postfix_wizard/postfix.wiz_.c:2
+#, fuzzy
+msgid "There seems to be a problem..."
+msgstr ""
+"Näyttää siltä että tässä on ongelma... mene kysymään isolta mustalta "
+"mieheltä alakerrassa."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
+#: ../postfix_wizard/postfix.wiz_.c:3
+msgid "Internet Mail Gateway"
+msgstr "Internet Sähköposti Yhdyskäytävä"
+
+#: ../postfix_wizard/postfix.wiz_.c:5
+msgid "Outgoing Mail Address"
+msgstr "Lähtevän Postin Osoite"
+
+#: ../postfix_wizard/postfix.wiz_.c:6
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr "Velho asetti palvelimesi Internet sähköposti-palvelu onnistuneesti."
+
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "Tee se"
 
-#: ../postfix_wizard/postfix.wiz_.c:3
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
-"Voit valita osoitemuoto joka lähtevä sähköposti näyttää kentissä: \\qKeneltä "
-"(From)\\q ja \\qVastausosoite (Reply-to)\\q."
+"Tämä pitäisi olla yhtenäinen sisääntulevan sähköpostin osoitteen kanssa."
 
-#: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "Asetetaan Internet Sähköposti"
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:11
+msgid "You entered an empty address for the mail gateway."
+msgstr "Jätit sähköposti-yhdyskäytävän asetus tyhjäksi."
+
+#: ../postfix_wizard/postfix.wiz_.c:12
+msgid "Internet Mail Configuration Wizard"
+msgstr "Internet Sähköposti Asetukset"
+
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Postfix Velho"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Sähköposti Palvelin Nimi:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"Postipalvelimesi lähettää ulosmenevää postia posti-yhdyskäytävän kautta, "
-"joka vastaa lopullisen lähetyksen perillemenosta."
+"Valintasi voidaan hyväksyä, mutta tämä ei salli sinua lähettämään "
+"sähköpostia paikallisverkkosi ulkopuolelle. Paina 'Seuraava' jatkaaksesi, "
+"tai 'Takaisin' korjataaksesi asetukset."
 
-#: ../postfix_wizard/postfix.wiz_.c:8
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
 msgstr ""
 "Tämä Veho auttaa sinua asettamaan Internet Sähköposti-palvelut verkollesi"
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Lähtevän Postin Osoite"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr ""
-"Tämä pitäisi olla yhtenäinen sisääntulevan sähköpostin osoitteen kanssa."
-
-#: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
-"Näyttää siltä että tässä on ongelma... mene kysymään isolta mustalta "
-"mieheltä alakerrassa."
-
-#: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "Maskeeraus ei hyvä!"
+"Postipalvelimesi lähettää ulosmenevää postia posti-yhdyskäytävän kautta, "
+"joka vastaa lopullisen lähetyksen perillemenosta."
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
 msgstr ""
 "Jos päätät tehdä asetuksia nyt, jatkat automaattisesti POSTFIX-asetuksiin"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Osoitteen muoto"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -950,11 +973,19 @@ msgstr ""
 "\\q; eli jos esimerkiksi palveluntarjoajasi on \\qtarjoaja.fi\\q, niin "
 "sähköposti-palvelimen nimi on yleensä \\qsmtp.tarjoaja.fi\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Internet Sähköposti Asetukset"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Voit valita osoitemuoto joka lähtevä sähköposti näyttää kentissä: \\qKeneltä "
+"(From)\\q ja \\qVastausosoite (Reply-to)\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "Asetetaan Internet Sähköposti"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -962,90 +993,76 @@ msgstr ""
 "Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen Internet "
 "sähköposti palvelusi:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
-msgid "Mail Address:"
-msgstr "Sähköpostiosoite:"
-
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Jätit sähköposti-yhdyskäytävän asetus tyhjäksi."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
-msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
-msgstr "Velho asetti palvelimesi Internet sähköposti-palvelu onnistuneesti."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Internet Sähköposti Yhdyskäytävä"
-
 #: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Sähköposti Palvelin Nimi:"
+msgid "Masquerade not good!"
+msgstr "Maskeeraus ei hyvä!"
 
 #: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"Valintasi voidaan hyväksyä, mutta tämä ei salli sinua lähettämään "
-"sähköpostia paikallisverkkosi ulkopuolelle. Paina 'Seuraava' jatkaaksesi, "
-"tai 'Takaisin' korjataaksesi asetukset."
+msgid "Form of the Address"
+msgstr "Osoitteen muoto"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../postfix_wizard/postfix.wiz_.c:29
+msgid "Mail Address:"
+msgstr "Sähköpostiosoite:"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"Muisti Välimuisti tarkoittaa määrätty käyttömuisti(RAM) joka on varattu "
-"välimuisti-toimintoihin. (huomaa että squid-prosessin todellinen muistin-"
-"käyttö on isompi)"
-
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Välityspalvelimen portti:"
+"Jos päätät tehdä asetuksia nyt, jatkat automaattisesti Välityspalvelimen "
+"asetuksiin."
 
 #: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "Velho asetti Välityspalvelimesi onnistuneesti."
-
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "Olet määrittänyt portin joka voi olla hyödyllinen tälle palvelulle:"
+msgid "Proxy Configuration Wizard"
+msgstr "Välityspalvelimen Asetus Velho"
 
 #: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Välimuisti hierarkia"
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "Sinun pitää valita portti suurempi kuin 1024 ja pienempi kuin 65535."
 
-#: ../proxy_wizard/proxy.wiz_.c:9
-msgid ""
-"Squid is a web caching proxy server, it allows faster web access for your "
-"local network."
-msgstr ""
-"Squid on webbi välityspalvelin, joka nopeuttaa webbi-liikenteen "
-"paikallisverkollesi."
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Tämä Velho pitää suorittaa pääkäyttäjänä (root)"
 
 #: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Käyttö Rajoitus:"
+
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "Asetetaan Välityspalvelinta"
+
+#: ../proxy_wizard/proxy.wiz_.c:13
 msgid "Define an upper level proxy"
 msgstr "Määritä ylemmän tason välityspalvelin"
 
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "Tiedostojärjestelmä  Koko  Käytetty  Vapaana  Käyttö-%  Liittämispiste"
+
 #: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Levy tilaa (Mt):"
+msgid ""
+"Squid is a web caching proxy server, it allows faster web access for your "
+"local network."
+msgstr ""
+"Squid on webbi välityspalvelin, joka nopeuttaa webbi-liikenteen "
+"paikallisverkollesi."
 
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "Ylemmän tason välityspalvelimen nimi:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Tämä Velho auttaa sinua asettamaan Välityspalvelintasi."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Ylemmän tason välityspalvelimen portti:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Tiedoksi, tässä on /var/spool/squid tilaa levyllä:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
@@ -1053,37 +1070,37 @@ msgstr ""
 "välimuistitietojen tallentamiselle levylle."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "Asetetaan Välityspalvelinta"
+msgid "Proxy Port"
+msgstr "Välityspalvelin portti:"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"Välityspalvelin portti määrää missä portissa palvelin kuuntelee http- "
-"kyselyjä. Vakio on 3128, toinen yleisesti käytössä on 8080, porttinumero on "
-"oltava suurempi kuin 1024"
+"Voit määrittää joko numeerinen osoite muodossa \\q192.168.1.0/255.255.255.0"
+"\\q tai tekstimuodossa \\qverkkoalue.aluetyyppi\\q"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Squid Velho"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Portti:"
+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."
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "Tiedostojärjestelmä  Koko  Käytetty  Vapaana  Käyttö-%  Liittämispiste"
+msgid "You have entered a port that may be useful for this service:"
+msgstr "Olet määrittänyt portin joka voi olla hyödyllinen tälle palvelulle:"
 
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Tämä Velho pitää suorittaa pääkäyttäjänä (root)"
+#: ../proxy_wizard/proxy.wiz_.c:27
+msgid "/etc/services:"
+msgstr "/etc/services:"
 
-#: ../proxy_wizard/proxy.wiz_.c:26
+#: ../proxy_wizard/proxy.wiz_.c:28
+msgid "Cache hierarchy"
+msgstr "Välimuisti hierarkia"
+
+#: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
 "You can safely select \\qNo upper level proxy\\q if you don't need this "
 "feature."
@@ -1091,189 +1108,158 @@ msgstr ""
 "Voit turvallisesti määrittää \\qEi ylemmän tason välityspalvelinta\\q jos et "
 "tarvitse tätä toimintoa."
 
-#: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Muisti välimuisti (Mt):"
-
-#: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Käyttö Rajoitus:"
+#: ../proxy_wizard/proxy.wiz_.c:30
+msgid "Port:"
+msgstr "Portti:"
 
-#: ../proxy_wizard/proxy.wiz_.c:29
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Jos päätät tehdä asetuksia nyt, jatkat automaattisesti Välityspalvelimen "
-"asetuksiin."
-
-#: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Välityspalvelin portti:"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Paina 'Takaisin' muuttaaksesi asetuksen."
+"Vaihtoehtoisesti, Squid voidaan ajaa monistettuna. Voit lisätä uusi ylemmän "
+"tason välityspalvelinta märittelemällä palvelin-nimi ja portti."
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:34
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"The wizard collected the following parameters needed to configure your proxy:"
 msgstr ""
-"Syötä virallinen palvelin-nimi (muodossa \\qcache.verkkoalue.aluetyyppi\\q) "
-"ja portti joka välityspalvelin käyttää."
+"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen "
+"Välityspalvelintasi:"
 
-#: ../proxy_wizard/proxy.wiz_.c:34
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Muisti välimuisti (Mt):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Ei ylemmän tason välityspalvelinta (suositeltu)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Sinun pitää valita portti suurempi kuin 1024 ja pienempi kuin 65535."
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Välityspalvelimen välimuistikoko"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Paina 'Takaisin' muuttaaksesi asetuksen."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Paina 'Seuraava' jos haluat pitää tämän arvon, tai 'Takaisin' jos haluat "
-"korjata valintasi."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Paikallispalvelin - käyttö sallittu ainoastaan tästä palvelimesta."
+"Välityspalvelin portti määrää missä portissa palvelin kuuntelee http- "
+"kyselyjä. Vakio on 3128, toinen yleisesti käytössä on 8080, porttinumero on "
+"oltava suurempi kuin 1024"
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Voit määrittää joko numeerinen osoite muodossa \\q192.168.1.0/255.255.255.0"
-"\\q tai tekstimuodossa \\qverkkoalue.aluetyyppi\\q"
+msgid "Squid wizard"
+msgstr "Squid Velho"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Välityspalvelimen Asetus Velho"
+msgid "Proxy port:"
+msgstr "Välityspalvelimen portti:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Levy tilaa (Mt):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "Ylemmän tason välityspalvelimen nimi:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Paikallispalvelin - käyttö sallittu ainoastaan tästä palvelimesta."
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"Vaihtoehtoisesti, Squid voidaan ajaa monistettuna. Voit lisätä uusi ylemmän "
-"tason välityspalvelinta märittelemällä palvelin-nimi ja portti."
+"Muisti Välimuisti tarkoittaa määrätty käyttömuisti(RAM) joka on varattu "
+"välimuisti-toimintoihin. (huomaa että squid-prosessin todellinen muistin-"
+"käyttö on isompi)"
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen "
-"Välityspalvelintasi:"
+"Syötä virallinen palvelin-nimi (muodossa \\qcache.verkkoalue.aluetyyppi\\q) "
+"ja portti joka välityspalvelin käyttää."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 "Välitypalvelinta voidaan määrittää käyttämään eri käyttörajoitus tasot."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Ylemmän tason välityspalvelimen portti:"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Tämä Velho auttaa sinua asettamaan Välityspalvelintasi."
-
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Tiedoksi, tässä on /var/spool/squid tilaa levyllä:"
-
-#: ../samba_wizard/samba.wiz_.c:1
-msgid "Enable file sharing area"
-msgstr "Ota käyttöön /home/samba/public jaettu alue"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
-"* Esimerkki 2: hyväksy isännät jotka vastaavat annettuja verkko/netmask\\n "
-"osoitteita = 150.203.15.0/255.255.255.0"
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "Velho asetti Välityspalvelimesi onnistuneesti."
 
 #: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr "Omat säännöt - Vahvista sallitut sekä kielletyt osoitteet"
+msgid "Home:"
+msgstr "Kotihakemisto:"
+
+#: ../samba_wizard/samba.wiz_.c:4
+msgid "Enable all printer"
+msgstr "Ota käyttöön kaikki tulostimet"
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Työryhmä:"
+msgid "Make home directories available for their owners"
+msgstr "Aseta kotihakemistot käyttäjien saataville."
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr ""
-"Jos päätät tehdä asetuksia nyt, jatkat automaattisesti SAMBA-asetuksiin"
-
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
-msgstr ""
-"Valitse tulostimet joiden haluat olevan tunnettujen käyttäjien käytettävissä."
+msgid "Configuring Samba"
+msgstr "Asetetaan Samba"
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "Palvelimen Juliste on virheellinen"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
+msgstr "Omat säännöt - Vahvista sallitut sekä kielletyt osoitteet"
 
 #: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
-msgstr "Tämä Velho auttaa sinua asettamaan Palvelimesi Samba palvelut."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba täytyy tiedä Windows työryhmän joka sen pitää palvella."
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
+msgstr "Huomaa että yhteys vaatii silti oikein määritetyn käyttäjän/salasanan."
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Käytössä olevat Samba palvelut"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+"Samba voi tarjoa yleisen tiedostonjakelualueen Windows työasemillesi, sekä "
+"tulostimen jako kaikille tulostimelle jotka ovat kytketty palvelimeen."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr "Hyväksy osoitteet:"
+msgid "The wizard successfully configured your Samba server."
+msgstr "Velho asetti Samba Palvelimesi onnistuneesti."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
-"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen Samba-"
-"palvelua."
+msgid "Server Banner."
+msgstr "Palvelin Juliste:"
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Juliste:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Tulostus Palvelin:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Työryhmä"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Työryhmä:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"* Esimerkki 4: hyväksy vain osoitteet ryhmässä \\qfoonet\\q mutta kiellä "
-"yhteys yhdestä tietystä osoitteesta\\nhosts allow = @foonet\\nhosts deny = "
-"pirate"
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
-msgstr "Juliste määrää tämän palvelimen kuvaus Windows työasemissa."
+"* Esimerkki 3: hyväksy pari osoitteita\\nhosts allow = lapland, arvidsjaur"
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Tiedostojako:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1282,11 +1268,27 @@ msgstr ""
 "kautta, mutta sinä/he tarvitset/tarvitsevat käyttää smbpasswd salasanan "
 "määrittelemiseksi."
 
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+"* Esimerkki 1: hyväksy kaikki ip-osoitteet välillä 150.203.*.* paitsi yksi "
+"tietty\\nhosts allow = 150.203. EXCEPT 150.203.6.66"
+
+#: ../samba_wizard/samba.wiz_.c:24
+msgid "Printers:"
+msgstr "Tulostimet:"
+
 #: ../samba_wizard/samba.wiz_.c:25
-msgid "Enable all printer"
-msgstr "Ota käyttöön kaikki tulostimet"
+msgid "The Server Banner is incorrect"
+msgstr "Palvelimen Juliste on virheellinen"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Samba Asetus Velho"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1294,709 +1296,721 @@ msgstr ""
 "Samba sallii palvelimesi esiintymään tiedosto- ja tulostuspalvelimena, "
 "työasemille jotka eivät käyttää Linux:ia."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
-msgstr "Tiedoston oikeudet"
-
 #: ../samba_wizard/samba.wiz_.c:28
-msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
-msgstr ""
-"* Esimerkki 1: hyväksy kaikki ip-osoitteet välillä 150.203.*.* paitsi yksi "
-"tietty\\nhosts allow = 150.203. EXCEPT 150.203.6.66"
+msgid "Deny hosts:"
+msgstr "Kiellä osoitteet:"
 
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "Asetetaan Samba"
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr "Tämä Velho auttaa sinua asettamaan Palvelimesi Samba palvelut."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr "Kirjoituslista:"
 
-#: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
 msgstr "Palvelin Juliste:"
 
+#: ../samba_wizard/samba.wiz_.c:33
+msgid "Enabled Samba Services"
+msgstr "Käytössä olevat Samba palvelut"
+
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
-msgstr "Huomaa että yhteys vaatii silti oikein määritetyn käyttäjän/salasanan."
+msgid "Enable Server Printer Sharing"
+msgstr "Ota käyttöön Palvelimen Tulostinjako"
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "Työryhmä on väärä"
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
+msgstr ""
+"Valitse tulostimet joiden haluat olevan tunnettujen käyttäjien käytettävissä."
+
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Jos päätät tehdä asetuksia nyt, jatkat automaattisesti SAMBA-asetuksiin"
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
-msgstr "Kiellä osoitteet:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
+msgstr ""
+"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen Samba-"
+"palvelua."
 
-#: ../samba_wizard/samba.wiz_.c:40
-msgid "Access control"
-msgstr "Yhteyshallinta"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr "Juliste määrää tämän palvelimen kuvaus Windows työasemissa."
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
-msgstr ""
-"Samba voi tarjoa yleisen tiedostonjakelualueen Windows työasemillesi, sekä "
-"tulostimen jako kaikille tulostimelle jotka ovat kytketty palvelimeen."
+msgid "read list:"
+msgstr "Lukulista:"
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Juliste:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "Velho asetti Samba Palvelimesi onnistuneesti."
+msgid "The Workgroup is wrong"
+msgstr "Työryhmä on väärä"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba täytyy tiedä Windows työryhmän joka sen pitää palvella."
+msgid "Samba wizard"
+msgstr "Samba Velho"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Palvelin Juliste:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 msgid "Access level :"
 msgstr "Käyttö Rajoitus:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Tulostus Palvelin:"
-
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Samba Velho"
-
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Samba Asetus Velho"
+msgid "Workgroup"
+msgstr "Työryhmä"
 
-#: ../samba_wizard/samba.wiz_.c:52
-msgid "Make home directories available for their owners"
-msgstr "Aseta kotihakemistot käyttäjien saataville."
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr "Hyväksy osoitteet:"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:49
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
 "\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
 msgstr ""
 "Anna käyttäjät tai ryhmät välilyönnillä erotettuna (ryhmien täytyy edeltää "
 "\\'@\\') esimerkiksi näin :\\nroot fred @users @wheel jokaiselle eri "
 "oikeudelle."
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Ota käyttöön Palvelimen Tulostinjako"
-
-#: ../samba_wizard/samba.wiz_.c:56
-msgid "Printers:"
-msgstr "Tulostimet:"
-
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Kotihakemisto:"
-
-#: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr "Lukulista:"
+#: ../samba_wizard/samba.wiz_.c:50
+msgid "Access control"
+msgstr "Yhteyshallinta"
 
-#: ../samba_wizard/samba.wiz_.c:60
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
-"* Esimerkki 3: hyväksy pari osoitteita\\nhosts allow = lapland, arvidsjaur"
+"* Esimerkki 4: hyväksy vain osoitteet ryhmässä \\qfoonet\\q mutta kiellä "
+"yhteys yhdestä tietystä osoitteesta\\nhosts allow = @foonet\\nhosts deny = "
+"pirate"
 
-#: ../server_wizard/server.wiz_.c:2
+#: ../samba_wizard/samba.wiz_.c:53
+msgid "Enable file sharing area"
+msgstr "Ota käyttöön /home/samba/public jaettu alue"
+
+#: ../samba_wizard/samba.wiz_.c:56
 msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
 msgstr ""
-"Valitse verkkolaite (yleensä kortti) jolla palvelin on kytketty verkkoon. "
-"Tämä on laite paikallisverkolle, todennäköisesti ei sama laite joka on "
-"käytössä Internetyhteyksiin."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "Palvelimen IP-osoite on virheellinen."
+"* Esimerkki 2: hyväksy isännät jotka vastaavat annettuja verkko/netmask\\n "
+"osoitteita = 150.203.15.0/255.255.255.0"
 
-#: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "Yhdyskäytävän laite:"
+#: ../samba_wizard/samba.wiz_.c:58
+msgid "File Sharing:"
+msgstr "Tiedostojako:"
 
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Palvelin Velho"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
+msgstr "Tiedoston oikeudet"
 
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
+#: ../server_wizard/server.wiz_.c:2
+msgid "This wizard will set the basic networking parameters of your server."
 msgstr ""
-"Verkko osoite on lista neljästä numerosta pienemmät kuin 256, pisteellä "
-"erotettuna, viimeinen numero listassa pitää olla nolla."
+"Tämä Velho auttaa sinua asettamaan verkon perusparametrit palvelimellesi."
+
+#: ../server_wizard/server.wiz_.c:4
+msgid "Host Name:"
+msgstr "Palvelin Nimi:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "verkko-laite"
+msgid "Basic Network Configuration Wizard"
+msgstr "Verkon Perusasetus Velho"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "Verkko-osoite on väärä"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Joten todennäköisesti verkkoalue nimi ja IP-osoite paikallisverkolle on ERI "
-"kun palvelimen \\qulkoinen\\q yhteys."
+msgid "Server IP address:"
+msgstr "Palvelimen IP osoite:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Verkko osoite"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "Sinun ei pitäisi ajaa yhtäkään toista ohjelmaa samalla kuin suoritat tämä "
 "Velhoa, ja kuin tämä Velho on valmis, sinun pitäisi lopettaa tämän istunnon "
 "ja kirjoittautua sisään uudestaan."
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
-msgstr ""
-"Tässä on tämänhetkinen arvo ulkoiselle yhdyskäytävälle (arvo joka asetettiin "
-"alku-asennuksen yhteydessä). Laite (verkkokortti tai modeemi) pitäisi olla "
-"eri kuin se joka on kytketty paikallisverkkoon."
+"The wizard successfully configured the basic networking services of your "
+"server."
+msgstr "Velho asetti palvelimesi verkon peruspalvelut onnistuneesti."
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:14
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"(you can change here these values if you know exactly what you're doing)"
 msgstr ""
-"Mitä näitä Velhoja koskee, tietokonesi katsotaan palvelimeksi joka hallitsee "
-"omaa paikallisverkkoa (C-luokan verkko)."
-
-#: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Laite:"
+"(voit muuttaa näitä asetuksia, jos tiedät tarkalleen mitä olet tekemässä)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Varoitus"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"Verkko-osoite on numero joka tunnistaa verkkosi; ehdotettu arvo on "
+"suunniteltu ympäristöön jossa ei ole Internet-yhteyttä, tai käytetään "
+"Internettiä käyttämällä IP-maskeerausta; mikäli et varmasti tiedä mitä olet "
+"tekemässä, hyväksy oletus-asetukset."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Tämä sivu määrittelee verkkoalueen nimi; pitäisi olla näkymätön"
+msgid "Note about networking"
+msgstr "Huomautus verkon käytöstä"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Palvelin Osoite:"
+msgid "Server Address"
+msgstr "Palvelin Osoite"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Määritelty verkkoalueen nimi"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"Verkko osoite on lista neljästä numerosta pienemmät kuin 256, pisteellä "
+"erotettuna, viimeinen numero listassa pitää olla nolla."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "Palvelin nimi"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Huomautus: Yhdyskäytävän IP-osoite pitää olla täytettynä, jos haluat "
+"yhteyden Internettiin."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-"Tämä sivu määrittelee oletus palvelin-osoitteet; pitäisi olla näkymätön."
+msgid "The Server IP address is incorrect"
+msgstr "Palvelimen IP-osoite on virheellinen."
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Verkon Perusasetus Velho"
+msgid "Configuring your network"
+msgstr "Asetetaan Verkkosi"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "Yhdyskäytävä IP:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "Määritty konenimi on virheellinen."
+msgid "This page computes the default server address; it should be invisible."
+msgstr ""
+"Tämä sivu määrittelee oletus palvelin-osoitteet; pitäisi olla näkymätön."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"Koneiden nimet pitää olla muodossa \\qkone.verkkoalue.aluetyyppi\\q; eli jos "
-"palvelimesi käytetään Internet-palvelimena, niin verkkoalue-nimi pitäisi "
-"olla nimi joka on rekisteröity tarjoajaltasi. Jos sinulla on ainoastaan "
-"Intranetti, mikä tahansa hyväksyttävä nimi on OK, esimerkiksi \\yritys.fi\\q."
+msgid "IP net address:"
+msgstr "IP verkko osoite:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Ulkoinen yhdyskäytävä"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"Verkko-osoite on numero joka tunnistaa verkkosi; ehdotettu arvo on "
-"suunniteltu ympäristöön jossa ei ole Internet-yhteyttä, tai käytetään "
-"Internettiä käyttämällä IP-maskeerausta; mikäli et varmasti tiedä mitä olet "
-"tekemässä, hyväksy oletus-asetukset."
+msgid "Server Wizard"
+msgstr "Palvelin Velho"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
-"Tämä Velho auttaa sinua asettamaan verkon peruspalvelut palvelimellesi."
+"Joten todennäköisesti verkkoalue nimi ja IP-osoite paikallisverkolle on ERI "
+"kun palvelimen \\qulkoinen\\q yhteys."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
+msgid ""
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Tämä Velho auttaa sinua asettamaan verkon perusparametrit palvelimellesi."
+"Valitse verkkolaite (yleensä kortti) jolla palvelin on kytketty verkkoon. "
+"Tämä on laite paikallisverkolle, todennäköisesti ei sama laite joka on "
+"käytössä Internetyhteyksiin."
 
 #: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Huomautus verkon käytöstä"
+msgid ""
+"Devices are presented with the Linux name and, if known, with the card "
+"description."
+msgstr ""
+"Laitteet esitetään Linux nimillä, sekä jos tiedossa, niiden kuvauksella."
+
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Tässä on tämänhetkinen arvo ulkoiselle yhdyskäytävälle (arvo joka asetettiin "
+"alku-asennuksen yhteydessä). Laite (verkkokortti tai modeemi) pitäisi olla "
+"eri kuin se joka on kytketty paikallisverkkoon."
 
 #: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"This wizard will help you in configuring the basic networking services of "
+"your server."
 msgstr ""
-"Huomautus: Yhdyskäytävän IP-osoite pitää olla täytettynä, jos haluat "
-"yhteyden Internettiin."
+"Tämä Velho auttaa sinua asettamaan verkon peruspalvelut palvelimellesi."
 
 #: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Velho Virhe."
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"Palvelimen IP-osoite on numero joka tunnistaa palvelimesi verkossa; "
+"ehdotettu arvo on suunniteltu yksityiseen verkkoon, ilman että sitä näkyy "
+"Internettiin, tai yhdistetty Internettiin IP-maskeerauksen kautta; Mikäli et "
+"tiedä mitä olet tekemässä, hyväksy oletusarvot."
 
 #: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "Määritty konenimi on virheellinen."
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
-"Devices are presented with the Linux name and, if known, with the card "
-"description."
+"The hostname is the name under which your server will be known from the "
+"other workstations in your network and maybe on the Internet (depending of "
+"your upstream configuration)."
 msgstr ""
-"Laitteet esitetään Linux nimillä, sekä jos tiedossa, niiden kuvauksella."
+"Palvelin-nimi on se nimi millä palvelimesi tunnistetaan verkossa toisista "
+"työasemista, ja mahdollisesti myös Internetistä (riippuen asetuksistasi)."
+
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Velho Virhe."
 
 #: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Verkko osoite:"
+msgid "net device"
+msgstr "verkko-laite"
 
 #: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "Asetetaan Verkkosi"
+msgid "Computed domain Name"
+msgstr "Määritelty verkkoalueen nimi"
 
 #: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "Yhdyskäytävä IP:"
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Tämä sivu määrittelee verkkoalueen nimi; pitäisi olla näkymätön"
 
 #: ../server_wizard/server.wiz_.c:40
-msgid ""
-"The hostname is the name under which your server will be known from the "
-"other workstations in your network and maybe on the Internet (depending of "
-"your upstream configuration)."
-msgstr ""
-"Palvelin-nimi on se nimi millä palvelimesi tunnistetaan verkossa toisista "
-"työasemista, ja mahdollisesti myös Internetistä (riippuen asetuksistasi)."
+msgid "Gateway device:"
+msgstr "Yhdyskäytävän laite:"
 
 #: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "Palvelin Nimi:"
-
-#: ../server_wizard/server.wiz_.c:42
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
 msgstr ""
 "Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen verkkosi:"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"Ulkoinen yhteys on verkko johon tietokone on asiakkaana (esim. Internet), "
-"yhdistetty joko toisella verkko-kortilla tai modeemilla."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Varoitus"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr ""
-"(voit muuttaa näitä asetuksia, jos tiedät tarkalleen mitä olet tekemässä)"
+msgid "Device:"
+msgstr "Laite:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"Palvelimen IP-osoite on numero joka tunnistaa palvelimesi verkossa; "
-"ehdotettu arvo on suunniteltu yksityiseen verkkoon, ilman että sitä näkyy "
-"Internettiin, tai yhdistetty Internettiin IP-maskeerauksen kautta; Mikäli et "
-"tiedä mitä olet tekemässä, hyväksy oletusarvot."
+"Mitä näitä Velhoja koskee, tietokonesi katsotaan palvelimeksi joka hallitsee "
+"omaa paikallisverkkoa (C-luokan verkko)."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Palvelin Nimi:"
+msgid "Server Address:"
+msgstr "Palvelin Osoite:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "Verkko-osoite on väärä"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"Ulkoinen yhteys on verkko johon tietokone on asiakkaana (esim. Internet), "
+"yhdistetty joko toisella verkko-kortilla tai modeemilla."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Palvelin Osoite"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
-msgstr "Velho asetti palvelimesi verkon peruspalvelut onnistuneesti."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
+msgstr ""
+"Koneiden nimet pitää olla muodossa \\qkone.verkkoalue.aluetyyppi\\q; eli jos "
+"palvelimesi käytetään Internet-palvelimena, niin verkkoalue-nimi pitäisi "
+"olla nimi joka on rekisteröity tarjoajaltasi. Jos sinulla on ainoastaan "
+"Intranetti, mikä tahansa hyväksyttävä nimi on OK, esimerkiksi \\yritys.fi\\q."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "Verkko Laite"
+msgid "Host Name"
+msgstr "Palvelin nimi"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "IP verkko osoite:"
+msgid "Network Address:"
+msgstr "Verkko osoite:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Verkko osoite"
+msgid "Network Device"
+msgstr "Verkko Laite"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "Palvelimen IP osoite:"
+msgid "Server Name:"
+msgstr "Palvelin Nimi:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "University of Adelaide, South Australia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Universite Paris Sud, France"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Paina 'Seuraava' käynnistääksesi aika-palvelimien testaus."
+msgid "University of Manchester, Manchester, England"
+msgstr "University of Manchester, Manchester, England"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Aika Palvelimet"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Universite de Limoges, France"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Toissijainen Aika Palvelin:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr "Näin palvelimesi toimii paikallisena aika-palvelimena verkollesi."
+msgid "Press next to start the time servers test."
+msgstr "Paina 'Seuraava' käynnistääksesi aika-palvelimien testaus."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
-msgstr "Palvelimesi voi nyt toimia aika-palvelimena paikallisverkollesi."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
+msgstr ""
+"Voit yrittää ottaa yhteyttä aika-palvelimille uudelleen, tai tallenna "
+"asetukset säätämättä kellonaikaa."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(valitse palvelimia joita on omalla mantereellasi, kiitos)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylor College of Medicine, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "University of Oklahoma, Norman, Oklahoma, USA"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Valitse aika-vyöhyke:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "University of Regina, Regina, Saskatchewan, Canada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr "paina 'Seuraava' aloittaaksesi, tai 'Peruuta' poistuaaksesi velhosta."
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Trinity College, Dublin, Ireland"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, France"
+msgid "Singapore"
+msgstr "Singapore"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Universite de Limoges, France"
+msgid "Secondary Time Server:"
+msgstr "Toissijainen Aika Palvelin:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
+msgstr "Yritä uudelleen"
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
-msgstr "Valitse ensisijainen ja toissijainen palvelin-listalta."
+msgid "The Chinese University of Hong Kong"
+msgstr "The Chinese University of Hong Kong"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(valitse palvelimia joita on omalla mantereellasi, kiitos)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV College of Engineering, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, France"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante/SPAIN)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "National Research Council of Canada, Ottawa, Ontario, Canada"
 
+#: ../time_wizard/time.wiz_.c:18
+msgid "Select a primary and secondary server from the list."
+msgstr "Valitse ensisijainen ja toissijainen palvelin-listalta."
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "University of Manchester, Manchester, England"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, France"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- ei ulkoista verkkoa"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Inc., Seoul, Korea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Jos aika-palvelin ei ole heti käytössä (verkko- tai muista syistä), odotat "
-"noin 30 sek."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Scientific Center in Chernogolovka, Moscow region, Russia"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Kokeillaan aika-palvelinten käytön toimivuutta"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washington State University Tri-Cities, Richland, Wa"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "University of Oslo, Norway"
+msgid "University of Adelaide, South Australia"
+msgstr "University of Adelaide, South Australia"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "Computer Science Department, University of Wisconsin-Madison"
+msgid "Time zone:"
+msgstr "Aika-vyöhyke:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Trinity College, Dublin, Ireland"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Aika-palvelimet eivät vastaa. Syyt tähän voi olla:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "University of Regina, Regina, Saskatchewan, Canada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Universite de Caen, France"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Aika-palvelimet eivät vastaa. Syyt tähän voi olla:"
+msgid "- other reasons..."
+msgstr "- muut syyt ..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Swiss Fed. Inst. of Technology"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Jos aika-palvelin ei ole heti käytössä (verkko- tai muista syistä), odotat "
+"noin 30 sek."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Universite de Caen, France"
+msgid "WARNING"
+msgstr "VAROITUS"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, France"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, France"
 
 #: ../time_wizard/time.wiz_.c:31
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
-msgstr ""
-"Tämä Velho auttaa sinua asettamaan palvelimesi ajan, joko paikallisesti tai "
-"tahdistettuna ulkoiseen aika-palvelimeen."
+msgid "Your server can now act as a time server for your local network."
+msgstr "Palvelimesi voi nyt toimia aika-palvelimena paikallisverkollesi."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "VAROITUS"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Fukuoka university, Fukuoka, Japan"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Inc., Seoul, Korea"
+msgid "Time Servers"
+msgstr "Aika Palvelimet"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "University of Oklahoma, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Swiss Fed. Inst. of Technology"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "The Chinese University of Hong Kong"
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Tämä Velho auttaa sinua asettamaan palvelimesi ajan, joko paikallisesti tai "
+"tahdistettuna ulkoiseen aika-palvelimeen."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- muut syyt ..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, France"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- aika-palvelin ei ole olemassa"
+msgid "Testing the time servers availability"
+msgstr "Kokeillaan aika-palvelinten käytön toimivuutta"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Aika-vyöhyke:"
+msgid "Save config without test"
+msgstr "Tallenna asetukset ilman kokeilua"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Voit yrittää ottaa yhteyttä aika-palvelimille uudelleen, tai tallenna "
-"asetukset säätämättä kellonaikaa."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT Information Systems, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Ensisijainen Aika Palvelin:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylor College of Medicine, Houston, Tx"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Yritä uudelleen"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn State University, University Park, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
+msgstr "- aika-palvelin ei ole olemassa"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Aika-palvelin asetukset tallennettu"
+msgid "Time wizard"
+msgstr "Aika Velho"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgid "University of Oslo, Norway"
+msgstr "University of Oslo, Norway"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr "Näin palvelimesi toimii paikallisena aika-palvelimena verkollesi."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Tallenna asetukset ilman kokeilua"
+msgid "- no outside network"
+msgstr "- ei ulkoista verkkoa"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapore"
+msgid "Primary Time Server:"
+msgstr "Ensisijainen Aika Palvelin:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Fukuoka university, Fukuoka, Japan"
+msgid "Time server configuration saved"
+msgstr "Aika-palvelin asetukset tallennettu"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr "paina 'Seuraava' aloittaaksesi, tai 'Peruuta' poistuaaksesi velhosta."
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante/SPAIN)"
+msgid "Choose a time zone:"
+msgstr "Valitse aika-vyöhyke:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Aika Velho"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr "käyttäjä-http-alihakmisto : ~/"
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr "Computer Science Department, University of Wisconsin-Madison"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
-msgstr "Moduulit:"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
+msgstr ""
+"* Käyttäjä-moduuli : sallii käyttäjien saavan hakemiston kotihakemistoon "
+"joka näkyy palvelimella http://www.sinunpalvelin.com/~kayttaja, Sinulta "
+"kysytään tämän hakemiston nimi myöhemmin."
 
 #: ../web_wizard/web.wiz_.c:3
-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ää Webbi-Palvelinta."
+msgid ""
+"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 Webbi-Palvelimena paikallisverkollesi (intranet), "
+"sekä Internetin Web-Palvelimena."
 
 #: ../web_wizard/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr "Velho asetti Intranetti / Internetti Webbi Palvelimesi onnistuneesti."
+msgid "Internet web server:"
+msgstr "Internet web-palvelin:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
-msgstr "käyttäjähakemisto:"
+msgid "Modules :"
+msgstr "Moduulit:"
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
-msgstr ""
-"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen Webbi "
-"Palvelimesi:"
+#: ../web_wizard/web.wiz_.c:6
+#, fuzzy
+msgid "Document root:"
+msgstr "document-päähakemisto:"
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Webbi Velho"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
+msgstr "käyttäjä-http-alihakmisto : ~/"
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
-msgstr ""
-"Tämä Velho auttaa sinua asettamaan Webbi-Palvelimesi paikallisverkollesi."
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Ota käyttöön paikallisverkon (intranet) Webbi-Palvelin."
 
 #: ../web_wizard/web.wiz_.c:12
-msgid "Internet web server:"
-msgstr "Internet web-palvelin:"
+msgid "Configuring the Web Server"
+msgstr "Asetetaan Webbi Palvelin"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Ota käyttöön paikallisverkon (intranet) Webbi-Palvelin."
+msgid "Web Server"
+msgstr "Webbi Palvelin"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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 Webbi-Palvelimena paikallisverkollesi (intranet), "
-"sekä Internetin Web-Palvelimena."
-
-#: ../web_wizard/web.wiz_.c:15
 msgid "Enable the Web Server for the Internet"
 msgstr "Ota käyttöön web-palvelin näkyväksi Internetiin."
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Jaettu hakemisto:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "Valitse Web-palvelun tyyppi jota haluat ottaa käyttöön."
+#, fuzzy
+msgid "This wizard will help you configuring the Web Server for your network."
+msgstr ""
+"Tämä Velho auttaa sinua asettamaan Webbi-Palvelimesi paikallisverkollesi."
 
 #: ../web_wizard/web.wiz_.c:17
-msgid "document root:"
-msgstr "document-päähakemisto:"
+msgid "Web wizard"
+msgstr "Webbi Velho"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 msgid "Intranet web server:"
 msgstr "Intranet web-palvelin:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 "Anna hakemiston nimi johon käyttäjien tulisi luoda kotihakemistonsa (ilman "
 "~/) saadakseen sen saataville http://www.sinunpalvelin.com/~kayttaja kautta."
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "Asetetaan Webbi Palvelin"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
-msgstr ""
-"* Käyttäjä-moduuli : sallii käyttäjien saavan hakemiston kotihakemistoon "
-"joka näkyy palvelimella http://www.sinunpalvelin.com/~kayttaja, Sinulta "
-"kysytään tämän hakemiston nimi myöhemmin."
+msgid "activate user module"
+msgstr "aktivoi käyttäjämoduuli"
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Webbi Palvelin"
+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ää Webbi-Palvelinta."
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Webbi Palvelin Asetus Velho"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "Valitse Web-palvelun tyyppi jota haluat ottaa käyttöön."
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr ""
+"Velho keräsi seuraavat parametrit joita vaaditaan asettaakseen Webbi "
+"Palvelimesi:"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
-msgstr "Anna hakemisto jonka haluat olevan juurihakemisto."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr "Velho asetti Intranetti / Internetti Webbi Palvelimesi onnistuneesti."
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
+msgstr "Juurihakemisto:"
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
-msgstr "aktivoi käyttäjämoduuli"
+msgid "Type the path of the directory you want being the document root."
+msgstr "Anna hakemisto jonka haluat olevan juurihakemisto."
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr "Juurihakemisto:"
+msgid "Web Server Configuration Wizard"
+msgstr "Webbi Palvelin Asetus Velho"
 
 msgid "Cancel"
 msgstr "Peruuta"
@@ -2013,6 +2027,9 @@ msgstr "Käytössä"
 msgid "disabled"
 msgstr "Poistettu käytöstä"
 
+#~ msgid "user dir:"
+#~ msgstr "käyttäjähakemisto:"
+
 #~ msgid ""
 #~ "You can set the time of your machine in two ways: Locally means that the "
 #~ "setting will simply set the system clock, without synchronizing with the "
diff --git a/po/fr.po b/po/fr.po
index 9ae7d857..f8b3d6d8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.1\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-10-02 15:35+0200\n"
 "Last-Translator: Guy CLOTILDE <guy.clotilde@wanadoo.fr>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -18,200 +18,201 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Un client pour votre r�seau local est une machine du r�seau ayant sa propre "
-"adresse IP et son propre nom."
+"Cliquez sur Suivant pour param�trer maintenant, ou Annuler pour quitter cet "
+"assistant."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "Cette adresse est incorrecte... Appuyer sur Suivant pour continuer"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "OK"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"Cliquez sur Suivant si vous voulez utiliser les valeurs courantes, ou Retour "
-"pour corriger."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "F�licitations"
+"Si vous choisissez de configurer maintenant, vous irez automatiquement sur "
+"la configuration du Client."
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "Assistant pour le client DNS"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr ""
+"Cliquez sur Suivant pour commencer, ou Annuler pour quitter l'assistant."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"Votre client sur le r�seau sera identifi� par son nom, comme dans nomclient."
+"compagnie.net . Chaque machine sur le r�seau doit avoir une adresse IP "
+"(unique) dans la syntaxe habituelle avec des points."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "L'assistant a rassembl� les param�tres suivants�n�cessaires pour ajouter un "
 "client � votre r�seau:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Erreur syst�me, aucune configuration n'a �t� appliqu�e."
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "Nom du client�:"
+msgid "The wizard successfully added the client."
+msgstr "L'assistant a ajout� le client au DNS."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Ajout d'un client dans votre DNS"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(il n'est pas n�cessaire de saisir le domaine apr�s le nom)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Configuration"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"Notez bien que l'adresse IP et le nom doivent �tre uniques dans le r�seau."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Identification du client�:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Attention:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(il n'est pas n�cessaire de saisir le domaine apr�s le nom)"
+msgid "Name of the machine:"
+msgstr "Nom de la machine�:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Si vous choisissez de configurer maintenant, vous irez automatiquement sur "
-"la configuration du Client."
+msgid "Adding a new client to your network"
+msgstr "Ajout d'un client dans votre DNS"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Le serveur va utiliser les informations que vous avez saisies pour que le "
-"nom du client soit visible des autres machines sur votre r�seau."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Erreur syst�me, aucune configuration n'a �t� appliqu�e."
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Vous avez entr� un nom de machine ou une adresse incorrect"
+msgid "Client identification:"
+msgstr "Identification du client�:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "L'assistant a ajout� le client au DNS."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr "Cet assistant va vous aider � ajouter un nouveau client dans votre DNS"
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "Nom de la machine�:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "OK"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"Votre client sur le r�seau sera identifi� par son nom, comme dans nomclient."
-"compagnie.net . Chaque machine sur le r�seau doit avoir une adresse IP "
-"(unique) dans la syntaxe habituelle avec des points."
+"Un client pour votre r�seau local est une machine du r�seau ayant sa propre "
+"adresse IP et son propre nom."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"Notez bien que l'adresse IP et le nom doivent �tre uniques dans le r�seau."
+"Pour accepter ces valeurs et ajouter le client, cliquez sur ��Suivant�� ou "
+"utilisez le boutton Pr�c�dent pour corriger."
 
-#: ../client_wizard/client.wiz_.c:21
-#, fuzzy
-msgid "DNS Wizard (add client)"
-msgstr "Assistant de configuration du DNS"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "Cette adresse est incorrecte... Appuyer sur Suivant pour continuer"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Attention\\nVous �tes en DHCP, le serveur pourrait ne pas marcher avec cette "
-"configuration."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "Adresse IP�:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "Adresse IP de la machine�:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Configuration"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Quitter"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "Seul root (l'administrateur) peut d�marrer cet assistant"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Le r�seau n'est pas pas encore configur�"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Cet assistant va vous aider � ajouter un nouveau client dans votre DNS"
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Vous avez entr� un nom de machine ou une adresse incorrect"
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
-msgstr ""
-"Pour accepter ces valeurs et ajouter le client, cliquez sur ��Suivant�� ou "
-"utilisez le boutton Pr�c�dent pour corriger."
+#: ../client_wizard/client.wiz_.c:25
+#, fuzzy
+msgid "DNS Wizard (add client)"
+msgstr "Assistant de configuration du DNS"
 
-#: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"Cliquez sur Suivant pour commencer, ou Annuler pour quitter l'assistant."
+"Attention\\nVous �tes en DHCP, le serveur pourrait ne pas marcher avec cette "
+"configuration."
 
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
+#: ../client_wizard/client.wiz_.c:28
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Cliquez sur Suivant pour param�trer maintenant, ou Annuler pour quitter cet "
-"assistant."
+"Le serveur va utiliser les informations que vous avez saisies pour que le "
+"nom du client soit visible des autres machines sur votre r�seau."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "Seul root (l'administrateur) peut d�marrer cet assistant"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "F�licitations"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "Adresse IP de la machine�:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "Adresse IP�:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Cliquez sur Suivant si vous voulez utiliser les valeurs courantes, ou Retour "
+"pour corriger."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
@@ -219,28 +220,15 @@ msgstr ""
 "Vous devez configurer les param�tres de base de votre r�seau avant de lancer "
 "cet assistant."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Attention:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Assistant de configuration"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "Serveur de Base de donn�es MySQL"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Pour ajouter un utilisateur, entrez un nom et un mot de passe, SVP."
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "Nom du client�:"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Ajout d'utilisateur"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -248,79 +236,71 @@ msgstr ""
 "Pour accepter ces valeurs et configurer le serveur, cliquez sur "
 "��Confirmer�� ou outilisez le bouton Pr�c�dent pour les corriger."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Veuillez taper un mot de passe pour l'utilisateur root:"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "Configuration du serveur de Bases de donn�es MySQL"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr ""
-"L'assistant a configur� avec succ�s le service de Base de donn�es MySQL"
+msgid "Confirm"
+msgstr "Confirmation"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Serveur de Bases de donn�es"
+msgid "Password:"
+msgstr "Mot de Passe:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Mot de passe Root:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr ""
+"L'assistant a configur� avec succ�s le service de Base de donn�es MySQL"
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Confirmation"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "D�sol�, vous devez �tre root pour faire ceci..."
+msgid "Username:"
+msgstr "Nom d'utilisateur:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Mot de Passe:"
+msgid "Add"
+msgstr "Ajouter"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Si vous choisissez de configurer maintenant, vous irez automatiquement sur "
-"la configuration de la Base de donn�es MySQL"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "D�sol�, vous devez �tre root pour faire ceci..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
-"Cet assistant va vous aider � configurer le serveur de bases de donn�es "
-"MySQL pour votre r�seau."
+msgid "Database Server"
+msgstr "Serveur de Bases de donn�es"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Nom d'utilisateur:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Note: cet utilisateur aura toutes les permissions (droits)"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Ajouter"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Veuillez taper un mot de passe pour l'utilisateur root:"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "Assistant de Base de donn�es MySQL"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "Configuration du serveur de Bases de donn�es MySQL"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Assistant de configuration"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr ""
 "Pour d�marrer votre serveur, vous devez d'abord sp�cifier un mot de passe "
 "root (=administrateur)"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "Assistant de Base de donn�es MySQL"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Mot de passe Root:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "Serveur de Base de donn�es MySQL"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -328,36 +308,61 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants n�cessaires pour configurer "
 "votre serveur de base de donn�es MySQL�:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
 msgstr ""
-"L'adresse r�seau est une liste de 4 nombres inf�rieurs � 256 s�par�s par des "
-"points."
+"Cet assistant va vous aider � configurer le serveur de bases de donn�es "
+"MySQL pour votre r�seau."
+
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Pour ajouter un utilisateur, entrez un nom et un mot de passe, SVP."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../db_wizard/db.wiz_.c:27
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
+msgstr ""
+"Si vous choisissez de configurer maintenant, vous irez automatiquement sur "
+"la configuration de la Base de donn�es MySQL"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr ""
+"L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
+"votre service DHCP:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Correction"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
-"Choisissez la plage d'adresses assign�es aux postes de travail par le "
-"service DHCP; mis � part en cas de besoins sp�cifiques, vous pouvez "
-"tranquillement accepter les valeurs propos�es."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Adresse IP la plus haute�:"
+msgid "Lowest IP Address:"
+msgstr "Adresse IP la plus basse�:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "Adresses allou�es par dhcp"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr ""
+"L'adresse r�seau est une liste de 4 nombres inf�rieurs � 256 s�par�s par des "
+"points."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -365,98 +370,84 @@ msgstr ""
 "Pour accepter ces valeurs et configurer le serveur, cliquez sur ��Suivant�� "
 "ou utilisez le bouton ��Pr�c�dent�� pour les corriger."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"le DHCP est un service qui assigne automatiquement des adresses r�seau � vos "
-"postes de travail."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "Assistant de configuration DHCP"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Correction"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr ""
+"Cet assistant va vous aider � configurer les services DHCP de votre serveur."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "Adresses allou�es par dhcp"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 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."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr ""
-"Cet assistant va vous aider � configurer les services DHCP de votre serveur."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
-"votre service DHCP:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Adresse IP la plus basse�:"
+"Choisissez la plage d'adresses assign�es aux postes de travail par le "
+"service DHCP; mis � part en cas de besoins sp�cifiques, vous pouvez "
+"tranquillement accepter les valeurs propos�es."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "Assistant de configuration DHCP"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "L'intervalle d'adresses est incorrect"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
+"le DHCP est un service qui assigne automatiquement des adresses r�seau � vos "
+"postes de travail."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "L'intervalle d'adresses est incorrect"
+msgid "Highest IP Address:"
+msgstr "Adresse IP la plus haute�:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
+msgid "DHCP Configuration Wizard"
 msgstr "Assistant de configuration DHCP"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "Configuration du serveur DHCP"
 
-#: ../dns_wizard/dns.wiz_.c:2
-#, fuzzy
-msgid "DNS Wizard (configuration)"
-msgstr "Assistant de configuration du DNS"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
-"votre service DNS:"
+"Votre param�trage peut �tre accept�, mais vous ne pourrez pas identifier des "
+"noms de macine hors de votre r�seau local."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr "Cliquez sur Suivant pour laisser vide, ou Pr�c�dent pour modifier."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Adresse DNS primaire�:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "Configuration du serveur DNS"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Adresse DNS secondaire�:"
+msgid "DNS Configuration Wizard"
+msgstr "Assistant de configuration du DNS"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "Adresses des serveurs DNS"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Cet assistant vous aidera � configurer les services DNS de votre serveur. "
-"Cela vous fournira un service local de DNS pour les noms d'ordinateurs "
-"locaux, avec renvoi des requ�tes autres que locales vers un DNS externe."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -468,41 +459,53 @@ msgstr ""
 "fournir une adresse IP de serveur DNS primaire et une adresse secondaire; "
 "habituellement, cette adresse vous est donn�e par votre fournisseur d'acc�s."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "L'assistant a configur� avec succ�s le service DNS de votre serveur."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Vous avez saisi une adresse vide pour le serveur DNS."
 
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
+msgstr ""
+"L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
+"votre service DNS:"
+
 #: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
-msgstr "Cliquez sur Suivant pour laisser vide, ou Pr�c�dent pour modifier."
+msgid "DNS Server Addresses"
+msgstr "Adresses des serveurs DNS"
 
 #: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "Assistant de configuration du DNS"
-
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Adresse DNS primaire�:"
-
-#: ../dns_wizard/dns.wiz_.c:20
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Votre param�trage peut �tre accept�, mais vous ne pourrez pas identifier des "
-"noms de macine hors de votre r�seau local."
+"le DNS (Serveur de Noms de Domaine) est le service qui met en correspondance "
+"une machine avec nom d'h�te internet."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Adresse DNS secondaire�:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"le DNS (Serveur de Noms de Domaine) est le service qui met en correspondance "
-"une machine avec nom d'h�te internet."
+"Cet assistant vous aidera � configurer les services DNS de votre serveur. "
+"Cela vous fournira un service local de DNS pour les noms d'ordinateurs "
+"locaux, avec renvoi des requ�tes autres que locales vers un DNS externe."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "L'assistant a configur� avec succ�s le service DNS de votre serveur."
+#, fuzzy
+msgid "DNS Wizard (configuration)"
+msgstr "Assistant de configuration du DNS"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -513,62 +516,70 @@ msgid "Please select a wizard"
 msgstr "SVP choisissez un assistant"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "P�riph�rique"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "Interm�diaire - Web, ftp et ssh accessibles de l'ext�rieur"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr "Fort - Invisible de l'ext�rieur, usage interne limit� au web"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Quelque chose de terrible est survenu"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Assistant de configuration du Pare Feu"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"L'assistant a rassembl� les param�tres suivants n�cessaires�pour configurer "
+"votre pare-feu:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr ""
+"Le pare-feu (firewall) prot�ge votre r�seau local des acc�s non-autoris�s en "
+"provenance d'Internet."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "P�riph�rique r�seau vers Internet�:"
+msgid "Device"
+msgstr "P�riph�rique"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Correction"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Assistant de configuration du Pare Feu"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Aucun - Pas de protection"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "Niveau de protection�:"
+msgid "Internet Network Device:"
+msgstr "P�riph�rique r�seau vers Internet�:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Assistant de configuration du Pare Feu"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Le pare-feu peut-�tre configur� pour offrir diff�rents niveaux de "
+"protection; choisissez le niveau qui correspond � vos besoins. Si vous ne "
+"savez pas, le niveau interm�diaire (Medium) est habituellement le plus "
+"appropri�."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "L'assistant a configur� avec succ�s votre serveur pare-feu."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "Interm�diaire - Web, ftp et ssh accessibles de l'ext�rieur"
+msgid "The device name is not correct"
+msgstr "Le nom de p�riph�rique est incorrect."
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "Niveau de protection"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Correction"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Sortir"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Assistant de configuration du Pare Feu"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "Le nom de p�riph�rique est incorrect."
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -576,93 +587,103 @@ msgstr ""
 "Le pare-feu a besoin de conna�tre comment votre serveur est connect� � "
 "Internet; choisissez le p�riph�rique utilis� pour la conexion externe."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr ""
-"Le pare-feu (firewall) prot�ge votre r�seau local des acc�s non-autoris�s en "
-"provenance d'Internet."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "Niveau de protection"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "Configuration du pare feu"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Quelque chose de terrible est survenu"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "P�riph�rique r�seau du pare feu"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Aucun - Pas de protection"
+msgid "The wizard successfully configured your server firewall."
+msgstr "L'assistant a configur� avec succ�s votre serveur pare-feu."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
+msgid "Configuring the Firewall"
+msgstr "Configuration du pare feu"
+
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Sortir"
+
+#: ../firewall_wizard/firewall.wiz_.c:24
+#, fuzzy
 msgid "This wizard will help you configuring your server firewall."
 msgstr "Cet assistant va vous aider � configurer votre pare feu."
 
-#: ../firewall_wizard/firewall.wiz_.c:23
+#: ../firewall_wizard/firewall.wiz_.c:25
 msgid "Low - Light filtering, standard services available"
 msgstr "Faible - L�ger filtrage, services standards ouverts"
 
-#: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "P�riph�rique r�seau du pare feu"
+#: ../firewall_wizard/firewall.wiz_.c:26
+msgid "Protection Level:"
+msgstr "Niveau de protection�:"
 
-#: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
-"L'assistant a rassembl� les param�tres suivants n�cessaires�pour configurer "
-"votre pare-feu:"
+"Cet assistant va vous aider � configurer les services FTP pour votre r�seau."
 
-#: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Le pare-feu peut-�tre configur� pour offrir diff�rents niveaux de "
-"protection; choisissez le niveau qui correspond � vos besoins. Si vous ne "
-"savez pas, le niveau interm�diaire (Medium) est habituellement le plus "
-"appropri�."
+#: ../ftp_wizard/ftp.wiz_.c:3
+#, fuzzy
+msgid "Public directory:"
+msgstr "R�pertoire:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-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/ftp.wiz_.c:4
+msgid "Internet FTP Server:"
+msgstr "Service FTP pour Internet�:"
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "Activer le service FTP pour le r�seau local"
 
 #: ../ftp_wizard/ftp.wiz_.c:7
-msgid "Internet FTP Server:"
-msgstr "Service FTP pour Internet�:"
+msgid "FTP wizard"
+msgstr "Assistant FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "Serveur FTP"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr "Ne cocher aucune case si vous ne voulez pas activer le serveur FTP."
+
+#: ../ftp_wizard/ftp.wiz_.c:12
+msgid "Configuring the FTP Server"
+msgstr "Configuration du service FTP"
+
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "Activer le serveur FTP pour l'internet"
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "Service FTP pour l'intranet�:"
+
+#: ../ftp_wizard/ftp.wiz_.c:15
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "L'assistant a configur� avec succ�s votre serveur FTP Intranet/Internet"
 
-#: ../ftp_wizard/ftp.wiz_.c:12
-#, fuzzy
-msgid "Public directory:"
-msgstr "R�pertoire:"
+#: ../ftp_wizard/ftp.wiz_.c:16
+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/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
 msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "Activer le service FTP pour le r�seau local"
-
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
@@ -670,60 +691,36 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants n�cessaires � la "
 "configuration de de votre serveur FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "Assistant FTP"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
 msgstr ""
-"Cet assistant va vous aider � configurer les services FTP pour votre r�seau."
-
-#: ../ftp_wizard/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "Activer le serveur FTP pour l'internet"
 
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "Service FTP pour l'intranet�:"
-
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "Assistant de configuration du FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "Configuration du service FTP"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Ne cocher aucune case si vous ne voulez pas activer le serveur FTP."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "Serveur FTP"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Nom du serveur de forums�:"
+msgid "Polling Interval:"
+msgstr "Fr�quence d'alimentation�:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "Assistant de configuration des forums (News)"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Fr�quence d'alimentation (heures)�:"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "Serveur de forums (News)"
+msgid "Polling Period"
+msgstr "Fr�quence d'alimentation"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -733,29 +730,32 @@ msgstr ""
 "(nouvelles) pour en recevoir les derni�res nouvelles d'Internet; la p�riode "
 "d'interrogation d�finit l'intervalle entre deux interrogations successives."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+"Cet assistant va vous aider � configurer les service de foruls (nouvelles) "
+"Internet pour votre r�seau."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "Assistant de Nouvelles"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "La fr�quence d'alimentation est incorrecte"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "Le nom du serveur est incorrect"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Fr�quence d'alimentation�:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Les noms d'h�tes Internet doivent �tre de la forme \\qh�te.domaine."
-"typedomaine\\q; par exemple, si votre fournisseur est \\qfournisseur.fr\\q, "
-"le serveur de forums (nouvelles) est souvent \\qnews.fournisseur.fr\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Fr�quence d'alimentation"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Configuration du serveur de forums"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -763,15 +763,7 @@ msgstr ""
 "En fonction de votre type de connexion Internet, une fr�quence appropri�e "
 "d'interrogation varie de 6 � 24 heures."
 
-#: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "La fr�quence d'alimentation est incorrecte"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "Serveur de forums�:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -780,7 +772,14 @@ msgstr ""
 "(nouvelles) Internet � votre r�seau; ce nom est habituellement donn� par "
 "votre fournisseur d'acc�s."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr ""
+"L'assistant a configur� avec succ�s les services de forums (nouvelles) "
+"Internet de votre serveur."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -788,32 +787,64 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants n�cessaires pour configurer "
 "votre Service de Forums (Nouvelles) Internet:"
 
-#: ../news_wizard/news.wiz_.c:22
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Fr�quence d'alimentation (heures)�:"
+
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Nom du serveur de forums�:"
+
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Cet assistant va vous aider � configurer les service de foruls (nouvelles) "
-"Internet pour votre r�seau."
+"Les noms d'h�tes Internet doivent �tre de la forme \\qh�te.domaine."
+"typedomaine\\q; par exemple, si votre fournisseur est \\qfournisseur.fr\\q, "
+"le serveur de forums (nouvelles) est souvent \\qnews.fournisseur.fr\\q."
 
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Configuration du serveur de forums"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "Assistant de configuration des forums (News)"
 
 #: ../news_wizard/news.wiz_.c:24
+msgid "News Server"
+msgstr "Serveur de forums (News)"
+
+#: ../news_wizard/news.wiz_.c:25
+msgid "News Server:"
+msgstr "Serveur de forums�:"
+
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "R�seau autoris�:"
+
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Contr�le d'acc�s"
+
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
-"The wizard successfully configured your Internet News service of your server."
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr ""
-"L'assistant a configur� avec succ�s les services de forums (nouvelles) "
-"Internet de votre serveur."
+"L'acc�s va �tre autoris� pour les machines du r�seau. Voici les informations "
+"trouv�es sur votre r�seau actuel, vous pouvez les modifier si n�cessaire."
 
-#: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "Assistant de Nouvelles"
+#: ../nfs_wizard/nfs.wiz_.c:4
+#, fuzzy
+msgid "Access :"
+msgstr "Contr�le d'acc�s"
+
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
+msgstr "R�seau Local - acc�s pour les machines locales (recommand�)"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
 msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
+"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 ""
@@ -821,113 +852,125 @@ msgstr ""
 "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�."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
+msgstr ""
+"L'assistant a rassembl� les param�tres suivants n�cessaires � la "
+"configuration de Samba."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "Assistant de configuration du serveur NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "Assistant de configuration NFS"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
+msgstr "Ouvrir l'acc�s au r�seau local"
+
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "Serveur NFS"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "L'assistant a configur� avec succ�s votre serveur NFS."
-
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "Tous - Pas de restriction d'acc�s"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
-msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+#: ../nfs_wizard/nfs.wiz_.c:18
+msgid "Netmask :"
 msgstr ""
-"L'acc�s va �tre autoris� pour les machines du r�seau. Voici les informations "
-"trouv�es sur votre r�seau actuel, vous pouvez les modifier si n�cessaire."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Contr�le d'acc�s"
+#: ../nfs_wizard/nfs.wiz_.c:19
+msgid "Directory:"
+msgstr "R�pertoire:"
 
-#: ../nfs_wizard/nfs.wiz_.c:11
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 msgid "This wizard will help you configuring the NFS Server for your network."
 msgstr ""
 "Cet assistant va vous aider � configurer les services NFS pour votre r�seau."
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
-msgstr "R�seau Local - acc�s pour les machines locales (recommand�)"
-
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "R�seau autoris�:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
-msgstr "Ouvrir l'acc�s au r�seau local"
+#: ../nfs_wizard/nfs.wiz_.c:21
+msgid "The wizard successfully configured your NFS Server"
+msgstr "L'assistant a configur� avec succ�s votre serveur NFS."
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:2
 #, fuzzy
-msgid "The wizard collected the following parameters."
+msgid "There seems to be a problem..."
 msgstr ""
-"L'assistant a rassembl� les param�tres suivants n�cessaires � la "
-"configuration de Samba."
+"Il y a un probl�me... Allez demander de l'aide au gars habill� tout en "
+"noir..."
 
-#: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "Contr�le d'acc�s"
+#: ../postfix_wizard/postfix.wiz_.c:3
+msgid "Internet Mail Gateway"
+msgstr "Passerelle Internet"
 
-#: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr "R�pertoire:"
+#: ../postfix_wizard/postfix.wiz_.c:5
+msgid "Outgoing Mail Address"
+msgstr "Format des messages sortants"
 
-#: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "Assistant de configuration NFS"
+#: ../postfix_wizard/postfix.wiz_.c:6
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr ""
+"L'assistant a configur� avec succ�s les services de messagerie Internet pour "
+"votre r�seau."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "Activation"
 
-#: ../postfix_wizard/postfix.wiz_.c:3
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
+"This should be chosen consistently with the address you use for incoming "
+"mail."
 msgstr ""
-"Vous pouvez s�lectionner le format d'adresse que les messages sortants vont "
-"avoir dans les champs ��From:�� et ��Reply-to��."
+"Ce choix doit �tre coh�rent avec l'adresse que vous utilisez pour recevoir "
+"le courrier entrant."
 
-#: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "Configuration de la messagerie Internet"
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:11
+msgid "You entered an empty address for the mail gateway."
+msgstr "Vous avez saisi une adresse vide pour la passerelle. Vous risquez de"
+
+#: ../postfix_wizard/postfix.wiz_.c:12
+msgid "Internet Mail Configuration Wizard"
+msgstr "Assistant de configuration de la messagerie"
+
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Assistant Postfix"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Passerelle pour la messagerie�:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"Votre serveur va envoyer tous les messages sortants vers une passerelle, qui "
-"s'occupera de la livraison finale."
+"Votre choix peut �tre accept�, mais cela ne vous permettra pas d'envoyer un "
+"courrier hors de votre r�seau local. Cliquez sur Suivant pour continuer, ou "
+"Pr�c�dent pour modifier."
 
-#: ../postfix_wizard/postfix.wiz_.c:8
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
@@ -935,29 +978,15 @@ msgstr ""
 "Cet assistant va vous aider � configurer le service de Courrier Internet "
 "pour votre r�seau."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Format des messages sortants"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr ""
-"Ce choix doit �tre coh�rent avec l'adresse que vous utilisez pour recevoir "
-"le courrier entrant."
-
-#: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
 msgstr ""
-"Il y a un probl�me... Allez demander de l'aide au gars habill� tout en "
-"noir..."
-
-#: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "Masquage d'adresse incorrect�!"
+"Votre serveur va envoyer tous les messages sortants vers une passerelle, qui "
+"s'occupera de la livraison finale."
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -965,11 +994,7 @@ msgstr ""
 "Si vous choisissez de configurer maintenant, vous irez automatiquement sur "
 "la configuration POSTFIX"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Forme de l'adresse�:"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -979,11 +1004,19 @@ msgstr ""
 "typedomaine\\q; par exemple, si votre fournisseur est \\qfournisseur.fr\\q, "
 "le serveur de courrier est souvent \\qsmtp.fournisseur.fr\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Assistant de configuration de la messagerie"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Vous pouvez s�lectionner le format d'adresse que les messages sortants vont "
+"avoir dans les champs ��From:�� et ��Reply-to��."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "Configuration de la messagerie Internet"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -991,74 +1024,58 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
 "votre Service de Courrier Internet:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
-msgid "Mail Address:"
+#: ../postfix_wizard/postfix.wiz_.c:26
+msgid "Masquerade not good!"
+msgstr "Masquage d'adresse incorrect�!"
+
+#: ../postfix_wizard/postfix.wiz_.c:28
+msgid "Form of the Address"
 msgstr "Forme de l'adresse�:"
 
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Vous avez saisi une adresse vide pour la passerelle. Vous risquez de"
+#: ../postfix_wizard/postfix.wiz_.c:29
+msgid "Mail Address:"
+msgstr "Forme de l'adresse�:"
 
-#: ../postfix_wizard/postfix.wiz_.c:22
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"L'assistant a configur� avec succ�s les services de messagerie Internet pour "
-"votre r�seau."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Passerelle Internet"
-
-#: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Passerelle pour la messagerie�:"
+"Si vous choisissez de configurer maintenant, vous continuerez "
+"automatiquement par la configuration du proxy."
 
-#: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"Votre choix peut �tre accept�, mais cela ne vous permettra pas d'envoyer un "
-"courrier hors de votre r�seau local. Cliquez sur Suivant pour continuer, ou "
-"Pr�c�dent pour modifier."
+#: ../proxy_wizard/proxy.wiz_.c:4
+msgid "Proxy Configuration Wizard"
+msgstr "Assistant de configuration du proxy"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../proxy_wizard/proxy.wiz_.c:8
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "Vous devez choisir un num�ro de port entre 1024 et 65535."
 
-#: ../proxy_wizard/proxy.wiz_.c:2
-msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
-msgstr ""
-"Le Cache M�moire est la quantit� affect�e aux op�rations de cache en m�moire "
-"du proxy (remarque�: la m�moire totale utilis�e par le processus squid est "
-"plus �l�v�e)"
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "L'assistant doit �tre lanc� par root (=l'administrateur)"
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Port du proxy�:"
+#: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Contr�le d'acc�s"
 
-#: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr ""
-"L'assistant a configur� avec succ�s le service proxy Squid de votre serveur."
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "Configuration du proxy"
 
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr ""
-"Vous avez entr� un num�ro de port qui peut �tre utilis� pour ce service�:"
+#: ../proxy_wizard/proxy.wiz_.c:13
+msgid "Define an upper level proxy"
+msgstr "D�finir un cache de niveau sup�rieur"
 
-#: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Hi�rarchie des caches"
+# note of the french translator:
+# I suppose it need's to be displayed with fixed space font.
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "SystemFichier         Taill Util Dispo %uti Mont� sur"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -1066,248 +1083,221 @@ msgstr ""
 "Squid est un serveur proxy (cache de pages web), il permet d'acc�lerer "
 "l'acc�s au web pour votre r�seau local."
 
-#: ../proxy_wizard/proxy.wiz_.c:10
-msgid "Define an upper level proxy"
-msgstr "D�finir un cache de niveau sup�rieur"
-
-#: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Cache Disque (Mo)�:"
-
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "Nom du proxy sup�rieur�:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Cet assistant va vous aider � configurer votre proxy."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Port du proxy sup�rieur�:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Pour information, voici l'espace disponible dans /var/spool/squid�:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "Le Cache Disque est l'espace utilisable par le proxy sur le disque dur."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "Configuration du proxy"
+msgid "Proxy Port"
+msgstr "Port du proxy"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"La valeur ��port du proxy�� configure sur quel port le proxy va attendre les "
-"requ�tes http. La valeur par d�faut est 3128, une autre valeur courante est "
-"8080, le num�ro de port doit �tre sup�rieur � 1024."
+"Vous pouvez utiliser soit un format num�rique comme "
+"��192.168.1.0/255.255.255.0�� ou un format texte comme ��.domaine.net��"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Assistant Squid"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Port�:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"Cliquez sur Suivant pour conserver cette valeur, ou Pr�c�dent pour modifier "
+"votre choix."
 
-# note of the french translator:
-# I suppose it need's to be displayed with fixed space font.
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "SystemFichier         Taill Util Dispo %uti Mont� sur"
-
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "L'assistant doit �tre lanc� par root (=l'administrateur)"
-
-#: ../proxy_wizard/proxy.wiz_.c:26
-msgid ""
-"You can safely select \\qNo upper level proxy\\q if you don't need this "
-"feature."
+msgid "You have entered a port that may be useful for this service:"
 msgstr ""
-"Vous pouvez choisir l'option ��Pas de cache de niveau sup�rieur�� si vous "
-"n'avez pas besoin de cette fonctionnalit�"
+"Vous avez entr� un num�ro de port qui peut �tre utilis� pour ce service�:"
 
 #: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Cache M�moire (Mo)�:"
+msgid "/etc/services:"
+msgstr "/etc/services:"
 
 #: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Contr�le d'acc�s"
+msgid "Cache hierarchy"
+msgstr "Hi�rarchie des caches"
 
 #: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"You can safely select \\qNo upper level proxy\\q if you don't need this "
+"feature."
 msgstr ""
-"Si vous choisissez de configurer maintenant, vous continuerez "
-"automatiquement par la configuration du proxy."
+"Vous pouvez choisir l'option ��Pas de cache de niveau sup�rieur�� si vous "
+"n'avez pas besoin de cette fonctionnalit�"
 
 #: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Port du proxy"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Cliquez sur Pr�c�dent pour modifier la valeur."
+msgid "Port:"
+msgstr "Port�:"
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Entrez le nom complet (format�: ��cache.domaine.net��) et le port du serveur "
+"En option, Squid peut �tre configur� en ��cascade de proxy��. Vous pouvez "
+"ajouter un nouveau niveau de cache en sp�cifiant le hostname et le port du "
 "proxy � utiliser."
 
 #: ../proxy_wizard/proxy.wiz_.c:34
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr ""
+"L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
+"votre proxy:"
+
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Cache M�moire (Mo)�:"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Pas de cache de niveau sup�rieur (recommand�)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Vous devez choisir un num�ro de port entre 1024 et 65535."
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Taille du cache du proxy"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Cliquez sur Pr�c�dent pour modifier la valeur."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Cliquez sur Suivant pour conserver cette valeur, ou Pr�c�dent pour modifier "
-"votre choix."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Localhost - acc�s uniquement pour cet ordinateur"
+"La valeur ��port du proxy�� configure sur quel port le proxy va attendre les "
+"requ�tes http. La valeur par d�faut est 3128, une autre valeur courante est "
+"8080, le num�ro de port doit �tre sup�rieur � 1024."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Vous pouvez utiliser soit un format num�rique comme "
-"��192.168.1.0/255.255.255.0�� ou un format texte comme ��.domaine.net��"
+msgid "Squid wizard"
+msgstr "Assistant Squid"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Assistant de configuration du proxy"
+msgid "Proxy port:"
+msgstr "Port du proxy�:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Cache Disque (Mo)�:"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "Nom du proxy sup�rieur�:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Localhost - acc�s uniquement pour cet ordinateur"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"En option, Squid peut �tre configur� en ��cascade de proxy��. Vous pouvez "
-"ajouter un nouveau niveau de cache en sp�cifiant le hostname et le port du "
-"proxy � utiliser."
+"Le Cache M�moire est la quantit� affect�e aux op�rations de cache en m�moire "
+"du proxy (remarque�: la m�moire totale utilis�e par le processus squid est "
+"plus �l�v�e)"
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"L'assistant a rassembl� les param�tres suivants�n�cessaires pour configurer "
-"votre proxy:"
+"Entrez le nom complet (format�: ��cache.domaine.net��) et le port du serveur "
+"proxy � utiliser."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 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."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Port du proxy sup�rieur�:"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Cet assistant va vous aider � configurer votre proxy."
-
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Pour information, voici l'espace disponible dans /var/spool/squid�:"
-
-#: ../samba_wizard/samba.wiz_.c:1
-#, fuzzy
-msgid "Enable file sharing area"
-msgstr "Activer le partage de fichiers public /home/samba/public"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
 msgstr ""
+"L'assistant a configur� avec succ�s le service proxy Squid de votre serveur."
 
 #: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr ""
+msgid "Home:"
+msgstr "r�pertoires personnels�:"
+
+#: ../samba_wizard/samba.wiz_.c:4
+#, fuzzy
+msgid "Enable all printer"
+msgstr "Services Samba actifs"
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Groupe de travail�:"
+#, fuzzy
+msgid "Make home directories available for their owners"
+msgstr "Permettre l'acc�s aux r�pertoires personnels � leurs propri�taires."
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr ""
-"Si vous choisissez de configurer maintenant, vous continuerez "
-"automatiquement avec la configuration de Samba"
+msgid "Configuring Samba"
+msgstr "Configuration de Samba"
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "La banni�re du serveur est incorrecte"
-
 #: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba a besoin de conna�tre le groupe de travail Windows desservi."
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
-"Cet assistant va vous aider � configurer le service Samba sur votre serveur."
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Services Samba actifs"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+"Samba peut fournir un espace public d'�change de fichiers pour les clients "
+"Windows de votre r�seau, ainsi que le partage des imprimantes connect�es � "
+"votre serveur."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
+msgid "The wizard successfully configured your Samba server."
 msgstr ""
+"L'assistant a configur� avec succ�s le service Samba sur votre serveur."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
-"L'assistant a rassembl� les param�tres suivants n�cessaires � la "
-"configuration de Samba."
+msgid "Server Banner."
+msgstr "Banni�re du serveur Samba."
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Banni�re�:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Partage d'imprimante�:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Groupe de travail"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Groupe de travail�:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"La banni�re est la description du serveur fournie aux clients samba du "
-"r�seau."
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Partage de fichiers�:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1316,12 +1306,26 @@ msgstr ""
 "utilisateurs via samba mais vous\n"
 "devrez utiliser smbpasswd pour enregister un mot de passe samba."
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "Services Samba actifs"
+msgid "Printers:"
+msgstr "Partage d'imprimante�:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "La banni�re du serveur est incorrecte"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Configuration du partage de fichiers"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1329,282 +1333,257 @@ msgstr ""
 "Samba permet au serveur d'agir comme serveur de fichier et d'impression pour "
 "des postes clients n'utilisant pas Linux."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
+#: ../samba_wizard/samba.wiz_.c:28
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:28
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "Configuration de Samba"
+"Cet assistant va vous aider � configurer le service Samba sur votre serveur."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr "Banni�re du serveur�:"
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
-msgstr "Banni�re du serveur Samba."
+msgid "Enabled Samba Services"
+msgstr "Services Samba actifs"
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "Activer le partage d'imprimantes"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "Le groupe de travail est incorrect"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Si vous choisissez de configurer maintenant, vous continuerez "
+"automatiquement avec la configuration de Samba"
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
+"L'assistant a rassembl� les param�tres suivants n�cessaires � la "
+"configuration de Samba."
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "Contr�le d'acc�s"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"La banni�re est la description du serveur fournie aux clients samba du "
+"r�seau."
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
 msgstr ""
-"Samba peut fournir un espace public d'�change de fichiers pour les clients "
-"Windows de votre r�seau, ainsi que le partage des imprimantes connect�es � "
-"votre serveur."
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Banni�re�:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr ""
-"L'assistant a configur� avec succ�s le service Samba sur votre serveur."
+msgid "The Workgroup is wrong"
+msgstr "Le groupe de travail est incorrect"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba a besoin de conna�tre le groupe de travail Windows desservi."
+msgid "Samba wizard"
+msgstr "Assistant Samba"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Banni�re du serveur�:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "Contr�le d'acc�s"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Partage d'imprimante�:"
+msgid "Workgroup"
+msgstr "Groupe de travail"
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Assistant Samba"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Configuration du partage de fichiers"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "Make home directories available for their owners"
-msgstr "Permettre l'acc�s aux r�pertoires personnels � leurs propri�taires."
+msgid "Access control"
+msgstr "Contr�le d'acc�s"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Activer le partage d'imprimantes"
-
-#: ../samba_wizard/samba.wiz_.c:56
+#: ../samba_wizard/samba.wiz_.c:53
 #, fuzzy
-msgid "Printers:"
-msgstr "Partage d'imprimante�:"
+msgid "Enable file sharing area"
+msgstr "Activer le partage de fichiers public /home/samba/public"
 
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "r�pertoires personnels�:"
+#: ../samba_wizard/samba.wiz_.c:56
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr ""
+msgid "File Sharing:"
+msgstr "Partage de fichiers�:"
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
-msgstr ""
-"Choisissez le p�riph�rique r�seau (habituellement une carte) que le serveur "
-"doit utiliser pour se connecter � votre r�seau. C'est le p�riph�rique pour "
-"le r�seau local, probablement pas le m�me que celui utilis� pour l'acc�s "
-"Internet."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "L'adresse IP du serveur est incorrecte"
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "Cet assistant va configurer les services r�seau du serveur."
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "P�riph�rique passerelle�:"
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Assistant Serveur"
-
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
-"L'adresse r�seau est une liste de 4 nombres inf�rieurs � 256, s�par�s par "
-"des points; Le dernier nombre de la liste doit �tre z�ro."
+msgid "Host Name:"
+msgstr "Host Name�:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "P�riph�rique r�seau"
+msgid "Basic Network Configuration Wizard"
+msgstr "Assistant de configuration de base du serveur"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "L'adresse r�seau est incorrecte"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Il est tr�s probable que les noms de domaine et adresses IP pour ce r�seau "
-"soient DIFFERENTS de ceux de la connexion ��externe�� du serveur."
+msgid "Server IP address:"
+msgstr "Adresse IP du serveur�:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Adresse du r�seau"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "Il est recommand� de ne pas lancer d'autres applications en m�me temps. A la "
 "fin de l'assistant, vous devrez quitter votre session et vous reconnecter "
 "(login)."
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
+"The wizard successfully configured the basic networking services of your "
+"server."
 msgstr ""
-"Voici votre valeur actuelle pour la passerelle externe (valeur sp�cifi�e "
-"pendant l'installation initiale). Le p�riph�rique (carte r�seau ou modem) "
-"doit �tre diff�rent de celui utilis� pour votre r�seau local."
+"L'assistant a configur� avec succ�s les services r�seau de base de votre "
+"serveur"
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:14
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"(you can change here these values if you know exactly what you're doing)"
 msgstr ""
-"Du point de vue de ces assistants, votre ordinateur est vu comme un serveur "
-"administrant son propre r�seau local (de classe C)."
-
-#: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "P�riph�rique�:"
+"(vous pouvez changer ces valeurs si vous savez exactement ce que vous faites)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Attention"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"L'adresse r�seau est un nombre identifiant votre r�seau; la valeur propos�e "
+"est destin�e � une configuration sans acc�s Internet (ou alors � travers un "
+"masque IP) ; � moins que vous ne sachiez ce que vous fa�tes, prenez la "
+"valeur par d�faut."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Cette page calcule le nom de domaine; elle do�t �tre invisible."
+msgid "Note about networking"
+msgstr "Remarque au sujet du r�seau"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Adresse du serveur�:"
+msgid "Server Address"
+msgstr "Adresse du serveur"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Nom de domaine d�duit"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"L'adresse r�seau est une liste de 4 nombres inf�rieurs � 256, s�par�s par "
+"des points; Le dernier nombre de la liste doit �tre z�ro."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "Nom du serveur (host name)"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Note�: l'adresse IP de la passerelle ne doit pas �tre vide si vous voulez "
+"acc�der au monde ext�rieur."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr ""
-"Cette page calcule l'adresse du serveur par d�faut et doit rester invisible."
+msgid "The Server IP address is incorrect"
+msgstr "L'adresse IP du serveur est incorrecte"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Assistant de configuration de base du serveur"
+msgid "Configuring your network"
+msgstr "Configuration de votre r�seau"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "Adresse IP passerelle�:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "Le nom du serveur (host name) est incorrect"
+msgid "This page computes the default server address; it should be invisible."
+msgstr ""
+"Cette page calcule l'adresse du serveur par d�faut et doit rester invisible."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"Le host name doit �tre de la forme ��host.domaine.domaintype��; Si votre "
-"serveur doit �tre visible depuis Internet, le domaine doit �tre le nom de  "
-"domaine enregistr� chez votre fournisseur d'acc�s. Si vous ne voulez  qu'un "
-"serveur Intranet, tout nom valide convient, comme ��societe.net��"
+msgid "IP net address:"
+msgstr "Adresse IP du r�seau�:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Passerelle externe"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"L'adresse r�seau est un nombre identifiant votre r�seau; la valeur propos�e "
-"est destin�e � une configuration sans acc�s Internet (ou alors � travers un "
-"masque IP) ; � moins que vous ne sachiez ce que vous fa�tes, prenez la "
-"valeur par d�faut."
+msgid "Server Wizard"
+msgstr "Assistant Serveur"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
-"Cet assistant va vous aider � configurer les services r�seau de base de "
-"votre serveur"
+"Il est tr�s probable que les noms de domaine et adresses IP pour ce r�seau "
+"soient DIFFERENTS de ceux de la connexion ��externe�� du serveur."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "Cet assistant va configurer les services r�seau du serveur."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Remarque au sujet du r�seau"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Note�: l'adresse IP de la passerelle ne doit pas �tre vide si vous voulez "
-"acc�der au monde ext�rieur."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Erreur de l'assistant."
+"Choisissez le p�riph�rique r�seau (habituellement une carte) que le serveur "
+"doit utiliser pour se connecter � votre r�seau. C'est le p�riph�rique pour "
+"le r�seau local, probablement pas le m�me que celui utilis� pour l'acc�s "
+"Internet."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1612,19 +1591,41 @@ msgstr ""
 "Les p�riph�riques sont list�s avec leur nom Linux, et si disponible, avec la "
 "description du p�riph�rique"
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Adresse r�seau�:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Voici votre valeur actuelle pour la passerelle externe (valeur sp�cifi�e "
+"pendant l'installation initiale). Le p�riph�rique (carte r�seau ou modem) "
+"doit �tre diff�rent de celui utilis� pour votre r�seau local."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "Configuration de votre r�seau"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr ""
+"Cet assistant va vous aider � configurer les services r�seau de base de "
+"votre serveur"
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "Adresse IP passerelle�:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"L'adresse du serveur IP est un nombre identifiant votre serveur sur le "
+"r�seau; la valeur propos�e est destin�e � un r�seau local, sans connexion "
+"internet ou alors avec masque IP (masquerading) ; � moins que vous ne "
+"sachiez ce que vous fa�tes, prenez la valeur par d�faut."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "Le nom du serveur (host name) est incorrect"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1634,11 +1635,27 @@ msgstr ""
 "postes de travail dans votre r�seau et �ventuellement sur Internet (selon "
 "votre configuration)."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "Host Name�:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Erreur de l'assistant."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "P�riph�rique r�seau"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "Nom de domaine d�duit"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Cette page calcule le nom de domaine; elle do�t �tre invisible."
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "P�riph�rique passerelle�:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
@@ -1646,403 +1663,399 @@ msgstr ""
 "L'assistant a rassembl� les param�tres suivants n�cessaires pour configurer "
 "votre r�seau�:"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"La connexion externe est un r�seau sur lequel l'ordinateur est client "
-"(Internet ou r�seau sup�rieur), connect� gr�ce � une carte r�seau ou un "
-"modem."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Attention"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr ""
-"(vous pouvez changer ces valeurs si vous savez exactement ce que vous faites)"
+msgid "Device:"
+msgstr "P�riph�rique�:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"L'adresse du serveur IP est un nombre identifiant votre serveur sur le "
-"r�seau; la valeur propos�e est destin�e � un r�seau local, sans connexion "
-"internet ou alors avec masque IP (masquerading) ; � moins que vous ne "
-"sachiez ce que vous fa�tes, prenez la valeur par d�faut."
+"Du point de vue de ces assistants, votre ordinateur est vu comme un serveur "
+"administrant son propre r�seau local (de classe C)."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Nom du serveur�:"
+msgid "Server Address:"
+msgstr "Adresse du serveur�:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "L'adresse r�seau est incorrecte"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"La connexion externe est un r�seau sur lequel l'ordinateur est client "
+"(Internet ou r�seau sup�rieur), connect� gr�ce � une carte r�seau ou un "
+"modem."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Adresse du serveur"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
 msgstr ""
-"L'assistant a configur� avec succ�s les services r�seau de base de votre "
-"serveur"
+"Le host name doit �tre de la forme ��host.domaine.domaintype��; Si votre "
+"serveur doit �tre visible depuis Internet, le domaine doit �tre le nom de  "
+"domaine enregistr� chez votre fournisseur d'acc�s. Si vous ne voulez  qu'un "
+"serveur Intranet, tout nom valide convient, comme ��societe.net��"
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "P�riph�rique r�seau"
+msgid "Host Name"
+msgstr "Nom du serveur (host name)"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "Adresse IP du r�seau�:"
+msgid "Network Address:"
+msgstr "Adresse r�seau�:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Adresse du r�seau"
+msgid "Network Device"
+msgstr "P�riph�rique r�seau"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "Adresse IP du serveur�:"
+msgid "Server Name:"
+msgstr "Nom du serveur�:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "University of Adelaide, South Australia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Universit� Paris Sud, France"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Cliquez sur ��Suivant�� pour demarrer le test du serveur de temps."
+msgid "University of Manchester, Manchester, England"
+msgstr "University of Manchester, Manchester, England"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Serveur d'heure"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Universit� de Limoges, France"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Serveur d'heure (secondaire)�:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr "Votre serveur sera le serveur d'heure pour votre r�seau."
+msgid "Press next to start the time servers test."
+msgstr "Cliquez sur ��Suivant�� pour demarrer le test du serveur de temps."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
-"votre serveur peut maintenant agir comme un serveur d'heure  pour votre "
-"r�seau local."
+"Vous pouvez tester de nouveau le serveur de temps ou sauver la configuration "
+"sans mettre a jour l'heure actuellement."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(choisissez un server de votre zone geographique, svp)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylor College of Medicine, Houston, Tx"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "University of Oklahoma, Norman, Oklahoma, USA"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Choisissez un fuseau horaire:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "University of Regina, Regina, Saskatchewan, Canada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr ""
-"Cliquez sur Suivant pour commencer, ou Annuler pour quitter l'assistant."
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Trinity College, Dublin, Ireland"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, France"
+msgid "Singapore"
+msgstr "Singapour"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Universit� de Limoges, France"
+msgid "Secondary Time Server:"
+msgstr "Serveur d'heure (secondaire)�:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
+msgstr "Reessayer"
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
-msgstr "Selectionnez un serveur primaire et secondaire parmis la liste."
+msgid "The Chinese University of Hong Kong"
+msgstr "Universit� Chinoise de Hong Kong"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(choisissez un server de votre zone geographique, svp)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV College of Engineering, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, France"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante/SPAIN)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "National Research Council of Canada, Ottawa, Ontario, Canada"
 
+#: ../time_wizard/time.wiz_.c:18
+msgid "Select a primary and secondary server from the list."
+msgstr "Selectionnez un serveur primaire et secondaire parmis la liste."
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "University of Manchester, Manchester, England"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, France"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- pas de r�seau ext�rieur"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Inc., Seoul, Korea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Si le serveur de temps n'est pas pas immediatement disponible (probleme "
-"reseau ou autre) vous devrez peut etre attendre jusqu'a 30 secondes."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Scientific Center in Chernogolovka, Moscow region, Russia"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Test de la disponibilite du serveur de temps."
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washington State University Tri-Cities, Richland, Wa"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "University of Oslo, Norway"
+msgid "University of Adelaide, South Australia"
+msgstr "University of Adelaide, South Australia"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "Computer Science Department, University of Wisconsin-Madison"
+msgid "Time zone:"
+msgstr "Fuseau horaire:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Trinity College, Dublin, Ireland"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Les serveurs de temps ne repondent pas, cela peut etre du a:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "University of Regina, Regina, Saskatchewan, Canada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Universit� de Caen, France"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Les serveurs de temps ne repondent pas, cela peut etre du a:"
+msgid "- other reasons..."
+msgstr "- Autres raisons..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Swiss Fed. Inst. of Technology"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Si le serveur de temps n'est pas pas immediatement disponible (probleme "
+"reseau ou autre) vous devrez peut etre attendre jusqu'a 30 secondes."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Universit� de Caen, France"
+msgid "WARNING"
+msgstr "ATTENTION"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, France"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, France"
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
-"Ce wizard vous aidera � configurer l'heure de votre serveur, soit localement "
-"soit en synchronisation avec un serveur externe."
+"votre serveur peut maintenant agir comme un serveur d'heure  pour votre "
+"r�seau local."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "ATTENTION"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Fukuoka university, Fukuoka, Japan"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Inc., Seoul, Korea"
+msgid "Time Servers"
+msgstr "Serveur d'heure"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "University of Oklahoma, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Swiss Fed. Inst. of Technology"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "Universit� Chinoise de Hong Kong"
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Ce wizard vous aidera � configurer l'heure de votre serveur, soit localement "
+"soit en synchronisation avec un serveur externe."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- Autres raisons..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, France"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- Serveur de temps inexistant"
+msgid "Testing the time servers availability"
+msgstr "Test de la disponibilite du serveur de temps."
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Fuseau horaire:"
+msgid "Save config without test"
+msgstr "Sauver sans tester"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Vous pouvez tester de nouveau le serveur de temps ou sauver la configuration "
-"sans mettre a jour l'heure actuellement."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT Information Systems, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Serveur d'heure (primaire) :"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylor College of Medicine, Houston, Tx"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Reessayer"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn State University, University Park, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
+msgstr "- Serveur de temps inexistant"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Configuration du serveur d'heure sauv�e"
+msgid "Time wizard"
+msgstr "Assistant de date/heure"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Universit� Paris Sud, France"
+msgid "University of Oslo, Norway"
+msgstr "University of Oslo, Norway"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr "Votre serveur sera le serveur d'heure pour votre r�seau."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Sauver sans tester"
+msgid "- no outside network"
+msgstr "- pas de r�seau ext�rieur"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapour"
+msgid "Primary Time Server:"
+msgstr "Serveur d'heure (primaire) :"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Fukuoka university, Fukuoka, Japan"
+msgid "Time server configuration saved"
+msgstr "Configuration du serveur d'heure sauv�e"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr ""
+"Cliquez sur Suivant pour commencer, ou Annuler pour quitter l'assistant."
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante/SPAIN)"
+msgid "Choose a time zone:"
+msgstr "Choisissez un fuseau horaire:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Assistant de date/heure"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr ""
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr "Computer Science Department, University of Wisconsin-Madison"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-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."
+msgid ""
+"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/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr ""
-"L'assistant a configur� avec succ�s le serviceWeb intranet/Internet sur "
-"votre serveur."
+#, fuzzy
+msgid "Internet web server:"
+msgstr "Serveur Internet�:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
-"L'assistant a rassembl� les param�tres suivants n�cessaires pour la "
-"configuration du serveur web�:"
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Assistant Web"
-
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
 msgstr ""
-"Cet assistant va vous aider � configurer un serveur Web pour votre r�seau."
+
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Activer le serveur Web pour l'intranet"
 
 #: ../web_wizard/web.wiz_.c:12
-#, fuzzy
-msgid "Internet web server:"
-msgstr "Serveur Internet�:"
+msgid "Configuring the Web Server"
+msgstr "Configuration du serveur Web"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Activer le serveur Web pour l'intranet"
+msgid "Web Server"
+msgstr "Serveur Web"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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/web.wiz_.c:15
 #, fuzzy
 msgid "Enable the Web Server for the Internet"
 msgstr "Activer le serveur Web pour l'intranet"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "R�pertoire:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "S�lectionnez le type de service Web que vous souhaitez activer"
+#, fuzzy
+msgid "This wizard will help you configuring the Web Server for your network."
+msgstr ""
+"Cet assistant va vous aider � configurer un serveur Web pour votre r�seau."
 
 #: ../web_wizard/web.wiz_.c:17
-msgid "document root:"
-msgstr ""
+msgid "Web wizard"
+msgstr "Assistant Web"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Serveur intranet�:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "Configuration du serveur Web"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Serveur Web"
+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/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Assistant de configuration du serveur Web"
+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/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr ""
+"L'assistant a rassembl� les param�tres suivants n�cessaires pour la "
+"configuration du serveur web�:"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr ""
+"L'assistant a configur� avec succ�s le serviceWeb intranet/Internet sur "
+"votre serveur."
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr ""
+msgid "Web Server Configuration Wizard"
+msgstr "Assistant de configuration du serveur Web"
 
 msgid "Cancel"
 msgstr "Annuler"
diff --git a/po/hu.po b/po/hu.po
index 94419b37..ef25e593 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.2\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-09-22 14:29+0200\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\n"
@@ -18,202 +18,203 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"A helyi h�l�zat kliensg�pei olyan sz�m�t�g�pek, amelyek a h�l�zatra vannak "
-"k�tve, tov�bb� saj�t n�vvel �s IP-c�mmel rendelkeznek."
+"A param�terek be�ll�t�s�hoz nyomja le a \"K�vetkez�\" gombot; a var�zsl�b�l "
+"val� kil�p�shez a \"M�gsem\" gombot."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "�rv�nytelen c�m. A folytat�shoz nyomja le a \"K�vetkez�\" gombot."
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "OK"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
 msgstr ""
-"A m�r l�tez� �rt�k m�dos�t�s�hoz nyomja le a \"K�vetkez�\" gombot; "
-"jav�t�shoz a \"Vissza\" gombot."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Gratul�lunk"
+"Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
+"k�vet�en a kliensbe�ll�t�s fog k�vetkezni."
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "DNS-kliens-var�zsl�"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr ""
+"Ind�t�shoz nyomja le a \"K�vetkez�\" gombot; a var�zsl�b�l val� kil�p�shez a "
+"\"M�gsem\" gombot."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"A kliens a h�l�zaton n�v alapj�n lesz azonos�tva, p�ld�ul: kliensn�v.c�gn�v."
+"net. A h�l�zat �sszes g�p�nek rendelkezni kell egy egyedi IP-c�mmel - a "
+"megszokott pontoz�sos form�tumban."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr ""
 "A var�zsl� a k�vetkez�, egy kliensnek a h�l�zatba val� felv�tel�hez "
 "sz�ks�ges param�tereket gy�jt�tte �ssze:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Rendszerhiba; a be�ll�t�s nem t�rt�nt meg"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "A kliens neve"
+msgid "The wizard successfully added the client."
+msgstr "A var�zsl� sikeresen felvette a klienst."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Kliens felv�tele a h�l�zatba"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(a tartom�nynevet nem sz�ks�ges megadni a n�v ut�n)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Be�ll�t�s"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr ""
+"A megadott IP-c�mnek �s kliensn�vnek egyedinek kell lenni a h�l�zaton bel�l."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "A kliens azonos�t�sa:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Figyelmeztet�s:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(a tartom�nynevet nem sz�ks�ges megadni a n�v ut�n)"
+msgid "Name of the machine:"
+msgstr "A g�p neve:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr ""
-"Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
-"k�vet�en a kliensbe�ll�t�s fog k�vetkezni."
+msgid "Adding a new client to your network"
+msgstr "Kliens felv�tele a h�l�zatba"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Az itt megadott inform�ci�kat a kiszolg�l� arra fogja haszn�lni, hogy a "
-"kliens nev�t el�rhet�v� tegye a h�l�zat t�bbi g�pe sz�m�ra."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Rendszerhiba; a be�ll�t�s nem t�rt�nt meg"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Olyan g�pnevet vagy IP-c�met adott meg, amely m�r haszn�latban van."
+msgid "Client identification:"
+msgstr "A kliens azonos�t�sa:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "A var�zsl� sikeresen felvette a klienst."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr ""
+"Ez a var�zsl� seg�ts�get ny�jt egy kliens helyi DNS-be val� felv�tel�hez."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "A g�p neve:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "OK"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"A kliens a h�l�zaton n�v alapj�n lesz azonos�tva, p�ld�ul: kliensn�v.c�gn�v."
-"net. A h�l�zat �sszes g�p�nek rendelkezni kell egy egyedi IP-c�mmel - a "
-"megszokott pontoz�sos form�tumban."
+"A helyi h�l�zat kliensg�pei olyan sz�m�t�g�pek, amelyek a h�l�zatra vannak "
+"k�tve, tov�bb� saj�t n�vvel �s IP-c�mmel rendelkeznek."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
 msgstr ""
-"A megadott IP-c�mnek �s kliensn�vnek egyedinek kell lenni a h�l�zaton bel�l."
+"Az �rt�kek elfogad�s�hoz �s a kliens felv�tel�hez nyomja le a \"K�vetkez�\" "
+"gombot; jav�t�shoz a \"Vissza\" gombot."
 
-#: ../client_wizard/client.wiz_.c:21
-#, fuzzy
-msgid "DNS Wizard (add client)"
-msgstr "DNS-var�zsl�"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "�rv�nytelen c�m. A folytat�shoz nyomja le a \"K�vetkez�\" gombot."
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Figyelmeztet�s\\nJelenleg DHCP-m�dban van, ez�rt elk�pzelhet�, hogy a "
-"kiszolg�l� nem m�k�dik az aktu�lis be�ll�t�ssal."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "A kliens IP-c�me:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "A g�p IP-c�me:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Be�ll�t�s"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Kil�p�s"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "A var�zsl� elind�t�s�hoz rendszergazdai jogosults�g sz�ks�ges"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "A h�l�zat m�g nincs be�ll�tva"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr ""
-"Ez a var�zsl� seg�ts�get ny�jt egy kliens helyi DNS-be val� felv�tel�hez."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Olyan g�pnevet vagy IP-c�met adott meg, amely m�r haszn�latban van."
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
-msgstr ""
-"Az �rt�kek elfogad�s�hoz �s a kliens felv�tel�hez nyomja le a \"K�vetkez�\" "
-"gombot; jav�t�shoz a \"Vissza\" gombot."
+#: ../client_wizard/client.wiz_.c:25
+#, fuzzy
+msgid "DNS Wizard (add client)"
+msgstr "DNS-var�zsl�"
 
-#: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Kil�p�s"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"Ind�t�shoz nyomja le a \"K�vetkez�\" gombot; a var�zsl�b�l val� kil�p�shez a "
-"\"M�gsem\" gombot."
+"Figyelmeztet�s\\nJelenleg DHCP-m�dban van, ez�rt elk�pzelhet�, hogy a "
+"kiszolg�l� nem m�k�dik az aktu�lis be�ll�t�ssal."
 
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
+#: ../client_wizard/client.wiz_.c:28
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"A param�terek be�ll�t�s�hoz nyomja le a \"K�vetkez�\" gombot; a var�zsl�b�l "
-"val� kil�p�shez a \"M�gsem\" gombot."
+"Az itt megadott inform�ci�kat a kiszolg�l� arra fogja haszn�lni, hogy a "
+"kliens nev�t el�rhet�v� tegye a h�l�zat t�bbi g�pe sz�m�ra."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "A var�zsl� elind�t�s�hoz rendszergazdai jogosults�g sz�ks�ges"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Gratul�lunk"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "A g�p IP-c�me:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "A kliens IP-c�me:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"A m�r l�tez� �rt�k m�dos�t�s�hoz nyomja le a \"K�vetkez�\" gombot; "
+"jav�t�shoz a \"Vissza\" gombot."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
@@ -221,28 +222,15 @@ msgstr ""
 "A var�zsl� elind�t�sa el�tt be kell �ll�tania az alapvet� h�l�zati "
 "param�tereket."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Figyelmeztet�s:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Be�ll�t�svar�zsl�"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "MySQL adatb�ziskiszolg�l�"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Felhaszn�l� felv�tel�hez adjon meg egy felhaszn�l�nevet �s egy jelsz�t"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "A kliens neve"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Felhaszn�l� felv�tele"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -250,77 +238,69 @@ msgstr ""
 "Az �rt�k elfogad�s�hoz �s a kiszolg�l� be�ll�t�s�hoz nyomja le a "
 "\\qMeger�s�t�s\\q gombot; jav�t�shoz a \"Vissza\" gombot."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Adjon meg egy jelsz�t a rendszergazda (root) sz�m�ra:"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "A MySQL adatb�ziskiszolg�l� be�ll�t�sa"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "A var�zsl� sikeresen be�ll�totta a MySQL adatb�ziskiszolg�l�t."
+msgid "Confirm"
+msgstr "Meger�s�t�s"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Adatb�ziskiszolg�l�"
+msgid "Password:"
+msgstr "Jelsz�:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Rendszergazdai jelsz�:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "A var�zsl� sikeresen be�ll�totta a MySQL adatb�ziskiszolg�l�t."
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Meger�s�t�s"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "A m�velethez rendszergazdai jogosults�g sz�ks�ges."
+msgid "Username:"
+msgstr "Felhaszn�l�n�v:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Jelsz�:"
+msgid "Add"
+msgstr "Felv�tel"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr ""
-"Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
-"k�vet�en a MySQL adatb�ziskezel� be�ll�t�sa fog k�vetkezni."
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "A m�velethez rendszergazdai jogosults�g sz�ks�ges."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr ""
-"Ez a var�zsl� seg�ts�get ny�jt a MySQL adatb�ziskiszolg�l�nak a h�l�zathoz "
-"val� be�ll�t�s�hoz."
+msgid "Database Server"
+msgstr "Adatb�ziskiszolg�l�"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Felhaszn�l�n�v:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr ""
 "Megjegyz�s: ez a felhaszn�l� minden lehets�ges jogosults�ggal rendelkezni fog"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Felv�tel"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Adjon meg egy jelsz�t a rendszergazda (root) sz�m�ra:"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "MySQL adatb�zisvar�zsl�"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "A MySQL adatb�ziskiszolg�l� be�ll�t�sa"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Be�ll�t�svar�zsl�"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr "A kiszolg�l� ind�t�s�hoz meg kell adni egy rendszergazdai jelsz�t"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "MySQL adatb�zisvar�zsl�"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Rendszergazdai jelsz�:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "MySQL adatb�ziskiszolg�l�"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
@@ -328,36 +308,61 @@ msgstr ""
 "A var�zsl� a k�vetkez�, a MySQL adatb�ziskiszolg�l� be�ll�t�s�hoz sz�ks�ges "
 "param�tereket gy�jt�tte �ssze:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
 msgstr ""
-"Az IP-c�mek 4 darab, egym�st�l ponttal elv�lasztott sz�mb�l �llnak; mind a 4 "
-"sz�m kisebb 256-n�l."
+"Ez a var�zsl� seg�ts�get ny�jt a MySQL adatb�ziskiszolg�l�nak a h�l�zathoz "
+"val� be�ll�t�s�hoz."
+
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Felhaszn�l� felv�tel�hez adjon meg egy felhaszn�l�nevet �s egy jelsz�t"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../db_wizard/db.wiz_.c:27
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
+msgstr ""
+"Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
+"k�vet�en a MySQL adatb�ziskezel� be�ll�t�sa fog k�vetkezni."
+
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr ""
+"A var�zsl� a k�vetkez�, a DHCP-szolg�ltat�s be�ll�t�s�hoz sz�ks�ges "
+"param�tereket gy�jt�tte �ssze:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Jav�t�s"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
-"Jel�lje ki azon c�mtartom�nyt, amelyb�l a DHCP szolg�ltat�s a "
-"munka�llom�soknak oszt ki c�meket. Ha nincsenek k�l�nlegesebb ig�nyei, "
-"elfogadhatja a felk�n�lt �rt�keket."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Legmagasabb IP-c�m:"
+msgid "Lowest IP Address:"
+msgstr "Legalacsonyabb IP-c�m:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "A DHCP �ltal haszn�lt c�mtartom�ny"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr ""
+"Az IP-c�mek 4 darab, egym�st�l ponttal elv�lasztott sz�mb�l �llnak; mind a 4 "
+"sz�m kisebb 256-n�l."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -365,99 +370,86 @@ 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 a \"Vissza\" gombot."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"A DHCP egy olyan szolg�ltat�s, amely automatikusan hozz�rendel h�l�zati "
-"c�meket a munka�llom�sokhoz."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "DHCP-var�zsl�"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Jav�t�s"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr ""
+"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� DHCP-szolg�ltat�sainak "
+"be�ll�t�s�hoz."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "A DHCP �ltal haszn�lt c�mtartom�ny"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 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."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr ""
-"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� DHCP-szolg�ltat�sainak "
-"be�ll�t�s�hoz."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
 msgstr ""
-"A var�zsl� a k�vetkez�, a DHCP-szolg�ltat�s be�ll�t�s�hoz sz�ks�ges "
-"param�tereket gy�jt�tte �ssze:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Legalacsonyabb IP-c�m:"
+"Jel�lje ki azon c�mtartom�nyt, amelyb�l a DHCP szolg�ltat�s a "
+"munka�llom�soknak oszt ki c�meket. Ha nincsenek k�l�nlegesebb ig�nyei, "
+"elfogadhatja a felk�n�lt �rt�keket."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "DHCP-be�ll�t�si var�zsl�"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "A megadott IP-c�mtartom�ny helytelen"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
+"A DHCP egy olyan szolg�ltat�s, amely automatikusan hozz�rendel h�l�zati "
+"c�meket a munka�llom�sokhoz."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "A megadott IP-c�mtartom�ny helytelen"
+msgid "Highest IP Address:"
+msgstr "Legmagasabb IP-c�m:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
-msgstr "DHCP-var�zsl�"
+msgid "DHCP Configuration Wizard"
+msgstr "DHCP-be�ll�t�si var�zsl�"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "A DHCP-kiszolg�l� be�ll�t�sa"
 
-#: ../dns_wizard/dns.wiz_.c:2
-#, fuzzy
-msgid "DNS Wizard (configuration)"
-msgstr "DNS-be�ll�t�si var�zsl�"
-
-#: ../dns_wizard/dns.wiz_.c:8
+#: ../dns_wizard/dns.wiz_.c:1
 msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
 msgstr ""
-"A var�zsl� a k�vetkez�, a DNS-szolg�ltat�s be�ll�t�s�hoz sz�ks�ges "
-"param�tereket gy�jt�tte �ssze:"
+"A v�laszt�s elfogadhat�, de �gy nem lesz lehet�s�g a helyi h�l�zaton k�v�l "
+"es� g�pek neveinek azonos�t�s�ra."
+
+#: ../dns_wizard/dns.wiz_.c:2
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr ""
+"Az �rt�kek �resen hagy�s�hoz nyomja le a \"K�vetkez�\" gombot; egy �rt�k "
+"megad�s�hoz a \"Vissza\" gombot."
+
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Az els�dleges DNS c�me:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "A DNS-kiszolg�l� be�ll�t�sa"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "A m�sodlagos DNS c�me:"
+msgid "DNS Configuration Wizard"
+msgstr "DNS-be�ll�t�si var�zsl�"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "A DNS-kiszolg�l�k c�me"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� DNS-szolg�ltat�sainak "
-"be�ll�t�s�hoz. Ez a be�ll�t�s helyi DNS-szolg�ltat�st fog ny�jtani a helyi "
-"sz�m�t�g�pnevekhez; a k�ls� (nem helyi) k�r�sek egy k�ls� DNS-hez lesznek "
-"ir�ny�tva."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -469,43 +461,54 @@ msgstr ""
 "els�dleges �s a m�sodlagos DNS-kiszolg�l� IP-c�m�t - �ltal�ban ezeket az "
 "internetszolg�ltat�t�l lehet megszerezni."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l� DNS-szolg�ltat�sait."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "�res c�met adott meg a DNS-kiszolg�l�hoz."
 
-#: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
 msgstr ""
-"Az �rt�kek �resen hagy�s�hoz nyomja le a \"K�vetkez�\" gombot; egy �rt�k "
-"megad�s�hoz a \"Vissza\" gombot."
-
-#: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "DNS-be�ll�t�si var�zsl�"
+"A var�zsl� a k�vetkez�, a DNS-szolg�ltat�s be�ll�t�s�hoz sz�ks�ges "
+"param�tereket gy�jt�tte �ssze:"
 
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Az els�dleges DNS c�me:"
+#: ../dns_wizard/dns.wiz_.c:16
+msgid "DNS Server Addresses"
+msgstr "A DNS-kiszolg�l�k c�me"
 
-#: ../dns_wizard/dns.wiz_.c:20
+#: ../dns_wizard/dns.wiz_.c:17
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"A v�laszt�s elfogadhat�, de �gy nem lesz lehet�s�g a helyi h�l�zaton k�v�l "
-"es� g�pek neveinek azonos�t�s�ra."
+"A DNS (Domain Name Server, azaz tartom�nyn�v-kiszolg�l�) egy olyan "
+"szolg�ltat�s, amely a g�pneveket �sszerendeli a megfelel� g�pc�mekkel."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "A m�sodlagos DNS c�me:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"A DNS (Domain Name Server, azaz tartom�nyn�v-kiszolg�l�) egy olyan "
-"szolg�ltat�s, amely a g�pneveket �sszerendeli a megfelel� g�pc�mekkel."
+"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� DNS-szolg�ltat�sainak "
+"be�ll�t�s�hoz. Ez a be�ll�t�s helyi DNS-szolg�ltat�st fog ny�jtani a helyi "
+"sz�m�t�g�pnevekhez; a k�ls� (nem helyi) k�r�sek egy k�ls� DNS-hez lesznek "
+"ir�ny�tva."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l� DNS-szolg�ltat�sait."
+#, fuzzy
+msgid "DNS Wizard (configuration)"
+msgstr "DNS-be�ll�t�si var�zsl�"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -516,64 +519,72 @@ msgid "Please select a wizard"
 msgstr "V�lasszon egy var�zsl�t"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Eszk�z"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "K�zepes - web, FTP �s SSH l�tszik k�v�lr�l"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr ""
 "Er�s - k�v�lr�l nem l�that� a rendszer, a felhaszn�l�k csak a webet "
 "haszn�lhatj�k"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Hiba l�pett fel."
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "T�zfalbe�ll�t�si var�zsl�"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr ""
+"A var�zsl� a k�vetkez�, a t�zfal be�ll�t�s�hoz sz�ks�ges param�tereket "
+"gy�jt�tte �ssze:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr ""
+"A t�zfal megv�di a bels� h�l�zatot az internet fel�l t�rt�n� illet�ktelen "
+"hozz�f�r�sekt�l."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "Internetes h�l�zati eszk�z:"
+msgid "Device"
+msgstr "Eszk�z"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Jav�t�s"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "T�zfalvar�zsl�"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Semmilyen - nincs v�delem"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "V�delmi szint:"
+msgid "Internet Network Device:"
+msgstr "Internetes h�l�zati eszk�z:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "T�zfalvar�zsl�"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Be�ll�that�, hogy a t�zfal milyen v�delmi szintet (mekkora v�delmet) "
+"ny�jtson. V�lassza ki az ig�nyeinek megfelel� szintet. Ha nem biztos abban, "
+"hogy mit �rdemes v�lasztani, v�lassza a \"K�zepes\" szintet - �ltal�ban az a "
+"legmegfelel�bb."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l�n a t�zfalat."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "K�zepes - web, FTP �s SSH l�tszik k�v�lr�l"
+msgid "The device name is not correct"
+msgstr "Az eszk�zn�v helytelen"
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "V�delmi szint"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Jav�t�s"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Kil�p�s"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "T�zfalbe�ll�t�si var�zsl�"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "Az eszk�zn�v helytelen"
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -581,93 +592,105 @@ msgstr ""
 "A t�zfalnak tudnia kell, hogyan van a kiszolg�l� az internethez kapcsolva. "
 "V�lassza ki, melyik eszk�zt haszn�lja a k�ls� kapcsolathoz."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr ""
-"A t�zfal megv�di a bels� h�l�zatot az internet fel�l t�rt�n� illet�ktelen "
-"hozz�f�r�sekt�l."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "V�delmi szint"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "A t�zfal be�ll�t�sa"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Hiba l�pett fel."
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "H�l�zati t�zfaleszk�z"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Semmilyen - nincs v�delem"
+msgid "The wizard successfully configured your server firewall."
+msgstr "A var�zsl� sikeresen be�ll�totta a kiszolg�l�n a t�zfalat."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
+msgid "Configuring the Firewall"
+msgstr "A t�zfal be�ll�t�sa"
+
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Kil�p�s"
+
+#: ../firewall_wizard/firewall.wiz_.c:24
+#, fuzzy
 msgid "This wizard will help you configuring your server firewall."
 msgstr "Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� t�zfal�nak be�ll�t�s�hoz."
 
-#: ../firewall_wizard/firewall.wiz_.c:23
+#: ../firewall_wizard/firewall.wiz_.c:25
 msgid "Low - Light filtering, standard services available"
 msgstr "Gyenge - kism�rt�k� sz�r�s, a szabv�nyos szolg�ltat�sok el�rhet�k"
 
-#: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "H�l�zati t�zfaleszk�z"
+#: ../firewall_wizard/firewall.wiz_.c:26
+msgid "Protection Level:"
+msgstr "V�delmi szint:"
 
-#: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
-"A var�zsl� a k�vetkez�, a t�zfal be�ll�t�s�hoz sz�ks�ges param�tereket "
-"gy�jt�tte �ssze:"
+"Ez a var�zsl� seg�ts�get ny�jt az FTP-kiszolg�l�nak a h�l�zathoz val� "
+"be�ll�t�s�hoz."
 
-#: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Be�ll�that�, hogy a t�zfal milyen v�delmi szintet (mekkora v�delmet) "
-"ny�jtson. V�lassza ki az ig�nyeinek megfelel� szintet. Ha nem biztos abban, "
-"hogy mit �rdemes v�lasztani, v�lassza a \"K�zepes\" szintet - �ltal�ban az a "
-"legmegfelel�bb."
+#: ../ftp_wizard/ftp.wiz_.c:3
+#, fuzzy
+msgid "Public directory:"
+msgstr "K�nyvt�r:"
 
-#: ../ftp_wizard/ftp.wiz_.c:1
-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/ftp.wiz_.c:4
+msgid "Internet FTP Server:"
+msgstr "Internetes FTP-kiszolg�l�:"
 
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:6
+msgid "Enable the FTP Server for the Intranet"
+msgstr "Az FTP-kiszolg�l� bekapcsol�sa az intranet sz�m�ra"
 
 #: ../ftp_wizard/ftp.wiz_.c:7
-msgid "Internet FTP Server:"
-msgstr "Internetes FTP-kiszolg�l�:"
+msgid "FTP wizard"
+msgstr "FTP-var�zsl�"
 
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "FTP-kiszolg�l�"
 
 #: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "Don't check any box if you don't want to activate your FTP Server."
 msgstr ""
-"A var�zsl� sikeresen be�ll�totta az intranetes/internetes FTP-kiszolg�l�t."
+"Ha nem k�v�nja aktiv�lni az FTP-kiszolg�l�t, ne jel�lje ki egyik opci�t sem."
 
 #: ../ftp_wizard/ftp.wiz_.c:12
-#, fuzzy
-msgid "Public directory:"
-msgstr "K�nyvt�r:"
+msgid "Configuring the FTP Server"
+msgstr "Az FTP-kiszolg�l� be�ll�t�sa"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:13
+msgid "Enable the FTP Server for the Internet"
+msgstr "Az FTP-kiszolg�l� bekapcsol�sa az internet sz�m�ra"
+
+#: ../ftp_wizard/ftp.wiz_.c:14
+msgid "Intranet FTP Server:"
+msgstr "Intranetes FTP-kiszolg�l�:"
 
 #: ../ftp_wizard/ftp.wiz_.c:15
-msgid "Enable the FTP Server for the Intranet"
-msgstr "Az FTP-kiszolg�l� bekapcsol�sa az intranet sz�m�ra"
+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."
+
+#: ../ftp_wizard/ftp.wiz_.c:16
+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/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:17
+#: ../ftp_wizard/ftp.wiz_.c:21
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "Server"
@@ -675,62 +698,36 @@ msgstr ""
 "A var�zsl� a k�vetkez�, az FTP-kiszolg�l� be�ll�t�s�hoz sz�ks�ges "
 "param�tereket gy�jt�tte �ssze:"
 
-#: ../ftp_wizard/ftp.wiz_.c:18
-msgid "FTP wizard"
-msgstr "FTP-var�zsl�"
-
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
 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/ftp.wiz_.c:20
-msgid "Enable the FTP Server for the Internet"
-msgstr "Az FTP-kiszolg�l� bekapcsol�sa az internet sz�m�ra"
 
-#: ../ftp_wizard/ftp.wiz_.c:21
-msgid "Intranet FTP Server:"
-msgstr "Intranetes FTP-kiszolg�l�:"
-
-#: ../ftp_wizard/ftp.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:24
 msgid "FTP Server Configuration Wizard"
 msgstr "FTP-kiszolg�l�-be�ll�t�svar�zsl�"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "Az FTP-kiszolg�l� be�ll�t�sa"
-
-#: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
 msgstr ""
-"Ha nem k�v�nja aktiv�lni az FTP-kiszolg�l�t, ne jel�lje ki egyik opci�t sem."
-
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "FTP-kiszolg�l�"
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "H�rkiszolg�l�-n�v:"
+msgid "Polling Interval:"
+msgstr "Lek�rdez�si intervallum:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "�dv�zli a H�rvar�zsl�"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Lek�rdez�si peri�dus (�r�ban):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "H�rkiszolg�l�"
+msgid "Polling Period"
+msgstr "Lek�rdez�si peri�dus"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -740,30 +737,32 @@ msgstr ""
 "h�rkiszolg�l�r�l. A lek�rdez�si peri�dus adja meg azon id�mennyis�get, "
 "amelynek el kell telni k�t egym�st k�vet� lek�rdez�s k�zt."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr ""
+"Ez a var�zsl� seg�ts�get ny�jt az internetes h�rszolg�ltat�soknak a "
+"h�l�zathoz val� be�ll�t�s�hoz."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "H�rvar�zsl�"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "A lek�rdez�si peri�dus helytelen"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "A h�rkiszolg�l�-n�v helytelen"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Lek�rdez�si intervallum:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Az internetes g�pneveknek a k�vetkez� form�j�nak kell lenni: \\qg�pn�v."
-"tartom�ny.tartom�nyt�pus\\q; p�ld�ul, ha a szolg�ltat� c�me \\qszolg�ltat�."
-"com\\q, akkor az internetes h�rkiszolg�l�� �ltal�ban \\qnews.szolg�ltat�.com"
-"\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Lek�rdez�si peri�dus"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Az internetes h�rszolg�ltat�s be�ll�t�sa"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -771,15 +770,7 @@ 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/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "A lek�rdez�si peri�dus helytelen"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "H�rkiszolg�l�:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -788,7 +779,13 @@ msgstr ""
 "h�rszolg�ltat�sokat ny�jt a h�l�zat sz�m�ra. A megfelel� nevet �ltal�ban az "
 "internetszolg�ltat�t�l lehet megszerezni."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr ""
+"A var�zsl� sikeresen be�ll�totta a kiszolg�l� internetes h�rszolg�ltat�sait."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
@@ -796,31 +793,65 @@ 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/news.wiz_.c:22
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Lek�rdez�si peri�dus (�r�ban):"
+
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "H�rkiszolg�l�-n�v:"
+
+#: ../news_wizard/news.wiz_.c:20
 msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Ez a var�zsl� seg�ts�get ny�jt az internetes h�rszolg�ltat�soknak a "
-"h�l�zathoz val� be�ll�t�s�hoz."
+"Az internetes g�pneveknek a k�vetkez� form�j�nak kell lenni: \\qg�pn�v."
+"tartom�ny.tartom�nyt�pus\\q; p�ld�ul, ha a szolg�ltat� c�me \\qszolg�ltat�."
+"com\\q, akkor az internetes h�rkiszolg�l�� �ltal�ban \\qnews.szolg�ltat�.com"
+"\\q."
 
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Az internetes h�rszolg�ltat�s be�ll�t�sa"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "�dv�zli a H�rvar�zsl�"
 
 #: ../news_wizard/news.wiz_.c:24
+msgid "News Server"
+msgstr "H�rkiszolg�l�"
+
+#: ../news_wizard/news.wiz_.c:25
+msgid "News Server:"
+msgstr "H�rkiszolg�l�:"
+
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "A feljogos�tott h�l�zat:"
+
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Hozz�f�r�skezel�s"
+
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
-"The wizard successfully configured your Internet News service of your server."
+"Access will be allowed for hosts on the network. Here is the information "
+"found about your current local network, you can modify it if needed."
 msgstr ""
-"A var�zsl� sikeresen be�ll�totta a kiszolg�l� internetes h�rszolg�ltat�sait."
+"A h�l�zati g�pekr�l val� el�r�s enged�lyezve lesz. A helyi h�l�zat adatai "
+"itt l�that�k, ezeket �n sz�ks�g eset�n m�dos�thatja."
 
-#: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "H�rvar�zsl�"
+#: ../nfs_wizard/nfs.wiz_.c:4
+#, fuzzy
+msgid "Access :"
+msgstr "Hozz�f�r�skezel�s:"
+
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
+msgid "Local Network - access for local network (recommended)"
+msgstr "Helyi h�l�zat - el�r�s a helyi h�l�zat sz�m�ra (javasolt)"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
 msgid ""
-"Choose the level that suits your needs. If you don't know,the Local Network "
+"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 ""
@@ -829,114 +860,122 @@ msgstr ""
 "legmegfelel�bb. Legyen �vatos: lehets�ges, hogy a \"Minden\" elnevez�s� "
 "szint nem el�gg� biztons�gos."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
+#: ../nfs_wizard/nfs.wiz_.c:8
+msgid "Exported dir:"
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
+msgstr ""
+"A var�zsl� a k�vetkez�, a Samba be�ll�t�s�hoz sz�ks�ges param�tereket "
+"gy�jt�tte �ssze:"
+
+#: ../nfs_wizard/nfs.wiz_.c:10
 msgid "NFS Server Configuration Wizard"
 msgstr "NFS-kiszolg�l�-be�ll�t�svar�zsl�"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:5
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "NFS-var�zsl�"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
+msgid "Grant access on local network"
+msgstr "Hozz�f�r�s lehet�v� t�tele a helyi h�l�zaton"
+
+#: ../nfs_wizard/nfs.wiz_.c:15
 msgid "NFS Server"
 msgstr "NFS-kiszolg�l�"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "A var�zsl� sikeresen be�ll�totta az NFS-kiszolg�l�t."
-
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
 msgid "All - No access restriction"
 msgstr "Minden - nincs el�r�si tilt�s"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
-msgid ""
-"Access will be allowed for hosts on the network. Here is the information "
-"found about your current local network, you can modify it if needed."
+#: ../nfs_wizard/nfs.wiz_.c:18
+msgid "Netmask :"
 msgstr ""
-"A h�l�zati g�pekr�l val� el�r�s enged�lyezve lesz. A helyi h�l�zat adatai "
-"itt l�that�k, ezeket �n sz�ks�g eset�n m�dos�thatja."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Hozz�f�r�skezel�s"
+#: ../nfs_wizard/nfs.wiz_.c:19
+msgid "Directory:"
+msgstr "K�nyvt�r:"
 
-#: ../nfs_wizard/nfs.wiz_.c:11
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
 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.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
-msgid "Local Network - access for local network (recommended)"
-msgstr "Helyi h�l�zat - el�r�s a helyi h�l�zat sz�m�ra (javasolt)"
-
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "A feljogos�tott h�l�zat:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
-msgid "Exported dir:"
-msgstr ""
-
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
-msgid "Grant access on local network"
-msgstr "Hozz�f�r�s lehet�v� t�tele a helyi h�l�zaton"
+#: ../nfs_wizard/nfs.wiz_.c:21
+msgid "The wizard successfully configured your NFS Server"
+msgstr "A var�zsl� sikeresen be�ll�totta az NFS-kiszolg�l�t."
 
-#: ../nfs_wizard/nfs.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:2
 #, fuzzy
-msgid "The wizard collected the following parameters."
-msgstr ""
-"A var�zsl� a k�vetkez�, a Samba be�ll�t�s�hoz sz�ks�ges param�tereket "
-"gy�jt�tte �ssze:"
+msgid "There seems to be a problem..."
+msgstr "�gy t�nik, probl�ma van. Forduljon a rendszergazd�hoz."
 
-#: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "Hozz�f�r�skezel�s:"
+#: ../postfix_wizard/postfix.wiz_.c:3
+msgid "Internet Mail Gateway"
+msgstr "Internetes levelez��tj�r�"
 
-#: ../nfs_wizard/nfs.wiz_.c:20
-msgid "Directory:"
-msgstr "K�nyvt�r:"
+#: ../postfix_wizard/postfix.wiz_.c:5
+msgid "Outgoing Mail Address"
+msgstr "Kimeneti lev�lc�m"
 
-#: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "NFS-var�zsl�"
+#: ../postfix_wizard/postfix.wiz_.c:6
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr ""
+"A var�zsl� sikeresen be�ll�totta az �n kiszolg�l�j�n az internetes "
+"levelez�szolg�ltat�st."
 
-#: ../postfix_wizard/postfix.wiz_.c:1
+#: ../postfix_wizard/postfix.wiz_.c:7
 msgid "Do It"
 msgstr "V�grehajt�s"
 
-#: ../postfix_wizard/postfix.wiz_.c:3
+#: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
-msgstr ""
-"Kiv�laszthatja, milyen fajta c�m jelenjen meg a kimen� levelek \\qFelad�\\q "
-"(\\qFrom\\q) �s \\qV�laszc�m\\q (\\qReply-to\\q) mez�iben."
+"This should be chosen consistently with the address you use for incoming "
+"mail."
+msgstr "Ez a bej�v� levelekhez haszn�lt c�mnek megfelel�en v�lasztand� ki."
 
-#: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "Az internetes levelez�s be�ll�t�sa"
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
 
-#: ../postfix_wizard/postfix.wiz_.c:6
+#: ../postfix_wizard/postfix.wiz_.c:11
+msgid "You entered an empty address for the mail gateway."
+msgstr "�res c�met adott meg a levelez��tj�r�nak."
+
+#: ../postfix_wizard/postfix.wiz_.c:12
+msgid "Internet Mail Configuration Wizard"
+msgstr "Internetes levelez�si be�ll�t�svar�zsl�"
+
+#: ../postfix_wizard/postfix.wiz_.c:13
 msgid "Postfix wizard"
 msgstr "Postfix-var�zsl�"
 
-#: ../postfix_wizard/postfix.wiz_.c:7
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Levelez�kiszolg�l� neve:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
 msgstr ""
-"A kiszolg�l� a kimen� leveleket egy levelez�si �tj�r� (mail gateway) fel� "
-"fogja elk�ldeni, amely a v�gs� k�zbes�t�sr�l gondoskodni fog."
+"A v�laszt�s elfogadhat�, de �gy nem lesz lehet�s�g a helyi h�l�zaton k�v�lre "
+"val� lev�lk�ld�sre. A folytat�shoz nyomja le a \"K�vetkez�\" gombot; egy "
+"�rt�k megad�s�hoz a \"Vissza\" gombot."
 
-#: ../postfix_wizard/postfix.wiz_.c:8
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
 "network."
@@ -944,25 +983,15 @@ msgstr ""
 "Ez a var�zsl� seg�ts�get ny�jt a h�l�zat internetes "
 "levelez�szolg�ltat�sainak be�ll�t�s�hoz."
 
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Kimeneti lev�lc�m"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
+#: ../postfix_wizard/postfix.wiz_.c:18
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
-msgstr "Ez a bej�v� levelekhez haszn�lt c�mnek megfelel�en v�lasztand� ki."
-
-#: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
-msgstr "�gy t�nik, probl�ma van. Forduljon a rendszergazd�hoz."
-
-#: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "A maszkol�s (masquerade) nem megfelel�."
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
+msgstr ""
+"A kiszolg�l� a kimen� leveleket egy levelez�si �tj�r� (mail gateway) fel� "
+"fogja elk�ldeni, amely a v�gs� k�zbes�t�sr�l gondoskodni fog."
 
-#: ../postfix_wizard/postfix.wiz_.c:13
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
@@ -970,11 +999,7 @@ msgstr ""
 "Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
 "k�vet�en a Postfix be�ll�t�sa fog k�vetkezni."
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "A c�m form�tuma"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -985,11 +1010,19 @@ msgstr ""
 "com\\q, akkor az internetes levelez�kiszolg�l�� �ltal�ban \\qsmtp."
 "szolg�ltat�.com\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Internetes levelez�si be�ll�t�svar�zsl�"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Kiv�laszthatja, milyen fajta c�m jelenjen meg a kimen� levelek \\qFelad�\\q "
+"(\\qFrom\\q) �s \\qV�laszc�m\\q (\\qReply-to\\q) mez�iben."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "Az internetes levelez�s be�ll�t�sa"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -997,72 +1030,56 @@ 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.wiz_.c:20
+#: ../postfix_wizard/postfix.wiz_.c:26
+msgid "Masquerade not good!"
+msgstr "A maszkol�s (masquerade) nem megfelel�."
+
+#: ../postfix_wizard/postfix.wiz_.c:28
+msgid "Form of the Address"
+msgstr "A c�m form�tuma"
+
+#: ../postfix_wizard/postfix.wiz_.c:29
 msgid "Mail Address:"
 msgstr "Lev�lc�m:"
 
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "�res c�met adott meg a levelez��tj�r�nak."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
 msgstr ""
-"A var�zsl� sikeresen be�ll�totta az �n kiszolg�l�j�n az internetes "
-"levelez�szolg�ltat�st."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Internetes levelez��tj�r�"
-
-#: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Levelez�kiszolg�l� neve:"
+"Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
+"k�vet�en a proxy be�ll�t�sa fog k�vetkezni."
 
-#: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"A v�laszt�s elfogadhat�, de �gy nem lesz lehet�s�g a helyi h�l�zaton k�v�lre "
-"val� lev�lk�ld�sre. A folytat�shoz nyomja le a \"K�vetkez�\" gombot; egy "
-"�rt�k megad�s�hoz a \"Vissza\" gombot."
+#: ../proxy_wizard/proxy.wiz_.c:4
+msgid "Proxy Configuration Wizard"
+msgstr "Proxy-be�ll�t�si var�zsl�"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../proxy_wizard/proxy.wiz_.c:8
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "A portsz�mnak 1024-n�l nagyobbnak kell lenni �s 65535-n�l kisebbnek"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
-msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
-msgstr ""
-"A mem�ria-gyorst�r az a RAM-mennyis�g, amely a gyorst�rm�veletek sz�m�ra van "
-"fenntartva (a Squid mem�riafoglal�sa enn�l nagyobb)."
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "A var�zsl� elind�t�s�hoz rendszergazdai jogosults�g sz�ks�ges"
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Proxy-port:"
+#: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Hozz�f�r�skezel�s:"
 
-#: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "A var�zsl� sikeresen be�ll�totta a proxy-kiszolg�l�t."
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "A proxy be�ll�t�sa"
 
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr ""
-"Egy olyan portot adott meg, amely hasznos lehet ennek a szolg�ltat�snak:"
+#: ../proxy_wizard/proxy.wiz_.c:13
+msgid "Define an upper level proxy"
+msgstr "Fels�bb szint� proxy defini�l�sa"
 
-#: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Gyorst�r-hierarchia"
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "F�jlrendszer         M�ret  Felh El�rh Fel% Csatolva"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -1070,19 +1087,19 @@ msgstr ""
 "A Squid egy web-gyorst�raz� proxy-kiszolg�l�. Gyorsabb web-el�r�st tesz "
 "lehet�v� a helyi h�l�zat sz�m�ra."
 
-#: ../proxy_wizard/proxy.wiz_.c:10
-msgid "Define an upper level proxy"
-msgstr "Fels�bb szint� proxy defini�l�sa"
-
-#: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Lemezhely (MB):"
-
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "A fels�bb szint� proxy g�pneve:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Ez a var�zsl� seg�ts�get ny�jt a proxy-kiszolg�l� be�ll�t�s�hoz."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "A fels�bb szint� proxy portja:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "A /var/spool/squid lemezhely-foglal�sa:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
@@ -1090,226 +1107,198 @@ msgstr ""
 "gyorst�raz�shoz felhaszn�lhat�."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "A proxy be�ll�t�sa"
+msgid "Proxy Port"
+msgstr "Proxy-port"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"A proxy-port �rt�ke azt hat�rozza meg, hogy a proxy-kiszolg�l� mely porton "
-"fogja figyelni a HTTP-k�r�seket. Az alap�rtelmezett �rt�k 3128, egy tov�bbi "
-"gyakori �rt�k a 8080. A portsz�mnak 1024-n�l nagyobbnak kell lenni."
+"Haszn�lhat numerikus form�tumot (p�lda: \\q192.168.1.0/255.255.255.0\\q) "
+"vagy sz�vegest (p�lda: \\q.tartom�ny.net\\q)"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Squid-var�zsl�"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Port:"
+msgid ""
+"Press Next if you want to keep this value, or Back to correct your choice."
+msgstr ""
+"Az �rt�k megtart�s�hoz nyomja le a \"K�vetkez�\" gombot; jav�t�shoz a "
+"\"Vissza\" gombot."
 
 #: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "F�jlrendszer         M�ret  Felh El�rh Fel% Csatolva"
-
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "A var�zsl� elind�t�s�hoz rendszergazdai jogosults�g sz�ks�ges"
-
-#: ../proxy_wizard/proxy.wiz_.c:26
-msgid ""
-"You can safely select \\qNo upper level proxy\\q if you don't need this "
-"feature."
+msgid "You have entered a port that may be useful for this service:"
 msgstr ""
-"Ha nincs sz�ks�ge erre a funkci�ra, v�lassza a \\qNincs fels�bb szint� proxy"
-"\\q lehet�s�get."
+"Egy olyan portot adott meg, amely hasznos lehet ennek a szolg�ltat�snak:"
 
 #: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Mem�ria-gyorst�r (MB):"
+msgid "/etc/services:"
+msgstr "/etc/services:"
 
 #: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Hozz�f�r�skezel�s:"
+msgid "Cache hierarchy"
+msgstr "Gyorst�r-hierarchia"
 
 #: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
+"You can safely select \\qNo upper level proxy\\q if you don't need this "
+"feature."
 msgstr ""
-"Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
-"k�vet�en a proxy be�ll�t�sa fog k�vetkezni."
+"Ha nincs sz�ks�ge erre a funkci�ra, v�lassza a \\qNincs fels�bb szint� proxy"
+"\\q lehet�s�get."
 
 #: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Proxy-port"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Az �rt�k m�dos�t�s�hoz nyomja le a \"Vissza\" gombot."
+msgid "Port:"
+msgstr "Port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Adja meg a felhaszn�land� g�pnevet (p�lda: \\qcache.tartom�ny.net\\q) �s "
-"proxy-portot."
+"A Squid be�ll�that� t�bbszint� proxy haszn�lat�ra. Egy �jabb fels�bb szint� "
+"proxy a megfelel� g�pn�v �s port megad�s�val vehet� fel."
 
 #: ../proxy_wizard/proxy.wiz_.c:34
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr ""
+"A var�zsl� a k�vetkez�, a proxy be�ll�t�s�hoz sz�ks�ges param�tereket "
+"gy�jt�tte �ssze:"
+
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Mem�ria-gyorst�r (MB):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Nincs fels�bb szint� proxy (javasolt)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "A portsz�mnak 1024-n�l nagyobbnak kell lenni �s 65535-n�l kisebbnek"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "A proxy-gyorst�r m�rete"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Az �rt�k m�dos�t�s�hoz nyomja le a \"Vissza\" gombot."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Az �rt�k megtart�s�hoz nyomja le a \"K�vetkez�\" gombot; jav�t�shoz a "
-"\"Vissza\" gombot."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Helyi g�p - az el�r�s csak err�l a kiszolg�l�r�l lehets�ges"
+"A proxy-port �rt�ke azt hat�rozza meg, hogy a proxy-kiszolg�l� mely porton "
+"fogja figyelni a HTTP-k�r�seket. Az alap�rtelmezett �rt�k 3128, egy tov�bbi "
+"gyakori �rt�k a 8080. A portsz�mnak 1024-n�l nagyobbnak kell lenni."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Haszn�lhat numerikus form�tumot (p�lda: \\q192.168.1.0/255.255.255.0\\q) "
-"vagy sz�vegest (p�lda: \\q.tartom�ny.net\\q)"
+msgid "Squid wizard"
+msgstr "Squid-var�zsl�"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Proxy-be�ll�t�si var�zsl�"
+msgid "Proxy port:"
+msgstr "Proxy-port:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Lemezhely (MB):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "A fels�bb szint� proxy g�pneve:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Helyi g�p - az el�r�s csak err�l a kiszolg�l�r�l lehets�ges"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"A Squid be�ll�that� t�bbszint� proxy haszn�lat�ra. Egy �jabb fels�bb szint� "
-"proxy a megfelel� g�pn�v �s port megad�s�val vehet� fel."
+"A mem�ria-gyorst�r az a RAM-mennyis�g, amely a gyorst�rm�veletek sz�m�ra van "
+"fenntartva (a Squid mem�riafoglal�sa enn�l nagyobb)."
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
 msgstr ""
-"A var�zsl� a k�vetkez�, a proxy be�ll�t�s�hoz sz�ks�ges param�tereket "
-"gy�jt�tte �ssze:"
+"Adja meg a felhaszn�land� g�pnevet (p�lda: \\qcache.tartom�ny.net\\q) �s "
+"proxy-portot."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 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."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "A fels�bb szint� proxy portja:"
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "A var�zsl� sikeresen be�ll�totta a proxy-kiszolg�l�t."
 
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Ez a var�zsl� seg�ts�get ny�jt a proxy-kiszolg�l� be�ll�t�s�hoz."
+#: ../samba_wizard/samba.wiz_.c:3
+msgid "Home:"
+msgstr "Saj�t k�nyvt�r:"
 
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "A /var/spool/squid lemezhely-foglal�sa:"
+#: ../samba_wizard/samba.wiz_.c:4
+#, fuzzy
+msgid "Enable all printer"
+msgstr "Samba-szolg�ltat�sok bekapcsolva"
 
-#: ../samba_wizard/samba.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:5
 #, fuzzy
-msgid "Enable file sharing area"
-msgstr "A /home/samba/public megoszt�si ter�let bekapcsol�sa"
+msgid "Make home directories available for their owners"
+msgstr "A saj�t k�nyvt�rak el�rhet�k legyenek a tulajdonosaik sz�m�ra"
 
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
+#: ../samba_wizard/samba.wiz_.c:6
+msgid "Configuring Samba"
+msgstr "A Samba be�ll�t�sa"
 
-#: ../samba_wizard/samba.wiz_.c:3
+#: ../samba_wizard/samba.wiz_.c:9
 msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Munkacsoport:"
-
-#: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
+#: ../samba_wizard/samba.wiz_.c:11
+msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr ""
-"Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
-"k�vet�en a Samba be�ll�t�sa fog k�vetkezni."
+"A Samb�nak tudnia kell, melyik windowsos munkacsoportot fogja kiszolg�lni."
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "A kiszolg�l� le�r�sa helytelen"
-
-#: ../samba_wizard/samba.wiz_.c:11
+#: ../samba_wizard/samba.wiz_.c:13
 msgid ""
-"This wizard will help you configuring the Samba services of your server."
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
 msgstr ""
-"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� Samba-szolg�ltat�sainak "
-"be�ll�t�s�hoz."
-
-#: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Samba-szolg�ltat�sok bekapcsolva"
+"A Samb�val l�trehozhat� egy k�z�s haszn�lat� f�jlmegoszt�si ter�let, "
+"amelyhez hozz�f�rhetnek a windowsos munka�llom�sok. A kiszolg�l�hoz "
+"csatlakoz� nyomtat�k is megoszthat�k a Samba haszn�lat�val."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+msgid "The wizard successfully configured your Samba server."
+msgstr "A var�zsl� sikeresen be�ll�totta a Samba kiszolg�l�t."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr ""
-"A var�zsl� a k�vetkez�, a Samba be�ll�t�s�hoz sz�ks�ges param�tereket "
-"gy�jt�tte �ssze:"
+msgid "Server Banner."
+msgstr "A kiszolg�l� le�r�sa."
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Le�r�s:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Nyomtat�kiszolg�l�:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Munkacsoport"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Munkacsoport:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
-"A le�r�s azt adja meg, hogy a kiszolg�l� milyen le�r�ssal jelenik meg a "
-"windowsos munka�llom�sokon."
 
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "F�jlmegoszt�s:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1318,12 +1307,26 @@ msgstr ""
 "a Samb�n kereszt�l t�rt�n� el�r�s�t. Sz�ks�g van egy jelsz� be�ll�t�s�ra; ez "
 "elv�gezhet� az smbpasswd programmal."
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "Samba-szolg�ltat�sok bekapcsolva"
+msgid "Printers:"
+msgstr "Nyomtat�kiszolg�l�:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "A kiszolg�l� le�r�sa helytelen"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Samba be�ll�t�svar�zsl�"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1332,281 +1335,255 @@ msgstr ""
 "nyomtat�kiszolg�l�k�nt viselkedjen a Linuxt�l elt�r� oper�ci�s rendszert "
 "futtat� munka�llom�sok fel�."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
+#: ../samba_wizard/samba.wiz_.c:28
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:28
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+"This wizard will help you configuring the Samba services of your server."
 msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "A Samba be�ll�t�sa"
+"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� Samba-szolg�ltat�sainak "
+"be�ll�t�s�hoz."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr "A kiszolg�l� le�r�sa:"
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
-msgstr "A kiszolg�l� le�r�sa."
+msgid "Enabled Samba Services"
+msgstr "Samba-szolg�ltat�sok bekapcsolva"
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "A kiszolg�l� nyomtat�megoszt�s�nak bekapcsol�sa"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "A munkacsoport helytelen"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr ""
+"Ha azt a lehet�s�get v�lasztja, hogy elv�gzi most a be�ll�t�st, akkor ezt "
+"k�vet�en a Samba be�ll�t�sa fog k�vetkezni."
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
 msgstr ""
+"A var�zsl� a k�vetkez�, a Samba be�ll�t�s�hoz sz�ks�ges param�tereket "
+"gy�jt�tte �ssze:"
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "Hozz�f�r�skezel�s"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"A le�r�s azt adja meg, hogy a kiszolg�l� milyen le�r�ssal jelenik meg a "
+"windowsos munka�llom�sokon."
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
 msgstr ""
-"A Samb�val l�trehozhat� egy k�z�s haszn�lat� f�jlmegoszt�si ter�let, "
-"amelyhez hozz�f�rhetnek a windowsos munka�llom�sok. A kiszolg�l�hoz "
-"csatlakoz� nyomtat�k is megoszthat�k a Samba haszn�lat�val."
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Le�r�s:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "A var�zsl� sikeresen be�ll�totta a Samba kiszolg�l�t."
+msgid "The Workgroup is wrong"
+msgstr "A munkacsoport helytelen"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr ""
-"A Samb�nak tudnia kell, melyik windowsos munkacsoportot fogja kiszolg�lni."
+msgid "Samba wizard"
+msgstr "Samba-var�zsl�"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "A kiszolg�l� le�r�sa:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "Hozz�f�r�skezel�s:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Nyomtat�kiszolg�l�:"
+msgid "Workgroup"
+msgstr "Munkacsoport"
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Samba-var�zsl�"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Samba be�ll�t�svar�zsl�"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "Make home directories available for their owners"
-msgstr "A saj�t k�nyvt�rak el�rhet�k legyenek a tulajdonosaik sz�m�ra"
+msgid "Access control"
+msgstr "Hozz�f�r�skezel�s"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "A kiszolg�l� nyomtat�megoszt�s�nak bekapcsol�sa"
-
-#: ../samba_wizard/samba.wiz_.c:56
+#: ../samba_wizard/samba.wiz_.c:53
 #, fuzzy
-msgid "Printers:"
-msgstr "Nyomtat�kiszolg�l�:"
+msgid "Enable file sharing area"
+msgstr "A /home/samba/public megoszt�si ter�let bekapcsol�sa"
 
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Saj�t k�nyvt�r:"
+#: ../samba_wizard/samba.wiz_.c:56
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr ""
+msgid "File Sharing:"
+msgstr "F�jlmegoszt�s:"
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
-msgstr ""
-"V�lassza ki azt a h�l�zati eszk�zt (�ltal�ban k�rtya), amellyel a "
-"kiszolg�l�nak a h�l�zatra csatlakoznia kell. A helyi h�l�zathoz kapcsol�d� "
-"eszk�zr�l van sz�, amely elt�rhet az internet el�r�s�hez haszn�lt eszk�zt�l."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "A kiszolg�l� IP-c�me helytelen"
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "Ez a var�zsl� be�ll�tja a kiszolg�l� alapvet� h�l�zati param�tereit."
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "�tj�r�eszk�z:"
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Kiszolg�l�var�zsl�"
-
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
-"A h�l�zati c�m 4 darab, egym�st�l ponttal elv�lasztott sz�mb�l �ll. Mind a 4 "
-"sz�m kisebb 256-n�l; az utols� sz�mnak 0-nak kell lenni."
+msgid "Host Name:"
+msgstr "G�pn�v:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "h�l�zati eszk�z"
+msgid "Basic Network Configuration Wizard"
+msgstr "Alapvet� h�l�zatbe�ll�t�si var�zsl�"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "A h�l�zati c�m helytelen"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Val�sz�n�, hogy a helyi h�l�zat tartom�nyneve �s IP-c�mei k�l�nb�znek a "
-"kiszolg�l� \\qk�ls�\\q kapcsolat�nak megfelel� adatait�l."
+msgid "Server IP address:"
+msgstr "A kiszolg�l� IP-c�me:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "H�l�zati c�m"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "A var�zsl� haszn�lata k�zben lehet�leg ne futtasson semmilyen m�s "
 "alkalmaz�st. A var�zsl�b�l val� kil�p�s ut�n l�pjen ki a rendszerb�l, majd "
 "jelentkezzen be �jra."
 
-#: ../server_wizard/server.wiz_.c:11
-msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
-msgstr ""
-"Itt l�that� a k�ls� �tj�r� (gateway) jelenleg be�ll�tott �rt�ke (a kezdeti "
-"telep�t�s sor�n megadott �rt�k). Az eszk�znek (h�l�zati k�rtya vagy modem) "
-"k�l�nb�z�nek kell lenni a bels� h�l�zatban haszn�ltt�l."
-
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"The wizard successfully configured the basic networking services of your "
+"server."
 msgstr ""
-"A var�zsl�k szemsz�g�b�l a sz�m�t�g�p egy kiszolg�l�, amely a saj�t helyi "
-"h�l�zat�t kezeli (C oszt�ly� h�l�zat)."
+"A var�zsl� sikeresen be�ll�totta a kiszolg�l�g�p alapvet� h�l�zati "
+"szolg�ltat�sait."
 
 #: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Eszk�z:"
+msgid ""
+"(you can change here these values if you know exactly what you're doing)"
+msgstr "(itt m�dos�thatja ezeket az �rt�keket - legyen vele k�r�ltekint�)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Figyelmeztet�s"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"A h�l�zati c�m egy, a h�l�zatot azonos�t� sz�msorozat. A felaj�nlott �rt�k "
+"egy olyan k�rnyezetre van tervezve, ahol nincsen internetkapcsolat, vagy "
+"csak maszkol�ssal (masquerading) lehets�ges a kapcsol�d�s. �ltal�ban "
+"javasolt elfogadni az alap�rtelmez�s szerinti �rt�ket."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Ezen a lapon a tartom�nyn�v meghat�roz�sa t�rt�nik."
+msgid "Note about networking"
+msgstr "Megjegyz�s a h�l�zatkezel�sr�l"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Kiszolg�l�c�m:"
+msgid "Server Address"
+msgstr "Kiszolg�l�c�m"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "A meghat�rozott tartom�nyn�v"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"A h�l�zati c�m 4 darab, egym�st�l ponttal elv�lasztott sz�mb�l �ll. Mind a 4 "
+"sz�m kisebb 256-n�l; az utols� sz�mnak 0-nak kell lenni."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "G�pn�v"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Megjegyz�s: ha sz�ks�ges hozz�f�rni a k�lvil�ghoz, akkor az �tj�r� IP-c�me "
+"ne legyen �res."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr "Ezen a lapon az alap�rtelmezett kiszolg�l�c�m meghat�roz�sa t�rt�nik."
+msgid "The Server IP address is incorrect"
+msgstr "A kiszolg�l� IP-c�me helytelen"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Alapvet� h�l�zatbe�ll�t�si var�zsl�"
+msgid "Configuring your network"
+msgstr "A h�l�zat be�ll�t�sa"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "Az �tj�r� IP-c�me:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "A g�pn�v nem megfelel�"
+msgid "This page computes the default server address; it should be invisible."
+msgstr "Ezen a lapon az alap�rtelmezett kiszolg�l�c�m meghat�roz�sa t�rt�nik."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"A g�pneveknek a k�vetkez� form�tum�nak kell lenni�k: \\qg�p.tartom�ny."
-"tartom�nyt�pus\\q. Ha a szerver egy internetes kiszolg�l� lesz, akkor a "
-"tartom�nyn�v (domain name) az internetszolg�ltat�n�l bejegyzett n�v kell "
-"legyen. Ha csak intranetes funkci�khoz lesz haszn�lva a g�p, akkor b�rmilyen "
-"�rv�nyes n�v megfelel, p�ld�ul: \\qc�g.net\\q."
+msgid "IP net address:"
+msgstr "IP h�l�zati c�m:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "K�ls� �tj�r�"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"A h�l�zati c�m egy, a h�l�zatot azonos�t� sz�msorozat. A felaj�nlott �rt�k "
-"egy olyan k�rnyezetre van tervezve, ahol nincsen internetkapcsolat, vagy "
-"csak maszkol�ssal (masquerading) lehets�ges a kapcsol�d�s. �ltal�ban "
-"javasolt elfogadni az alap�rtelmez�s szerinti �rt�ket."
+msgid "Server Wizard"
+msgstr "Kiszolg�l�var�zsl�"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
 msgstr ""
-"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� alapvet� h�l�zati "
-"szolg�ltat�sainak be�ll�t�s�hoz."
+"Val�sz�n�, hogy a helyi h�l�zat tartom�nyneve �s IP-c�mei k�l�nb�znek a "
+"kiszolg�l� \\qk�ls�\\q kapcsolat�nak megfelel� adatait�l."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "Ez a var�zsl� be�ll�tja a kiszolg�l� alapvet� h�l�zati param�tereit."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Megjegyz�s a h�l�zatkezel�sr�l"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Megjegyz�s: ha sz�ks�ges hozz�f�rni a k�lvil�ghoz, akkor az �tj�r� IP-c�me "
-"ne legyen �res."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Hiba a var�zsl�ban."
+"V�lassza ki azt a h�l�zati eszk�zt (�ltal�ban k�rtya), amellyel a "
+"kiszolg�l�nak a h�l�zatra csatlakoznia kell. A helyi h�l�zathoz kapcsol�d� "
+"eszk�zr�l van sz�, amely elt�rhet az internet el�r�s�hez haszn�lt eszk�zt�l."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
@@ -1614,19 +1591,42 @@ msgstr ""
 "Az eszk�z�k a linuxos nev�kkel vannak megjelen�tve �s - ha ismert - a "
 "k�rtyale�r�ssal."
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "H�l�zati c�m:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Itt l�that� a k�ls� �tj�r� (gateway) jelenleg be�ll�tott �rt�ke (a kezdeti "
+"telep�t�s sor�n megadott �rt�k). Az eszk�znek (h�l�zati k�rtya vagy modem) "
+"k�l�nb�z�nek kell lenni a bels� h�l�zatban haszn�ltt�l."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "A h�l�zat be�ll�t�sa"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr ""
+"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� alapvet� h�l�zati "
+"szolg�ltat�sainak be�ll�t�s�hoz."
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "Az �tj�r� IP-c�me:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"A kiszolg�l� IP-c�me egy, a kiszolg�l�t a h�l�zaton azonos�t� sz�msorozat. A "
+"felaj�nlott �rt�k egy priv�t h�l�zaton val� haszn�latra van tervezve, ahol "
+"nincsen internetkapcsolat, vagy csak maszkol�ssal (masquerading) lehets�ges "
+"a kapcsol�d�s. �ltal�ban javasolt elfogadni az alap�rtelmez�s szerinti "
+"�rt�ket."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "A g�pn�v nem megfelel�"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1636,11 +1636,27 @@ msgstr ""
 "be�ll�t�st�l f�gg�en - az interneten kereszt�l kapcsol�d� g�pek) fognak a "
 "kiszolg�l� el�r�s�re haszn�lni."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "G�pn�v:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Hiba a var�zsl�ban."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "h�l�zati eszk�z"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "A meghat�rozott tartom�nyn�v"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Ezen a lapon a tartom�nyn�v meghat�roz�sa t�rt�nik."
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "�tj�r�eszk�z:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
@@ -1648,403 +1664,400 @@ msgstr ""
 "A var�zsl� a k�vetkez�, a h�l�zat be�ll�t�s�hoz sz�ks�ges param�tereket "
 "gy�jt�tte �ssze:"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"A k�ls� kapcsolat egy olyan h�l�zatot jel�l, amelyen a sz�m�t�g�p kliensk�nt "
-"van jelen (p�ld�ul internet) - egy m�sik h�l�zati k�rty�val vagy modemmel "
-"kapcsol�dva."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Figyelmeztet�s"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr "(itt m�dos�thatja ezeket az �rt�keket - legyen vele k�r�ltekint�)"
+msgid "Device:"
+msgstr "Eszk�z:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"A kiszolg�l� IP-c�me egy, a kiszolg�l�t a h�l�zaton azonos�t� sz�msorozat. A "
-"felaj�nlott �rt�k egy priv�t h�l�zaton val� haszn�latra van tervezve, ahol "
-"nincsen internetkapcsolat, vagy csak maszkol�ssal (masquerading) lehets�ges "
-"a kapcsol�d�s. �ltal�ban javasolt elfogadni az alap�rtelmez�s szerinti "
-"�rt�ket."
+"A var�zsl�k szemsz�g�b�l a sz�m�t�g�p egy kiszolg�l�, amely a saj�t helyi "
+"h�l�zat�t kezeli (C oszt�ly� h�l�zat)."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Kiszolg�l�n�v:"
+msgid "Server Address:"
+msgstr "Kiszolg�l�c�m:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "A h�l�zati c�m helytelen"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"A k�ls� kapcsolat egy olyan h�l�zatot jel�l, amelyen a sz�m�t�g�p kliensk�nt "
+"van jelen (p�ld�ul internet) - egy m�sik h�l�zati k�rty�val vagy modemmel "
+"kapcsol�dva."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Kiszolg�l�c�m"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
 msgstr ""
-"A var�zsl� sikeresen be�ll�totta a kiszolg�l�g�p alapvet� h�l�zati "
-"szolg�ltat�sait."
+"A g�pneveknek a k�vetkez� form�tum�nak kell lenni�k: \\qg�p.tartom�ny."
+"tartom�nyt�pus\\q. Ha a szerver egy internetes kiszolg�l� lesz, akkor a "
+"tartom�nyn�v (domain name) az internetszolg�ltat�n�l bejegyzett n�v kell "
+"legyen. Ha csak intranetes funkci�khoz lesz haszn�lva a g�p, akkor b�rmilyen "
+"�rv�nyes n�v megfelel, p�ld�ul: \\qc�g.net\\q."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "H�l�zati eszk�z"
+msgid "Host Name"
+msgstr "G�pn�v"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "IP h�l�zati c�m:"
+msgid "Network Address:"
+msgstr "H�l�zati c�m:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "H�l�zati c�m"
+msgid "Network Device"
+msgstr "H�l�zati eszk�z"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "A kiszolg�l� IP-c�me:"
+msgid "Server Name:"
+msgstr "Kiszolg�l�n�v:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "Adelaide-i Egyetem, D�l-Ausztr�lia"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, P�rizsi Egyetem, Franciaorsz�g"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Az id�kiszolg�l�k tesztel�s�hez nyomja le a \"K�vetkez�\" gombot."
+msgid "University of Manchester, Manchester, England"
+msgstr "Manchesteri Egyetem, Manchester, Anglia"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Id�kiszolg�l�k"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Limoges-i Egyetem, Franciaorsz�g"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "A m�sodlagos id�kiszolg�l�:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Kanadai Meteorol�giai K�zpont, Dorval, Quebec, Kanada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr "Az �n kiszolg�l�ja lesz a h�l�zat helyi id�kiszolg�l�ja."
+msgid "Press next to start the time servers test."
+msgstr "Az id�kiszolg�l�k tesztel�s�hez nyomja le a \"K�vetkez�\" gombot."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
 msgstr ""
-"Az �n kiszolg�l�ja mostant�l id�kiszolg�l�k�nt m�k�dhet a helyi h�l�zat "
-"sz�m�ra."
+"Ism�telten megpr�b�lkozhat az id�kiszolg�l�k el�r�s�vel; vagy pedig "
+"elmentheti a be�ll�t�sokat an�lk�l, hogy az id� be�ll�t�sra ker�lne."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Csernogolovkai Tudom�nyos K�zpont, moszkvai ter�let, Oroszorsz�g"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(v�lasszon �nh�z f�ldrajzilag k�zel lev� kiszolg�l�t)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylor Orvostudom�nyi Egyetem, Houston, Texas"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "Oklahomai Egyetem, Norman, Oklahoma, USA"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "V�lasszon egy id�z�n�t:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "Reginai Egyetem, Regina, Saskatchewan, Kanada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr ""
-"Ind�t�shoz nyomja le a \"K�vetkez�\" gombot; a var�zsl�b�l val� kil�p�shez a "
-"\"M�gsem\" gombot."
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Trinity Egyetem, Dublin, �rorsz�g"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, Franciaorsz�g"
+msgid "Singapore"
+msgstr "Szingap�r"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Limoges-i Egyetem, Franciaorsz�g"
+msgid "Secondary Time Server:"
+msgstr "A m�sodlagos id�kiszolg�l�:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT Inform�ci�s Rendszerek, Cambridge, MA"
+msgid "Try again"
+msgstr "Pr�b�lja meg �jra"
 
 #: ../time_wizard/time.wiz_.c:14
-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."
+msgid "The Chinese University of Hong Kong"
+msgstr "Hong Kong-i K�nai Egyetem"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(v�lasszon �nh�z f�ldrajzilag k�zel lev� kiszolg�l�t)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV M�szaki Egyetem, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, Franciaorsz�g"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante, Spanyolorsz�g)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Kanadai Meteorol�giai K�zpont, Dorval, Quebec, Kanada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "Kanadai Nemzeti Kutat�int�zet, Ottawa, Ontario, Kanada"
 
+#: ../time_wizard/time.wiz_.c:18
+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/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "Manchesteri Egyetem, Manchester, Anglia"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, Franciaorsz�g"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- nincs k�ls� h�l�zat"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Sz�ul, Korea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Ha az id�kiszolg�l� nem �rhet� el azonnal (h�l�zati vagy egy�b okok miatt), "
-"akkor k�r�lbel�l 30 m�sodpercnyi v�rakoz�sra lesz sz�ks�g."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Csernogolovkai Tudom�nyos K�zpont, moszkvai ter�let, Oroszorsz�g"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Az id�kiszolg�l�k el�rhet�s�g�nek tesztel�se"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washington �llami Egyetem, Richland, Wa"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "Osl�i Egyetem, Norv�gia"
+msgid "University of Adelaide, South Australia"
+msgstr "Adelaide-i Egyetem, D�l-Ausztr�lia"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "Sz�m�t�studom�nyi Tansz�k, Wisconsin-Madisoni Egyetem"
+msgid "Time zone:"
+msgstr "Id�z�na:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Trinity Egyetem, Dublin, �rorsz�g"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Az id�kiszolg�l�k nem v�laszolnak. Ennek okai a k�vetkez�k lehetnek:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "Reginai Egyetem, Regina, Saskatchewan, Kanada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Caeni Egyetem, Franciaorsz�g"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Az id�kiszolg�l�k nem v�laszolnak. Ennek okai a k�vetkez�k lehetnek:"
+msgid "- other reasons..."
+msgstr "- egy�b okok..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Sv�jci Sz�vets�gi Technol�giai Int�zet"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Ha az id�kiszolg�l� nem �rhet� el azonnal (h�l�zati vagy egy�b okok miatt), "
+"akkor k�r�lbel�l 30 m�sodpercnyi v�rakoz�sra lesz sz�ks�g."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Caeni Egyetem, Franciaorsz�g"
+msgid "WARNING"
+msgstr "FIGYELMEZTET�S"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, Franciaorsz�g"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, Franciaorsz�g"
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
+msgid "Your server can now act as a time server for your local network."
 msgstr ""
-"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� id�be�ll�t�s�hoz - ak�r "
-"helyileg, ak�r egy k�ls� id�kiszolg�l�val szinkroniz�lva."
+"Az �n kiszolg�l�ja mostant�l id�kiszolg�l�k�nt m�k�dhet a helyi h�l�zat "
+"sz�m�ra."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "FIGYELMEZTET�S"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Fukuokai Egyetem, Fukuoka, Jap�n"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Sz�ul, Korea"
+msgid "Time Servers"
+msgstr "Id�kiszolg�l�k"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "Oklahomai Egyetem, Norman, Oklahoma, USA"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Sv�jci Sz�vets�gi Technol�giai Int�zet"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "Hong Kong-i K�nai Egyetem"
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Ez a var�zsl� seg�ts�get ny�jt a kiszolg�l� id�be�ll�t�s�hoz - ak�r "
+"helyileg, ak�r egy k�ls� id�kiszolg�l�val szinkroniz�lva."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- egy�b okok..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, Franciaorsz�g"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- nem l�tez� id�kiszolg�l�k"
+msgid "Testing the time servers availability"
+msgstr "Az id�kiszolg�l�k el�rhet�s�g�nek tesztel�se"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Id�z�na:"
+msgid "Save config without test"
+msgstr "Be�ll�t�sok ment�se tesztel�s n�lk�l"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Sz�m�t�studom�nyi Tansz�k, Strathclyde-i Egyetem, Glasgow, Sk�cia"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Ism�telten megpr�b�lkozhat az id�kiszolg�l�k el�r�s�vel; vagy pedig "
-"elmentheti a be�ll�t�sokat an�lk�l, hogy az id� be�ll�t�sra ker�lne."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn �llami Egyetem, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT Inform�ci�s Rendszerek, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Az els�dleges id�kiszolg�l�:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylor Orvostudom�nyi Egyetem, Houston, Texas"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Pr�b�lja meg �jra"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn �llami Egyetem, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washington �llami Egyetem, Richland, Wa"
+msgid "- non existent time servers"
+msgstr "- nem l�tez� id�kiszolg�l�k"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Id�kiszolg�l�-be�ll�t�sok elmentve."
+msgid "Time wizard"
+msgstr "Id�var�zsl�"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, P�rizsi Egyetem, Franciaorsz�g"
+msgid "University of Oslo, Norway"
+msgstr "Osl�i Egyetem, Norv�gia"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr "Az �n kiszolg�l�ja lesz a h�l�zat helyi id�kiszolg�l�ja."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Be�ll�t�sok ment�se tesztel�s n�lk�l"
+msgid "- no outside network"
+msgstr "- nincs k�ls� h�l�zat"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Szingap�r"
+msgid "Primary Time Server:"
+msgstr "Az els�dleges id�kiszolg�l�:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Fukuokai Egyetem, Fukuoka, Jap�n"
+msgid "Time server configuration saved"
+msgstr "Id�kiszolg�l�-be�ll�t�sok elmentve."
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV M�szaki Egyetem, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr ""
+"Ind�t�shoz nyomja le a \"K�vetkez�\" gombot; a var�zsl�b�l val� kil�p�shez a "
+"\"M�gsem\" gombot."
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante, Spanyolorsz�g)"
+msgid "Choose a time zone:"
+msgstr "V�lasszon egy id�z�n�t:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Id�var�zsl�"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr ""
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr "Sz�m�t�studom�nyi Tansz�k, Wisconsin-Madisoni Egyetem"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid ""
+"Your server can act as a Web Server toward your internal network (intranet) "
+"and as a Web Server for the Internet."
 msgstr ""
-"Ha nem k�v�nja aktiv�lni a webkiszolg�l�t, ne jel�lje ki egyik opci�t sem."
+"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/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr ""
-"A var�zsl� sikeresen be�ll�totta az intranetes/internetes webkiszolg�l�t."
+#, fuzzy
+msgid "Internet web server:"
+msgstr "Internetes webkiszolg�l�:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
 msgstr ""
-"A var�zsl� a k�vetkez�, a webkiszolg�l� be�ll�t�s�hoz sz�ks�ges "
-"param�tereket gy�jt�tte �ssze:"
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Web-var�zsl�"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
+msgstr ""
 
-#: ../web_wizard/web.wiz_.c:11
-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/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "A webkiszolg�l� intranetes el�r�s�nek lehet�v� t�tele"
 
 #: ../web_wizard/web.wiz_.c:12
-#, fuzzy
-msgid "Internet web server:"
-msgstr "Internetes webkiszolg�l�:"
+msgid "Configuring the Web Server"
+msgstr "A webkiszolg�l� be�ll�t�sa"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "A webkiszolg�l� intranetes el�r�s�nek lehet�v� t�tele"
+msgid "Web Server"
+msgstr "Webkiszolg�l�"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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/web.wiz_.c:15
 #, fuzzy
 msgid "Enable the Web Server for the Internet"
 msgstr "A webkiszolg�l� intranetes el�r�s�nek lehet�v� t�tele"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "K�nyvt�r:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "V�lassza ki, milyen fajta webes szolg�ltat�st szeretne aktiv�lni:"
+#, fuzzy
+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/web.wiz_.c:17
-msgid "document root:"
-msgstr ""
+msgid "Web wizard"
+msgstr "Web-var�zsl�"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Intranetes webkiszolg�l�:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "A webkiszolg�l� be�ll�t�sa"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Webkiszolg�l�"
+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."
 
 #: ../web_wizard/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Webkiszolg�l�-be�ll�t�si var�zsl�"
+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/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"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:"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr ""
+"A var�zsl� sikeresen be�ll�totta az intranetes/internetes webkiszolg�l�t."
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr ""
+msgid "Web Server Configuration Wizard"
+msgstr "Webkiszolg�l�-be�ll�t�si var�zsl�"
 
 msgid "Cancel"
 msgstr "M�gsem"
diff --git a/po/id.po b/po/id.po
index 6b6e271b..6bb09408 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakwizard 0.1\n"
-"POT-Creation-Date: 2002-12-23 05:54+0100\n"
+"POT-Creation-Date: 2003-01-21 08:45+0100\n"
 "PO-Revision-Date: 2002-09-21 18:35+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Nusantara - Bahasa Indonesia <id@li.org>\n"
@@ -13,191 +13,192 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../client_wizard/client.wiz_.c:1
+#: ../client_wizard/client.wiz_.c:1 ../db_wizard/db.wiz_.c:4
+#: ../postfix_wizard/postfix.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:2
 msgid ""
-"A client of your local network is a machine connected to the network having "
-"its own name and IP number."
+"Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
-"Klien jaringan lokal adalah mesin yg terhubung dg jaringan dan memiliki nama "
-"dan nomor IP sendiri."
+"Tekan Maju utk mengkonfigurasikan parameter sekarang, atau Batal utk keluar."
 
-#: ../client_wizard/client.wiz_.c:2 ../dns_wizard/dns.wiz_.c:3
-msgid "This is not a valid address... press next to continue"
-msgstr "Alamat tak berlaku... tekan Maju utk melanjutkan"
+#: ../client_wizard/client.wiz_.c:2 ../db_wizard/db.wiz_.c:5
+#: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
+#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
+#: ../samba_wizard/samba.wiz_.c:8 ../server_wizard/server.wiz_.c:5
+#: ../web_wizard/web.wiz_.c:11
+msgid "OK"
+msgstr "OK"
 
 #: ../client_wizard/client.wiz_.c:3
 msgid ""
-"Press next if you want to change the already existing value, or back to "
-"correct your choice."
-msgstr ""
-"Tekan Maju jika Anda ingin mengubah nilai yg ada, atau Kembali utk "
-"mengoreksi pilihan."
-
-#: ../client_wizard/client.wiz_.c:4 ../db_wizard/db.wiz_.c:1
-#: ../dhcp_wizard/dhcp.wiz_.c:3 ../dns_wizard/dns.wiz_.c:4
-#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:3
-#: ../news_wizard/news.wiz_.c:4 ../nfs_wizard/nfs.wiz_.c:2
-#: ../postfix_wizard/postfix.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:36
-#: ../samba_wizard/samba.wiz_.c:32 ../server_wizard/server.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:20
-msgid "Congratulations"
-msgstr "Selamat"
+"If you choose to configure now, you will automatically continue with the "
+"Client configuration"
+msgstr "Jika pilih sekarang, Anda akan diantar ke Konfigurasi Klien"
 
-#: ../client_wizard/client.wiz_.c:5
+#: ../client_wizard/client.wiz_.c:4
 msgid "DNS Client Wizard"
 msgstr "Dukun Klien DNS"
 
+#: ../client_wizard/client.wiz_.c:5
+msgid "Press next to begin, or Cancel to leave this wizard."
+msgstr "Tekan Maju utk mulai, atau Batal utk keluar."
+
 #: ../client_wizard/client.wiz_.c:6
 msgid ""
+"Your client on the network will be identified by name, as in clientname."
+"company.net. Every machine on the network must have a (unique) IP address, "
+"in the usual dotted syntax."
+msgstr ""
+"Klien di jaringan akan dikenal dg nama, seperti namaklien.perusahaan.net. "
+"Tiap mesin di jaringan harus punya nomor IP (unik) dalam format bertitik."
+
+#: ../client_wizard/client.wiz_.c:7
+msgid ""
 "The wizard collected the following parameters needed to add a client to your "
 "network:"
 msgstr "Parameter utk menambah klien jaringan telah terkumpul:"
 
-#: ../client_wizard/client.wiz_.c:7 ../dhcp_wizard/dhcp.wiz_.c:8
-#: ../dns_wizard/dns.wiz_.c:6
-msgid "System error, no configuration done"
-msgstr "Error sistem, konfigurasi batal"
-
 #: ../client_wizard/client.wiz_.c:8
-msgid "Client name"
-msgstr "Nama klien"
+msgid "The wizard successfully added the client."
+msgstr "Sang dukun sukses menambah klien."
 
 #: ../client_wizard/client.wiz_.c:9
-msgid "Adding a new client to your network"
-msgstr "Penambahan klien baru jaringan Anda"
+msgid "(you don't need to type the domain after the name)"
+msgstr "(Anda tak perlu mengetik domain setelah nama)"
 
-#: ../client_wizard/client.wiz_.c:10 ../dhcp_wizard/dhcp.wiz_.c:9
-#: ../dns_wizard/dns.wiz_.c:7 ../firewall_wizard/firewall.wiz_.c:8
-#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:8
-#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:11
-#: ../samba_wizard/samba.wiz_.c:9 ../server_wizard/server.wiz_.c:8
-#: ../web_wizard/web.wiz_.c:6
-msgid "Configure"
-msgstr "Konfigurasikan"
+#: ../client_wizard/client.wiz_.c:10
+msgid ""
+"Note that the given IP number and client name should be unique in the "
+"network."
+msgstr "Ingat bhw nomor IP dan nama klien harus unik di jaringan."
 
-#: ../client_wizard/client.wiz_.c:11
-msgid "Client identification:"
-msgstr "Identifikasi klien:"
+#: ../client_wizard/client.wiz_.c:11 ../dns_wizard/dns.wiz_.c:18
+#: ../postfix_wizard/postfix.wiz_.c:22 ../proxy_wizard/proxy.wiz_.c:25
+msgid "Warning:"
+msgstr "Peringatan:"
 
 #: ../client_wizard/client.wiz_.c:12
-msgid "(you don't need to type the domain after the name)"
-msgstr "(Anda tak perlu mengetik domain setelah nama)"
+msgid "Name of the machine:"
+msgstr "Nama mesin:"
 
 #: ../client_wizard/client.wiz_.c:13
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Client configuration"
-msgstr "Jika pilih sekarang, Anda akan diantar ke Konfigurasi Klien"
+msgid "Adding a new client to your network"
+msgstr "Penambahan klien baru jaringan Anda"
 
-#: ../client_wizard/client.wiz_.c:14
-msgid ""
-"The server will use the informations you enter here to make the name of the "
-"client available to other machines into your network."
-msgstr ""
-"Server akan memakai info yg Anda masukkan di sini utk membuat nama klien yg "
-"akan tampak oleh mesin lain di jaringan."
+#: ../client_wizard/client.wiz_.c:14 ../dhcp_wizard/dhcp.wiz_.c:18
+#: ../dns_wizard/dns.wiz_.c:21
+msgid "System error, no configuration done"
+msgstr "Error sistem, konfigurasi batal"
 
 #: ../client_wizard/client.wiz_.c:15
-msgid "You have entered a machine name or an IP number already used."
-msgstr "Nama mesin atau nomor IP telah dipakai."
+msgid "Client identification:"
+msgstr "Identifikasi klien:"
 
 #: ../client_wizard/client.wiz_.c:16
-msgid "The wizard successfully added the client."
-msgstr "Sang dukun sukses menambah klien."
+msgid "This wizard will help you in adding a new client in your local DNS."
+msgstr "Dukun ini membantu Anda menambahkan klien baru di DNS lokal Anda."
 
 #: ../client_wizard/client.wiz_.c:17
-msgid "Name of the machine:"
-msgstr "Nama mesin:"
-
-#: ../client_wizard/client.wiz_.c:18 ../db_wizard/db.wiz_.c:9
-#: ../dhcp_wizard/dhcp.wiz_.c:12 ../dns_wizard/dns.wiz_.c:12
-#: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:17
-#: ../samba_wizard/samba.wiz_.c:12 ../server_wizard/server.wiz_.c:13
-#: ../web_wizard/web.wiz_.c:9
-msgid "OK"
-msgstr "OK"
-
-#: ../client_wizard/client.wiz_.c:19
 msgid ""
-"Your client on the network will be identified by name, as in clientname."
-"company.net. Every machine on the network must have a (unique) IP address, "
-"in the usual dotted syntax."
+"A client of your local network is a machine connected to the network having "
+"its own name and IP number."
 msgstr ""
-"Klien di jaringan akan dikenal dg nama, seperti namaklien.perusahaan.net. "
-"Tiap mesin di jaringan harus punya nomor IP (unik) dalam format bertitik."
+"Klien jaringan lokal adalah mesin yg terhubung dg jaringan dan memiliki nama "
+"dan nomor IP sendiri."
 
-#: ../client_wizard/client.wiz_.c:20
+#: ../client_wizard/client.wiz_.c:18
 msgid ""
-"Note that the given IP number and client name should be unique in the "
-"network."
-msgstr "Ingat bhw nomor IP dan nama klien harus unik di jaringan."
+"To accept these values, and add your client, click the Next button or use "
+"the Back button to correct them."
+msgstr ""
+"Klik Maju utk menerima nilai ini dan menambah klien, atau Kembali utk "
+"membetulkannya."
 
-#: ../client_wizard/client.wiz_.c:21
-#, fuzzy
-msgid "DNS Wizard (add client)"
-msgstr "Dukun DNS"
+#: ../client_wizard/client.wiz_.c:19 ../dns_wizard/dns.wiz_.c:24
+msgid "This is not a valid address... press next to continue"
+msgstr "Alamat tak berlaku... tekan Maju utk melanjutkan"
 
-#: ../client_wizard/client.wiz_.c:22 ../dhcp_wizard/dhcp.wiz_.c:14
-#: ../ftp_wizard/ftp.wiz_.c:13 ../web_wizard/web.wiz_.c:28
-msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
-msgstr ""
-"Peringatan\\nAnda ada di dhcp, server mungkin tak jalan dg konfigurasi Anda."
+#: ../client_wizard/client.wiz_.c:20
+msgid "Client IP:"
+msgstr "IP Klien:"
 
-#: ../client_wizard/client.wiz_.c:23
-msgid "IP number of the machine:"
-msgstr "Nomor IP mesin:"
+#: ../client_wizard/client.wiz_.c:21 ../dhcp_wizard/dhcp.wiz_.c:6
+#: ../dns_wizard/dns.wiz_.c:4 ../firewall_wizard/firewall.wiz_.c:2
+#: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
+#: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
+#: ../samba_wizard/samba.wiz_.c:29 ../server_wizard/server.wiz_.c:33
+#: ../web_wizard/web.wiz_.c:8
+msgid "Configure"
+msgstr "Konfigurasikan"
 
-#: ../client_wizard/client.wiz_.c:24 ../db_wizard/db.wiz_.c:18
-#: ../dhcp_wizard/dhcp.wiz_.c:15 ../dns_wizard/dns.wiz_.c:19
-#: ../firewall_wizard/firewall.wiz_.c:19 ../ftp_wizard/ftp.wiz_.c:16
-#: ../news_wizard/news.wiz_.c:20 ../nfs_wizard/nfs.wiz_.c:17
-#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:48
-#: ../samba_wizard/samba.wiz_.c:49 ../server_wizard/server.wiz_.c:49
-#: ../time_wizard/time.wiz_.c:47 ../web_wizard/web.wiz_.c:30
-msgid "Quit"
-msgstr "Keluar"
+#: ../client_wizard/client.wiz_.c:22 ../dns_wizard/dns.wiz_.c:8
+msgid "You need to be root to run this wizard"
+msgstr "Anda harus jadi root utk menjalankan dukun ini"
 
-#: ../client_wizard/client.wiz_.c:25 ../db_wizard/db.wiz_.c:19
-#: ../postfix_wizard/postfix.wiz_.c:17 ../proxy_wizard/proxy.wiz_.c:47
-#: ../samba_wizard/samba.wiz_.c:48
+#: ../client_wizard/client.wiz_.c:23 ../db_wizard/db.wiz_.c:9
+#: ../postfix_wizard/postfix.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:40
+#: ../samba_wizard/samba.wiz_.c:36
 msgid "Network not configured yet"
 msgstr "Jaringan belum dikonfigurasikan"
 
-#: ../client_wizard/client.wiz_.c:26
-msgid "This wizard will help you in adding a new client in your local DNS."
-msgstr "Dukun ini membantu Anda menambahkan klien baru di DNS lokal Anda."
+#: ../client_wizard/client.wiz_.c:24
+msgid "You have entered a machine name or an IP number already used."
+msgstr "Nama mesin atau nomor IP telah dipakai."
 
-#: ../client_wizard/client.wiz_.c:27
-msgid ""
-"To accept these values, and add your client, click the Next button or use "
-"the Back button to correct them."
+#: ../client_wizard/client.wiz_.c:25
+#, fuzzy
+msgid "DNS Wizard (add client)"
+msgstr "Dukun DNS"
+
+#: ../client_wizard/client.wiz_.c:26 ../db_wizard/db.wiz_.c:12
+#: ../dhcp_wizard/dhcp.wiz_.c:14 ../dns_wizard/dns.wiz_.c:15
+#: ../firewall_wizard/firewall.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:17
+#: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
+#: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
+#: ../samba_wizard/samba.wiz_.c:46 ../server_wizard/server.wiz_.c:44
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+msgid "Quit"
+msgstr "Keluar"
+
+#: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
-"Klik Maju utk menerima nilai ini dan menambah klien, atau Kembali utk "
-"membetulkannya."
+"Peringatan\\nAnda ada di dhcp, server mungkin tak jalan dg konfigurasi Anda."
 
 #: ../client_wizard/client.wiz_.c:28
-msgid "Press next to begin, or Cancel to leave this wizard."
-msgstr "Tekan Maju utk mulai, atau Batal utk keluar."
-
-#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:23
-#: ../postfix_wizard/postfix.wiz_.c:25 ../proxy_wizard/proxy.wiz_.c:52
-#: ../samba_wizard/samba.wiz_.c:53
 msgid ""
-"Press next to configure these parameters now, or Cancel to exit this wizard."
+"The server will use the informations you enter here to make the name of the "
+"client available to other machines into your network."
 msgstr ""
-"Tekan Maju utk mengkonfigurasikan parameter sekarang, atau Batal utk keluar."
+"Server akan memakai info yg Anda masukkan di sini utk membuat nama klien yg "
+"akan tampak oleh mesin lain di jaringan."
 
-#: ../client_wizard/client.wiz_.c:30 ../dns_wizard/dns.wiz_.c:21
-msgid "You need to be root to run this wizard"
-msgstr "Anda harus jadi root utk menjalankan dukun ini"
+#: ../client_wizard/client.wiz_.c:29 ../db_wizard/db.wiz_.c:18
+#: ../dhcp_wizard/dhcp.wiz_.c:17 ../dns_wizard/dns.wiz_.c:19
+#: ../firewall_wizard/firewall.wiz_.c:20 ../ftp_wizard/ftp.wiz_.c:23
+#: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
+#: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
+#: ../samba_wizard/samba.wiz_.c:54 ../server_wizard/server.wiz_.c:48
+#: ../web_wizard/web.wiz_.c:24
+msgid "Congratulations"
+msgstr "Selamat"
+
+#: ../client_wizard/client.wiz_.c:30
+msgid "IP number of the machine:"
+msgstr "Nomor IP mesin:"
 
 #: ../client_wizard/client.wiz_.c:31
-msgid "Client IP:"
-msgstr "IP Klien:"
+msgid ""
+"Press next if you want to change the already existing value, or back to "
+"correct your choice."
+msgstr ""
+"Tekan Maju jika Anda ingin mengubah nilai yg ada, atau Kembali utk "
+"mengoreksi pilihan."
 
-#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:31
-#: ../samba_wizard/samba.wiz_.c:24
+#: ../client_wizard/client.wiz_.c:32 ../db_wizard/db.wiz_.c:22
+#: ../postfix_wizard/postfix.wiz_.c:27 ../proxy_wizard/proxy.wiz_.c:53
+#: ../samba_wizard/samba.wiz_.c:57
 msgid ""
 "You have to configure the basic network parameters before launching this "
 "wizard."
@@ -205,28 +206,15 @@ msgstr ""
 "Anda harus mengkonfigurasikan parameter jaringan dasar sebelum meluncurkan "
 "dukun ini."
 
-#: ../client_wizard/client.wiz_.c:33 ../dns_wizard/dns.wiz_.c:24
-#: ../postfix_wizard/postfix.wiz_.c:29 ../proxy_wizard/proxy.wiz_.c:55
-msgid "Warning:"
-msgstr "Peringatan:"
-
-#: ../db_wizard/db.wiz_.c:2
-msgid "Configuration Wizard"
-msgstr "Dukun Konfigurasi"
-
-#: ../db_wizard/db.wiz_.c:3
-msgid "MySQL Database Server"
-msgstr "Server Database MySQL"
-
-#: ../db_wizard/db.wiz_.c:4
-msgid "Please enter a username and password to add a user"
-msgstr "Masukkan namapengguna dan katasandi utk menambah pengguna"
+#: ../client_wizard/client.wiz_.c:33
+msgid "Client name"
+msgstr "Nama klien"
 
-#: ../db_wizard/db.wiz_.c:5
+#: ../db_wizard/db.wiz_.c:1
 msgid "User addition"
 msgstr "Penambahan pengguna"
 
-#: ../db_wizard/db.wiz_.c:6
+#: ../db_wizard/db.wiz_.c:2
 msgid ""
 "To accept this value, and configure your server, click on \\qConfirm\\q or "
 "use the Back button to correct them."
@@ -234,106 +222,122 @@ msgstr ""
 "Klik \\qKonfirmasi\\q utk menerima nilai ini dan mengkonfigurasikan server, "
 "atau kembali utk membetulkannya."
 
+#: ../db_wizard/db.wiz_.c:3
+msgid "Please type a password for the root user:"
+msgstr "Ketikkan katasandi pengguna root:"
+
+#: ../db_wizard/db.wiz_.c:6
+msgid "Configuring the MySQL Database Server"
+msgstr "Konfigurasi Server Database MySQL"
+
 #: ../db_wizard/db.wiz_.c:7
-msgid "The wizard successfully configured your MySQL Database Server"
-msgstr "Sang dukun sukses mengkonfigurasikan Server Database MySQL"
+msgid "Confirm"
+msgstr "Konfirmasi"
 
 #: ../db_wizard/db.wiz_.c:8
-msgid "Database Server"
-msgstr "Server Database"
+msgid "Password:"
+msgstr "Katasandi:"
 
 #: ../db_wizard/db.wiz_.c:10
-msgid "Root Password:"
-msgstr "Katasandi Root:"
+msgid "The wizard successfully configured your MySQL Database Server"
+msgstr "Sang dukun sukses mengkonfigurasikan Server Database MySQL"
 
 #: ../db_wizard/db.wiz_.c:11
-msgid "Confirm"
-msgstr "Konfirmasi"
-
-#: ../db_wizard/db.wiz_.c:12 ../ftp_wizard/ftp.wiz_.c:10
-#: ../web_wizard/web.wiz_.c:10
-msgid "Sorry, you must be root to do this..."
-msgstr "Maaf, Anda harus jadi root..."
+msgid "Username:"
+msgstr "Nama pengguna:"
 
 #: ../db_wizard/db.wiz_.c:13
-msgid "Password:"
-msgstr "Katasandi:"
+msgid "Add"
+msgstr "Tambahkan"
 
-#: ../db_wizard/db.wiz_.c:14
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"MySQL Database configuration"
-msgstr "Jika pilih sekarang, Anda akan diantar ke konfigurasi Database MySQL"
+#: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
+#: ../web_wizard/web.wiz_.c:21
+msgid "Sorry, you must be root to do this..."
+msgstr "Maaf, Anda harus jadi root..."
 
 #: ../db_wizard/db.wiz_.c:15
-msgid ""
-"This wizard will help you configuring the MySQL Database Server for your "
-"network."
-msgstr "Dukun ini membantu konfigurasi Server Database MySQL jaringan Anda."
+msgid "Database Server"
+msgstr "Server Database"
 
 #: ../db_wizard/db.wiz_.c:16
-msgid "Username:"
-msgstr "Nama pengguna:"
-
-#: ../db_wizard/db.wiz_.c:17
 msgid "Note: This user will have all permissions"
 msgstr "Catatan: Pengguna ini akan punya semua izin"
 
-#: ../db_wizard/db.wiz_.c:20
-msgid "Add"
-msgstr "Tambahkan"
-
-#: ../db_wizard/db.wiz_.c:21
-msgid "Please type a password for the root user:"
-msgstr "Ketikkan katasandi pengguna root:"
+#: ../db_wizard/db.wiz_.c:17
+msgid "MySQL Database wizard"
+msgstr "Dukun Database MySQL"
 
-#: ../db_wizard/db.wiz_.c:22
-msgid "Configuring the MySQL Database Server"
-msgstr "Konfigurasi Server Database MySQL"
+#: ../db_wizard/db.wiz_.c:19
+msgid "Configuration Wizard"
+msgstr "Dukun Konfigurasi"
 
-#: ../db_wizard/db.wiz_.c:25
+#: ../db_wizard/db.wiz_.c:20
 msgid "To run your server, you first need to specify a root password"
 msgstr "Utk menjalankan server Anda, tentukan dahulu katakunci root"
 
-#: ../db_wizard/db.wiz_.c:26
-msgid "MySQL Database wizard"
-msgstr "Dukun Database MySQL"
+#: ../db_wizard/db.wiz_.c:21
+msgid "Root Password:"
+msgstr "Katasandi Root:"
 
-#: ../db_wizard/db.wiz_.c:27
+#: ../db_wizard/db.wiz_.c:23
+msgid "MySQL Database Server"
+msgstr "Server Database MySQL"
+
+#: ../db_wizard/db.wiz_.c:24
 msgid ""
 "The wizard collected the following parameters needed to configure your MySQL "
 "Database Server"
 msgstr "Parameter konfigurasi Server Database MySQL telah terkumpul:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:1 ../dns_wizard/dns.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1
-msgid "IP addresses are a dotted list of four numbers smaller than 256."
-msgstr ""
-"Alamat IP adalah rentetan 4 bilangan yg lebih kecil dari 256 dg titik di "
-"antaranya."
+#: ../db_wizard/db.wiz_.c:25
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the MySQL Database Server for your "
+"network."
+msgstr "Dukun ini membantu konfigurasi Server Database MySQL jaringan Anda."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:2
+#: ../db_wizard/db.wiz_.c:26
+msgid "Please enter a username and password to add a user"
+msgstr "Masukkan namapengguna dan katasandi utk menambah pengguna"
+
+#: ../db_wizard/db.wiz_.c:27
 msgid ""
-"Select the range of addresses assigned to the workstations by the DHCP "
-"service; unless you have special needs, you can safely accept the proposed "
-"values."
+"If you choose to configure now, you will automatically continue with the "
+"MySQL Database configuration"
+msgstr "Jika pilih sekarang, Anda akan diantar ke konfigurasi Database MySQL"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:1
+msgid ""
+"The wizard collected the following parameters needed to configure your DHCP "
+"service:"
+msgstr "Parameter konfigurasi layanan DHCP telah terkumpul:"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
+#: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+msgid "Fix it"
+msgstr "Betulkan"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:3
+msgid "Is the server authoritative ? Ask your system administrator."
 msgstr ""
-"Pilih kisaran alamat stasiunkerja layanan DHCP; kecuali ada maksud khusus, "
-"terimalah nilai yg disarankan."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:4
-msgid "Highest IP Address:"
-msgstr "Alamat IP Tertinggi:"
+msgid "Lowest IP Address:"
+msgstr "Alamat IP Terendah:"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:5
-msgid "Range of addresses used by dhcp"
-msgstr "Kisaran alamat dhcp"
+#: ../dhcp_wizard/dhcp.wiz_.c:5 ../dns_wizard/dns.wiz_.c:3
+#: ../server_wizard/server.wiz_.c:3
+msgid "IP addresses are a dotted list of four numbers smaller than 256."
+msgstr ""
+"Alamat IP adalah rentetan 4 bilangan yg lebih kecil dari 256 dg titik di "
+"antaranya."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:6 ../dns_wizard/dns.wiz_.c:5
-#: ../firewall_wizard/firewall.wiz_.c:6 ../ftp_wizard/ftp.wiz_.c:4
-#: ../news_wizard/news.wiz_.c:7 ../postfix_wizard/postfix.wiz_.c:4
-#: ../proxy_wizard/proxy.wiz_.c:37 ../samba_wizard/samba.wiz_.c:35
-#: ../server_wizard/server.wiz_.c:33 ../web_wizard/web.wiz_.c:21
+#: ../dhcp_wizard/dhcp.wiz_.c:8 ../dns_wizard/dns.wiz_.c:6
+#: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
+#: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
+#: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:7
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -341,91 +345,80 @@ msgstr ""
 "Klik Maju utk menerima nilai dan mengkonfigurasikan server, atau Kembali utk "
 "membetulkannya."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:7
-msgid ""
-"DHCP is a service that automatically assigns networking addresses to your "
-"workstations."
-msgstr ""
-"DHCP adalah layanan otomatis pemberi alamat jaringan kepada stasiunkerja."
+#: ../dhcp_wizard/dhcp.wiz_.c:9
+msgid "DHCP Wizard"
+msgstr "Dukun DHCP"
 
-#: ../dhcp_wizard/dhcp.wiz_.c:10 ../ftp_wizard/ftp.wiz_.c:6
-#: ../news_wizard/news.wiz_.c:11 ../samba_wizard/samba.wiz_.c:39
-#: ../server_wizard/server.wiz_.c:36 ../web_wizard/web.wiz_.c:23
-msgid "Fix it"
-msgstr "Betulkan"
+#: ../dhcp_wizard/dhcp.wiz_.c:10
+#, fuzzy
+msgid "This wizard will help you configuring the DHCP services of your server."
+msgstr "Dukun ini membantu konfigurasi layanan DHCP server."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:11
+msgid "Range of addresses used by dhcp"
+msgstr "Kisaran alamat dhcp"
+
+#: ../dhcp_wizard/dhcp.wiz_.c:12
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Layanan DHCP server sukses dikonfigurasikan."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:13
-msgid "This wizard will help you configuring the DHCP services of your server."
-msgstr "Dukun ini membantu konfigurasi layanan DHCP server."
-
-#: ../dhcp_wizard/dhcp.wiz_.c:16
 msgid ""
-"The wizard collected the following parameters needed to configure your DHCP "
-"service:"
-msgstr "Parameter konfigurasi layanan DHCP telah terkumpul:"
-
-#: ../dhcp_wizard/dhcp.wiz_.c:17
-msgid "Lowest IP Address:"
-msgstr "Alamat IP Terendah:"
+"Select the range of addresses assigned to the workstations by the DHCP "
+"service; unless you have special needs, you can safely accept the proposed "
+"values."
+msgstr ""
+"Pilih kisaran alamat stasiunkerja layanan DHCP; kecuali ada maksud khusus, "
+"terimalah nilai yg disarankan."
 
-#: ../dhcp_wizard/dhcp.wiz_.c:18
-msgid "DHCP Configuration Wizard"
-msgstr "Dukun Konfigurasi DHCP"
+#: ../dhcp_wizard/dhcp.wiz_.c:16
+msgid "The IP range specified is not correct"
+msgstr "Kisaran IP tak benar"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:19
-msgid "Is the server authoritative ? Ask your system administrator."
+msgid ""
+"DHCP is a service that automatically assigns networking addresses to your "
+"workstations."
 msgstr ""
+"DHCP adalah layanan otomatis pemberi alamat jaringan kepada stasiunkerja."
 
 #: ../dhcp_wizard/dhcp.wiz_.c:20
-msgid "The IP range specified is not correct"
-msgstr "Kisaran IP tak benar"
+msgid "Highest IP Address:"
+msgstr "Alamat IP Tertinggi:"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:21
-msgid "DHCP Wizard"
-msgstr "Dukun DHCP"
+msgid "DHCP Configuration Wizard"
+msgstr "Dukun Konfigurasi DHCP"
 
 #: ../dhcp_wizard/dhcp.wiz_.c:22
 msgid "Configuring the DHCP Server"
 msgstr "Konfigurasi Server DHCP"
 
+#: ../dns_wizard/dns.wiz_.c:1
+msgid ""
+"Your setting could be accepted, but you will not be able to identify machine "
+"names outside your local network."
+msgstr ""
+"Setting Anda dapat diterima, tapi Anda takkan dapat mengidentifikasi nama "
+"mesin di luar jaringan lokal Anda."
+
 #: ../dns_wizard/dns.wiz_.c:2
-#, fuzzy
-msgid "DNS Wizard (configuration)"
-msgstr "Dukun Konfigurasi DNS"
+msgid "Press next to leave these values empty, or back to enter a value."
+msgstr "Tekan Maju utk membiarkan nilai ini kosong, atau Kembali utk mengisi."
 
-#: ../dns_wizard/dns.wiz_.c:8
-msgid ""
-"The wizard collected the following parameters needed to configure your DNS "
-"service:"
-msgstr "Parameter konfigurasi layanan DNS telah terkumpul:"
+#: ../dns_wizard/dns.wiz_.c:7
+msgid "Primary DNS Address:"
+msgstr "Alamat DNS Primer:"
 
 #: ../dns_wizard/dns.wiz_.c:9
 msgid "Configuring the DNS Server"
 msgstr "Konfigurasi Server DNS"
 
 #: ../dns_wizard/dns.wiz_.c:10
-msgid "Secondary DNS Address:"
-msgstr "Alamat DNS Sekunder:"
+msgid "DNS Configuration Wizard"
+msgstr "Dukun Konfigurasi DNS"
 
 #: ../dns_wizard/dns.wiz_.c:11
-msgid "DNS Server Addresses"
-msgstr "Alamat Server DNS"
-
-#: ../dns_wizard/dns.wiz_.c:13
-msgid ""
-"This wizard will help you configuring the DNS services of your server. This "
-"configuration will provide a local DNS service for local computers names, "
-"with non-local requests forwarded to an outside DNS."
-msgstr ""
-"Dukun ini membantu konfigurasi layanan DNS server Anda. Konfigurasi ini akan "
-"memberikan layanan DNS lokal utk nama komputer lokal, permintaan non-lokal "
-"diteruskan ke DNS luar."
-
-#: ../dns_wizard/dns.wiz_.c:14
 msgid ""
 "DNS will allow your network to communicate with the Internet using standard "
 "internet host names.  In order to configure DNS, you must provide the IP "
@@ -437,41 +430,51 @@ msgstr ""
 "primer dan sekunder; biasanya alamat ini diberikan oleh provider Internet "
 "Anda."
 
-#: ../dns_wizard/dns.wiz_.c:15
+#: ../dns_wizard/dns.wiz_.c:12
+msgid "The wizard successfully configured the DNS services of your server."
+msgstr "Layanan DNS server Anda sukses dikonfigurasikan."
+
+#: ../dns_wizard/dns.wiz_.c:13
 msgid "You have entered an empty address for the DNS server."
 msgstr "Alamat server DNS kosong."
 
+#: ../dns_wizard/dns.wiz_.c:14
+msgid ""
+"The wizard collected the following parameters needed to configure your DNS "
+"service:"
+msgstr "Parameter konfigurasi layanan DNS telah terkumpul:"
+
 #: ../dns_wizard/dns.wiz_.c:16
-msgid "Press next to leave these values empty, or back to enter a value."
-msgstr "Tekan Maju utk membiarkan nilai ini kosong, atau Kembali utk mengisi."
+msgid "DNS Server Addresses"
+msgstr "Alamat Server DNS"
 
 #: ../dns_wizard/dns.wiz_.c:17
-msgid "DNS Configuration Wizard"
-msgstr "Dukun Konfigurasi DNS"
-
-#: ../dns_wizard/dns.wiz_.c:18
-msgid "Primary DNS Address:"
-msgstr "Alamat DNS Primer:"
-
-#: ../dns_wizard/dns.wiz_.c:20
 msgid ""
-"Your setting could be accepted, but you will not be able to identify machine "
-"names outside your local network."
+"DNS (Domain Name Server) is the service that maps an IP address of a machine "
+"with an internet host name."
 msgstr ""
-"Setting Anda dapat diterima, tapi Anda takkan dapat mengidentifikasi nama "
-"mesin di luar jaringan lokal Anda."
+"DNS (Domain Name Server) adalah layanan korespondensi mesin dg nama host "
+"internet."
+
+#: ../dns_wizard/dns.wiz_.c:20
+msgid "Secondary DNS Address:"
+msgstr "Alamat DNS Sekunder:"
 
 #: ../dns_wizard/dns.wiz_.c:22
+#, fuzzy
 msgid ""
-"DNS (Domain Name Server) is the service that puts in correspondence a "
-"machine with an internet host name."
+"This wizard will help you configuring the DNS services of your server. This "
+"configuration will provide a local DNS service for local computers names, "
+"with non-local requests forwarded to an outside DNS."
 msgstr ""
-"DNS (Domain Name Server) adalah layanan korespondensi mesin dg nama host "
-"internet."
+"Dukun ini membantu konfigurasi layanan DNS server Anda. Konfigurasi ini akan "
+"memberikan layanan DNS lokal utk nama komputer lokal, permintaan non-lokal "
+"diteruskan ke DNS luar."
 
 #: ../dns_wizard/dns.wiz_.c:23
-msgid "The wizard successfully configured the DNS services of your server."
-msgstr "Layanan DNS server Anda sukses dikonfigurasikan."
+#, fuzzy
+msgid "DNS Wizard (configuration)"
+msgstr "Dukun Konfigurasi DNS"
 
 #: ../drakwizard.pl_.c:62
 msgid "Drakwizard wizard selection"
@@ -482,62 +485,65 @@ msgid "Please select a wizard"
 msgstr "Pilih dukun"
 
 #: ../firewall_wizard/firewall.wiz_.c:1
-msgid "Device"
-msgstr "Perangkat"
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr "Menengah - web, ftp dan ssh tampak di luar"
 
-#: ../firewall_wizard/firewall.wiz_.c:2
+#: ../firewall_wizard/firewall.wiz_.c:3
 msgid "Strong - no outside visibility, users limited to web"
 msgstr "Kuat - tiada visibilitas luar, pengguna dibatasi ke web"
 
-#: ../firewall_wizard/firewall.wiz_.c:3 ../news_wizard/news.wiz_.c:2
-#: ../proxy_wizard/proxy.wiz_.c:7 ../samba_wizard/samba.wiz_.c:4
-msgid "Something terrible happened"
-msgstr "Hal menyusahkan telah terjadi"
-
 #: ../firewall_wizard/firewall.wiz_.c:5
-msgid "Firewall Configuration Wizard"
-msgstr "Dukun Konfigurasi Tembok Api"
+msgid ""
+"The wizard collected the following parameters needed to configure your "
+"firewall:"
+msgstr "Parameter konfigurasi tembok api telah terkumpul:"
+
+#: ../firewall_wizard/firewall.wiz_.c:6
+msgid ""
+"The firewall protects your internal network from unauthorized accesses from "
+"the Internet."
+msgstr "Tembok api menjaga jaringan internal Anda dari akses liar Internet."
 
 #: ../firewall_wizard/firewall.wiz_.c:7
-msgid "Internet Network Device:"
-msgstr "Perangkat Jaringan Internet:"
+msgid "Device"
+msgstr "Perangkat"
 
-#: ../firewall_wizard/firewall.wiz_.c:9 ../samba_wizard/samba.wiz_.c:37
-#: ../server_wizard/server.wiz_.c:35
-msgid "Fix It"
-msgstr "Betulkan"
+#: ../firewall_wizard/firewall.wiz_.c:8
+msgid "Firewall wizard"
+msgstr "Dukun tembok api"
+
+#: ../firewall_wizard/firewall.wiz_.c:9
+msgid "None - No protection"
+msgstr "Nihil - Tanpa proteksi"
 
 #: ../firewall_wizard/firewall.wiz_.c:10
-msgid "Protection Level:"
-msgstr "Tingkat Proteksi:"
+msgid "Internet Network Device:"
+msgstr "Perangkat Jaringan Internet:"
 
 #: ../firewall_wizard/firewall.wiz_.c:11
-msgid "Firewall wizard"
-msgstr "Dukun tembok api"
+msgid ""
+"The firewall can be configured to offer different levels of protection; "
+"choose the level that corresponds to your needs.  If you don't know, the "
+"Medium level is usually the most appropriate."
+msgstr ""
+"Tembok api dapat dikonfigurasikan utk menyediakan tingkat proteksi berbeda; "
+"pilihlah sesuai kebutuhan. Jika tak tahu, tingkat Menengah biasanya paling "
+"cocok."
 
 #: ../firewall_wizard/firewall.wiz_.c:12
-msgid "The wizard successfully configured your server firewall."
-msgstr "Tembok api server Anda sukses dikonfigurasikan."
-
-#: ../firewall_wizard/firewall.wiz_.c:13
-msgid "Medium - web, ftp and ssh shown to outside"
-msgstr "Menengah - web, ftp dan ssh tampak di luar"
+msgid "The device name is not correct"
+msgstr "Nama perangkat tak benar"
 
-#: ../firewall_wizard/firewall.wiz_.c:14
-msgid "Protection Level"
-msgstr "Tingkat Proteksi"
+#: ../firewall_wizard/firewall.wiz_.c:13 ../samba_wizard/samba.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:42
+msgid "Fix It"
+msgstr "Betulkan"
 
-#: ../firewall_wizard/firewall.wiz_.c:15 ../news_wizard/news.wiz_.c:14
-#: ../proxy_wizard/proxy.wiz_.c:41 ../samba_wizard/samba.wiz_.c:42
-#: ../server_wizard/server.wiz_.c:43
-msgid "Exit"
-msgstr "Keluar"
+#: ../firewall_wizard/firewall.wiz_.c:15
+msgid "Firewall Configuration Wizard"
+msgstr "Dukun Konfigurasi Tembok Api"
 
 #: ../firewall_wizard/firewall.wiz_.c:16
-msgid "The device name is not correct"
-msgstr "Nama perangkat tak benar"
-
-#: ../firewall_wizard/firewall.wiz_.c:17
 msgid ""
 "The firewall needs to know how your server is connected to Internet; choose "
 "the device you are using for the external connection."
@@ -545,145 +551,136 @@ msgstr ""
 "Tembok api harus tahu cara server Anda terhubung ke Internet; pilih "
 "perangkat yg Anda pakai utk koneksi external."
 
-#: ../firewall_wizard/firewall.wiz_.c:18
-msgid ""
-"The firewall protects your internal network from unauthorized accesses from "
-"the Internet."
-msgstr "Tembok api menjaga jaringan internal Anda dari akses liar Internet."
+#: ../firewall_wizard/firewall.wiz_.c:17
+msgid "Protection Level"
+msgstr "Tingkat Proteksi"
 
-#: ../firewall_wizard/firewall.wiz_.c:20
-msgid "Configuring the Firewall"
-msgstr "Konfigurasi Tembok Api"
+#: ../firewall_wizard/firewall.wiz_.c:18 ../news_wizard/news.wiz_.c:18
+#: ../proxy_wizard/proxy.wiz_.c:26 ../samba_wizard/samba.wiz_.c:21
+msgid "Something terrible happened"
+msgstr "Hal menyusahkan telah terjadi"
+
+#: ../firewall_wizard/firewall.wiz_.c:19
+msgid "Firewall Network Device"
+msgstr "Perangkat Jaringan Tembok Api"
 
 #: ../firewall_wizard/firewall.wiz_.c:21
-msgid "None - No protection"
-msgstr "Nihil - Tanpa proteksi"
+msgid "The wizard successfully configured your server firewall."
+msgstr "Tembok api server Anda sukses dikonfigurasikan."
 
 #: ../firewall_wizard/firewall.wiz_.c:22
-msgid "This wizard will help you configuring your server firewall."
-msgstr "Dukun ini membantu konfigurasi tembok api server Anda."
+msgid "Configuring the Firewall"
+msgstr "Konfigurasi Tembok Api"
 
-#: ../firewall_wizard/firewall.wiz_.c:23
-msgid "Low - Light filtering, standard services available"
-msgstr "Rendah - Filter ringan, layanan standar tersedia"
+#: ../firewall_wizard/firewall.wiz_.c:23 ../news_wizard/news.wiz_.c:23
+#: ../proxy_wizard/proxy.wiz_.c:51 ../samba_wizard/samba.wiz_.c:55
+#: ../server_wizard/server.wiz_.c:51
+msgid "Exit"
+msgstr "Keluar"
 
 #: ../firewall_wizard/firewall.wiz_.c:24
-msgid "Firewall Network Device"
-msgstr "Perangkat Jaringan Tembok Api"
+#, fuzzy
+msgid "This wizard will help you configuring your server firewall."
+msgstr "Dukun ini membantu konfigurasi tembok api server Anda."
 
 #: ../firewall_wizard/firewall.wiz_.c:25
-msgid ""
-"The wizard collected the following parameters needed to configure your "
-"firewall:"
-msgstr "Parameter konfigurasi tembok api telah terkumpul:"
+msgid "Low - Light filtering, standard services available"
+msgstr "Rendah - Filter ringan, layanan standar tersedia"
 
 #: ../firewall_wizard/firewall.wiz_.c:26
-msgid ""
-"The firewall can be configured to offer different levels of protection; "
-"choose the level that corresponds to your needs.  If you don't know, the "
-"Medium level is usually the most appropriate."
-msgstr ""
-"Tembok api dapat dikonfigurasikan utk menyediakan tingkat proteksi berbeda; "
-"pilihlah sesuai kebutuhan. Jika tak tahu, tingkat Menengah biasanya paling "
-"cocok."
-
-#: ../ftp_wizard/ftp.wiz_.c:1
-msgid "Select the kind of FTP service you want to activate:"
-msgstr "Pilih jenis layanan FTP yg ingin diaktifkan:"
-
-#: ../ftp_wizard/ftp.wiz_.c:2 ../samba_wizard/samba.wiz_.c:30
-#: ../web_wizard/web.wiz_.c:18
-msgid "The path you entered does not exist."
-msgstr ""
-
-#: ../ftp_wizard/ftp.wiz_.c:7
-msgid "Internet FTP Server:"
-msgstr "Server FTP Internet:"
-
-#: ../ftp_wizard/ftp.wiz_.c:8
-msgid ""
-"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."
+msgid "Protection Level:"
+msgstr "Tingkat Proteksi:"
 
-#: ../ftp_wizard/ftp.wiz_.c:11
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
-msgstr "Server FTP Intranet/Internet sukses dikonfigurasikan"
+#: ../ftp_wizard/ftp.wiz_.c:2
+#, fuzzy
+msgid "This wizard will help you configuring the FTP Server for your network."
+msgstr "Dukun ini membantu konfigurasi Server FTP jaringan Anda."
 
-#: ../ftp_wizard/ftp.wiz_.c:12
+#: ../ftp_wizard/ftp.wiz_.c:3
 #, fuzzy
 msgid "Public directory:"
 msgstr "Direktori:"
 
-#: ../ftp_wizard/ftp.wiz_.c:14 ../samba_wizard/samba.wiz_.c:16
-msgid "Type the path of the directory you want being shared."
-msgstr ""
+#: ../ftp_wizard/ftp.wiz_.c:4
+msgid "Internet FTP Server:"
+msgstr "Server FTP Internet:"
 
-#: ../ftp_wizard/ftp.wiz_.c:15
+#: ../ftp_wizard/ftp.wiz_.c:6
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Aktifkan Server FTP utk Intranet"
 
-#: ../ftp_wizard/ftp.wiz_.c:17
-msgid ""
-"The wizard collected the following parameters needed to configure your FTP "
-"Server"
-msgstr "Parameter konfigurasi Server FTP telah terkumpul"
-
-#: ../ftp_wizard/ftp.wiz_.c:18
+#: ../ftp_wizard/ftp.wiz_.c:7
 msgid "FTP wizard"
 msgstr "Dukun FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:19
-msgid "This wizard will help you configuring the FTP Server for your network."
-msgstr "Dukun ini membantu konfigurasi Server FTP jaringan Anda."
+#: ../ftp_wizard/ftp.wiz_.c:10
+msgid "FTP Server"
+msgstr "Server FTP"
+
+#: ../ftp_wizard/ftp.wiz_.c:11
+msgid "Don't check any box if you don't want to activate your FTP Server."
+msgstr "Jangan tandai kotak jika Anda tak ingin mengaktifkan Server FTP."
+
+#: ../ftp_wizard/ftp.wiz_.c:12
+msgid "Configuring the FTP Server"
+msgstr "Konfigurasi Server FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:20
+#: ../ftp_wizard/ftp.wiz_.c:13
 msgid "Enable the FTP Server for the Internet"
 msgstr "Aktifkan Server FTP Internet"
 
-#: ../ftp_wizard/ftp.wiz_.c:21
+#: ../ftp_wizard/ftp.wiz_.c:14
 msgid "Intranet FTP Server:"
 msgstr "Server FTP Intranet:"
 
-#: ../ftp_wizard/ftp.wiz_.c:22
-msgid "FTP Server Configuration Wizard"
-msgstr "Dukun Konfigurasi Server FTP"
+#: ../ftp_wizard/ftp.wiz_.c:15
+msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgstr "Server FTP Intranet/Internet sukses dikonfigurasikan"
 
-#: ../ftp_wizard/ftp.wiz_.c:23
-msgid "Configuring the FTP Server"
-msgstr "Konfigurasi Server FTP"
+#: ../ftp_wizard/ftp.wiz_.c:16
+msgid "Select the kind of FTP service you want to activate:"
+msgstr "Pilih jenis layanan FTP yg ingin diaktifkan:"
+
+#: ../ftp_wizard/ftp.wiz_.c:20 ../samba_wizard/samba.wiz_.c:18
+msgid "Shared directory:"
+msgstr ""
+
+#: ../ftp_wizard/ftp.wiz_.c:21
+msgid ""
+"The wizard collected the following parameters needed to configure your FTP "
+"Server"
+msgstr "Parameter konfigurasi Server FTP telah terkumpul"
+
+#: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:23
+msgid "The path you entered does not exist."
+msgstr ""
 
 #: ../ftp_wizard/ftp.wiz_.c:24
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr "Jangan tandai kotak jika Anda tak ingin mengaktifkan Server FTP."
+msgid "FTP Server Configuration Wizard"
+msgstr "Dukun Konfigurasi Server FTP"
 
-#: ../ftp_wizard/ftp.wiz_.c:25
-msgid "FTP Server"
-msgstr "Server FTP"
+#: ../ftp_wizard/ftp.wiz_.c:25 ../samba_wizard/samba.wiz_.c:60
+msgid "Type the path of the directory you want being shared."
+msgstr ""
 
-#: ../ftp_wizard/ftp.wiz_.c:26 ../samba_wizard/samba.wiz_.c:59
-msgid "Shared dir:"
+#: ../ftp_wizard/ftp.wiz_.c:26
+msgid ""
+"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."
 
 #: ../news_wizard/news.wiz_.c:1
-msgid "News Server Name:"
-msgstr "Nama Server Berita:"
+msgid "Polling Interval:"
+msgstr "Interval Polling:"
 
 #: ../news_wizard/news.wiz_.c:3
-msgid "Welcome to the News Wizard"
-msgstr "Selamat Datang di Dukun Berita"
-
-#: ../news_wizard/news.wiz_.c:5
-msgid "Polling Period (Hours):"
-msgstr "Jangka Waktu Polling (Jam):"
-
-#: ../news_wizard/news.wiz_.c:6
-msgid "News Server"
-msgstr "Server Berita"
+msgid "Polling Period"
+msgstr "Jangka Waktu Polling"
 
-#: ../news_wizard/news.wiz_.c:9
+#: ../news_wizard/news.wiz_.c:4
 msgid ""
 "Your server will regularly poll the News Server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
@@ -693,29 +690,30 @@ msgstr ""
 "Berita Internet terbaru; jangka waktu polling adalah interval antara dua "
 "polling berurutan."
 
+#: ../news_wizard/news.wiz_.c:5
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet News services for your "
+"network."
+msgstr "Dukun ini membantu konfigurasi layanan Berita Internet jaringan Anda."
+
+#: ../news_wizard/news.wiz_.c:7
+msgid "News Wizard"
+msgstr "Dukun Berita"
+
+#: ../news_wizard/news.wiz_.c:9
+msgid "The polling period is not correct"
+msgstr "Jangka waktu polling tak benar"
+
 #: ../news_wizard/news.wiz_.c:10
 msgid "The news server name is not correct"
 msgstr "Server berita tak benar"
 
-#: ../news_wizard/news.wiz_.c:12
-msgid "Polling Interval:"
-msgstr "Interval Polling:"
-
-#: ../news_wizard/news.wiz_.c:13
-msgid ""
-"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
-"example, if your provider is \\qprovider.com\\q, the internet news server is "
-"usually \\qnews.provider.com\\q."
-msgstr ""
-"Nama host Internet harus dalam bentuk \\qhost.domain.tipedomain\\q; misalnya "
-"jika provider Anda \\qprovider.com\\q, server berita internet biasanya "
-"\\qnews.provider.com\\q."
-
-#: ../news_wizard/news.wiz_.c:15
-msgid "Polling Period"
-msgstr "Jangka Waktu Polling"
+#: ../news_wizard/news.wiz_.c:11
+msgid "Configuring the Internet News"
+msgstr "Konfigurasi Berita Internet"
 
-#: ../news_wizard/news.wiz_.c:16
+#: ../news_wizard/news.wiz_.c:12
 msgid ""
 "Depending on the kind of internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
@@ -723,15 +721,7 @@ msgstr ""
 "Jangka waktu polling yg tepat adalah antara 6 dan 24 jam, tergantung jenis "
 "koneksi internet Anda."
 
-#: ../news_wizard/news.wiz_.c:17
-msgid "The polling period is not correct"
-msgstr "Jangka waktu polling tak benar"
-
-#: ../news_wizard/news.wiz_.c:18
-msgid "News Server:"
-msgstr "Server Berita:"
-
-#: ../news_wizard/news.wiz_.c:19
+#: ../news_wizard/news.wiz_.c:13
 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."
@@ -739,62 +729,56 @@ msgstr ""
 "Nama server berita adalah nama host penyebar berita Internet jaringan Anda; "
 "biasanya nama ini disediakan oleh provider Anda."
 
-#: ../news_wizard/news.wiz_.c:21
+#: ../news_wizard/news.wiz_.c:15
+msgid ""
+"The wizard successfully configured your Internet News service of your server."
+msgstr "Layanan Berita Internet server Anda sukses dikonfigurasikan."
+
+#: ../news_wizard/news.wiz_.c:16
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet News Service:"
 msgstr "Parameter konfigurasi Layanan Berita Internet telah terkumpul:"
 
-#: ../news_wizard/news.wiz_.c:22
-msgid ""
-"This wizard will help you configuring the Internet News services for your "
-"network."
-msgstr "Dukun ini membantu konfigurasi layanan Berita Internet jaringan Anda."
-
-#: ../news_wizard/news.wiz_.c:23
-msgid "Configuring the Internet News"
-msgstr "Konfigurasi Berita Internet"
-
-#: ../news_wizard/news.wiz_.c:24
-msgid ""
-"The wizard successfully configured your Internet News service of your server."
-msgstr "Layanan Berita Internet server Anda sukses dikonfigurasikan."
+#: ../news_wizard/news.wiz_.c:17
+msgid "Polling Period (Hours):"
+msgstr "Jangka Waktu Polling (Jam):"
 
-#: ../news_wizard/news.wiz_.c:25
-msgid "News Wizard"
-msgstr "Dukun Berita"
+#: ../news_wizard/news.wiz_.c:19
+msgid "News Server Name:"
+msgstr "Nama Server Berita:"
 
-#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:6
+#: ../news_wizard/news.wiz_.c:20
 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."
+"Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
+"example, if your provider is \\qprovider.com\\q, the internet news server is "
+"usually \\qnews.provider.com\\q."
 msgstr ""
-"Pilih tingkat sesuai kebutuhan. Jika tak tahu, tingkat Jaringan Lokal "
-"biasanya paling cocok. Awas, SEMUA TINGKAT MUNGKIN TAK AMAN."
+"Nama host Internet harus dalam bentuk \\qhost.domain.tipedomain\\q; misalnya "
+"jika provider Anda \\qprovider.com\\q, server berita internet biasanya "
+"\\qnews.provider.com\\q."
 
-#: ../nfs_wizard/nfs.wiz_.c:3
-msgid "NFS Server Configuration Wizard"
-msgstr "Dukun Konfigurasi Server NFS"
+#: ../news_wizard/news.wiz_.c:22
+msgid "Welcome to the News Wizard"
+msgstr "Selamat Datang di Dukun Berita"
 
-#: ../nfs_wizard/nfs.wiz_.c:4
-msgid "Netmask :"
-msgstr ""
+#: ../news_wizard/news.wiz_.c:24
+msgid "News Server"
+msgstr "Server Berita"
 
-#: ../nfs_wizard/nfs.wiz_.c:5
-msgid "NFS Server"
-msgstr "Server NFS"
+#: ../news_wizard/news.wiz_.c:25
+msgid "News Server:"
+msgstr "Server Berita:"
 
-#: ../nfs_wizard/nfs.wiz_.c:6
-msgid "The wizard successfully configured your NFS Server"
-msgstr "Server NFS sukses dikonfigurasikan"
+#: ../nfs_wizard/nfs.wiz_.c:1 ../proxy_wizard/proxy.wiz_.c:33
+msgid "Authorized network:"
+msgstr "Jaringan berizin:"
 
-#: ../nfs_wizard/nfs.wiz_.c:8 ../proxy_wizard/proxy.wiz_.c:12
-#: ../samba_wizard/samba.wiz_.c:10
-msgid "All - No access restriction"
-msgstr "Semua - Tanpa batasan akses"
+#: ../nfs_wizard/nfs.wiz_.c:2 ../proxy_wizard/proxy.wiz_.c:32
+msgid "Access Control"
+msgstr "Kontrol Akses"
 
-#: ../nfs_wizard/nfs.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:13
+#: ../nfs_wizard/nfs.wiz_.c:3 ../proxy_wizard/proxy.wiz_.c:2
 msgid ""
 "Access will be allowed for hosts on the network. Here is the information "
 "found about your current local network, you can modify it if needed."
@@ -802,115 +786,153 @@ msgstr ""
 "Akses diizinkan utk host di jaringan. Berikut adalah info jaringan lokal "
 "Anda, ubah seperlunya."
 
-#: ../nfs_wizard/nfs.wiz_.c:10 ../proxy_wizard/proxy.wiz_.c:14
-msgid "Access Control"
-msgstr "Kontrol Akses"
-
-#: ../nfs_wizard/nfs.wiz_.c:11
-msgid "This wizard will help you configuring the NFS Server for your network."
-msgstr "Dukun ini membantu konfigurasi Server NFS jaringan Anda."
+#: ../nfs_wizard/nfs.wiz_.c:4
+#, fuzzy
+msgid "Access :"
+msgstr "Kontrol Akses:"
 
-#: ../nfs_wizard/nfs.wiz_.c:12 ../proxy_wizard/proxy.wiz_.c:19
+#: ../nfs_wizard/nfs.wiz_.c:6 ../proxy_wizard/proxy.wiz_.c:7
 msgid "Local Network - access for local network (recommended)"
 msgstr "Jaringan Lokal - akses utk jaringan lokal (disarankan)"
 
-#: ../nfs_wizard/nfs.wiz_.c:13
-msgid "NFS can be restricted to a certain ip class"
+#: ../nfs_wizard/nfs.wiz_.c:7 ../proxy_wizard/proxy.wiz_.c:12
+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."
 
-#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:44
-msgid "Authorised network:"
-msgstr "Jaringan berizin:"
-
-#: ../nfs_wizard/nfs.wiz_.c:15
+#: ../nfs_wizard/nfs.wiz_.c:8
 msgid "Exported dir:"
 msgstr ""
 
-#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:45
+#: ../nfs_wizard/nfs.wiz_.c:9
+#, fuzzy
+msgid "The wizard collected the following parameters."
+msgstr "Parameter konfigurasi Samba telah terkumpul."
+
+#: ../nfs_wizard/nfs.wiz_.c:10
+msgid "NFS Server Configuration Wizard"
+msgstr "Dukun Konfigurasi Server NFS"
+
+#: ../nfs_wizard/nfs.wiz_.c:11
+msgid "NFS can be restricted to a certain ip class"
+msgstr ""
+
+#: ../nfs_wizard/nfs.wiz_.c:13
+msgid "NFS Wizard"
+msgstr "Dukun NFS"
+
+#: ../nfs_wizard/nfs.wiz_.c:14 ../proxy_wizard/proxy.wiz_.c:23
 msgid "Grant access on local network"
 msgstr "Pemberian akses di jaringan lokal"
 
+#: ../nfs_wizard/nfs.wiz_.c:15
+msgid "NFS Server"
+msgstr "Server NFS"
+
+#: ../nfs_wizard/nfs.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:47
+#: ../samba_wizard/samba.wiz_.c:51
+msgid "All - No access restriction"
+msgstr "Semua - Tanpa batasan akses"
+
 #: ../nfs_wizard/nfs.wiz_.c:18
-#, fuzzy
-msgid "The wizard collected the following parameters."
-msgstr "Parameter konfigurasi Samba telah terkumpul."
+msgid "Netmask :"
+msgstr ""
 
 #: ../nfs_wizard/nfs.wiz_.c:19
-#, fuzzy
-msgid "Access :"
-msgstr "Kontrol Akses:"
-
-#: ../nfs_wizard/nfs.wiz_.c:20
 msgid "Directory:"
 msgstr "Direktori:"
 
+#: ../nfs_wizard/nfs.wiz_.c:20
+#, fuzzy
+msgid "This wizard will help you configuring the NFS Server for your network."
+msgstr "Dukun ini membantu konfigurasi Server NFS jaringan Anda."
+
 #: ../nfs_wizard/nfs.wiz_.c:21
-msgid "NFS Wizard"
-msgstr "Dukun NFS"
+msgid "The wizard successfully configured your NFS Server"
+msgstr "Server NFS sukses dikonfigurasikan"
 
-#: ../postfix_wizard/postfix.wiz_.c:1
-msgid "Do It"
-msgstr "Laksanakan"
+#: ../postfix_wizard/postfix.wiz_.c:2
+#, fuzzy
+msgid "There seems to be a problem..."
+msgstr "Ada masalah... tanyalah kepada orang hitam besar di bawah tangga"
 
 #: ../postfix_wizard/postfix.wiz_.c:3
-msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\\qFrom:\\q and \\qReply-to\\q field."
-msgstr ""
-"Anda dapat memilih jenis alamat yg tampak di kolom \\qFrom:\\q dan \\qReply-"
-"to\\q mail keluar."
+msgid "Internet Mail Gateway"
+msgstr "Gateway Mail Internet"
 
 #: ../postfix_wizard/postfix.wiz_.c:5
-msgid "Configuring the Internet Mail"
-msgstr "Konfigurasi Mail Internet"
+msgid "Outgoing Mail Address"
+msgstr "Alamat Mail Keluar"
 
 #: ../postfix_wizard/postfix.wiz_.c:6
-msgid "Postfix wizard"
-msgstr "Dukun Postfix"
+msgid ""
+"The wizard successfully configured your Internet Mail service of your server."
+msgstr "Layanan Mail Internet server Anda sukses dikonfigurasikan."
 
 #: ../postfix_wizard/postfix.wiz_.c:7
-msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
-msgstr ""
-"Server Anda akan mengirim mail keluar via gateway mail, yg bertanggung jawab "
-"atas pengiriman akhir."
+msgid "Do It"
+msgstr "Laksanakan"
 
 #: ../postfix_wizard/postfix.wiz_.c:8
 msgid ""
-"This wizard will help you configuring the Internet Mail services for your "
-"network."
-msgstr "Dukun ini membantu konfigurasi layanan Mail Internet jaringan Anda."
-
-#: ../postfix_wizard/postfix.wiz_.c:9
-msgid "Outgoing Mail Address"
-msgstr "Alamat Mail Keluar"
-
-#: ../postfix_wizard/postfix.wiz_.c:10
-msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
 msgstr "Ini harus dipilih konsisten dg alamat yg Anda pakai utk mail masuk."
 
+#: ../postfix_wizard/postfix.wiz_.c:10
+msgid "Hmmm"
+msgstr "Hmmm"
+
 #: ../postfix_wizard/postfix.wiz_.c:11
-msgid "There seems to be a problem... go ask to the big black man downstairs"
-msgstr "Ada masalah... tanyalah kepada orang hitam besar di bawah tangga"
+msgid "You entered an empty address for the mail gateway."
+msgstr "Anda memasukkan alamat kosong utk gateway mail."
 
 #: ../postfix_wizard/postfix.wiz_.c:12
-msgid "Masquerade not good!"
-msgstr "Topeng tak bagus!"
+msgid "Internet Mail Configuration Wizard"
+msgstr "Dukun Konfigurasi Mail Internet"
 
 #: ../postfix_wizard/postfix.wiz_.c:13
+msgid "Postfix wizard"
+msgstr "Dukun Postfix"
+
+#: ../postfix_wizard/postfix.wiz_.c:14
+msgid "Mail Server Name:"
+msgstr "Nama Server Mail:"
+
+#: ../postfix_wizard/postfix.wiz_.c:15
+msgid ""
+"Your choice can be accepted, but this will not allow you to send mail "
+"outside your local network. Press next to continue, or back to enter a value."
+msgstr ""
+"Pilihan Anda dapat diterima, tapi Anda takkan dapat mengirim mail ke luar "
+"jaringan lokal. Tekan Maju utk melanjutkan, atau Kembali utk mengisi nilai."
+
+#: ../postfix_wizard/postfix.wiz_.c:17
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Internet Mail services for your "
+"network."
+msgstr "Dukun ini membantu konfigurasi layanan Mail Internet jaringan Anda."
+
+#: ../postfix_wizard/postfix.wiz_.c:18
+msgid ""
+"Your server will send the outgoing through a mail gateway, that will take "
+"care of the final delivery."
+msgstr ""
+"Server Anda akan mengirim mail keluar via gateway mail, yg bertanggung jawab "
+"atas pengiriman akhir."
+
+#: ../postfix_wizard/postfix.wiz_.c:19
 msgid ""
 "If you choose to configure now, you will automatically continue with the "
 "POSTFIX configuration"
 msgstr "Jika pilih sekarang, Anda akan diantar ke konfigurasi POSTFIX"
 
-#: ../postfix_wizard/postfix.wiz_.c:14
-msgid "Form of the Address"
-msgstr "Format Alamat"
-
-#: ../postfix_wizard/postfix.wiz_.c:15
+#: ../postfix_wizard/postfix.wiz_.c:20
 msgid ""
 "Internet host names must be in the form \\qhost.domain.domaintype\\q; for "
 "example, if your provider is \\qprovider.com\\q, the internet mail server is "
@@ -920,78 +942,72 @@ msgstr ""
 "jika provider Anda \\qprovider.com\\q, server mail internet biasanya \\qsmtp."
 "provider.com\\q."
 
-#: ../postfix_wizard/postfix.wiz_.c:18
-msgid "Internet Mail Configuration Wizard"
-msgstr "Dukun Konfigurasi Mail Internet"
+#: ../postfix_wizard/postfix.wiz_.c:21
+msgid ""
+"You can select the kind of address that outgoing mail will show in the "
+"\\qFrom:\\q and \\qReply-to\\q field."
+msgstr ""
+"Anda dapat memilih jenis alamat yg tampak di kolom \\qFrom:\\q dan \\qReply-"
+"to\\q mail keluar."
 
-#: ../postfix_wizard/postfix.wiz_.c:19
+#: ../postfix_wizard/postfix.wiz_.c:23
+msgid "Configuring the Internet Mail"
+msgstr "Konfigurasi Mail Internet"
+
+#: ../postfix_wizard/postfix.wiz_.c:25
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
 msgstr "Parameter konfigurasi Layanan Mail Internet telah terkumpul:"
 
-#: ../postfix_wizard/postfix.wiz_.c:20
+#: ../postfix_wizard/postfix.wiz_.c:26
+msgid "Masquerade not good!"
+msgstr "Topeng tak bagus!"
+
+#: ../postfix_wizard/postfix.wiz_.c:28
+msgid "Form of the Address"
+msgstr "Format Alamat"
+
+#: ../postfix_wizard/postfix.wiz_.c:29
 msgid "Mail Address:"
 msgstr "Alamat Mail:"
 
-#: ../postfix_wizard/postfix.wiz_.c:21
-msgid "You entered an empty address for the mail gateway."
-msgstr "Anda memasukkan alamat kosong utk gateway mail."
-
-#: ../postfix_wizard/postfix.wiz_.c:22
+#: ../proxy_wizard/proxy.wiz_.c:3
 msgid ""
-"The wizard successfully configured your Internet Mail service of your server."
-msgstr "Layanan Mail Internet server Anda sukses dikonfigurasikan."
-
-#: ../postfix_wizard/postfix.wiz_.c:23
-msgid "Hmmm"
-msgstr "Hmmm"
-
-#: ../postfix_wizard/postfix.wiz_.c:24
-msgid "Internet Mail Gateway"
-msgstr "Gateway Mail Internet"
-
-#: ../postfix_wizard/postfix.wiz_.c:26
-msgid "Mail Server Name:"
-msgstr "Nama Server Mail:"
+"If you choose to configure now, you will automatically continue with the "
+"Proxy configuration."
+msgstr "Jika pilih sekarang, Anda akan diantar ke konfigurasi Proksi."
 
-#: ../postfix_wizard/postfix.wiz_.c:28
-msgid ""
-"Your choice can be accepted, but this will not allow you to send mail "
-"outside your local network. Press next to continue, or back to enter a value."
-msgstr ""
-"Pilihan Anda dapat diterima, tapi Anda takkan dapat mengirim mail ke luar "
-"jaringan lokal. Tekan Maju utk melanjutkan, atau Kembali utk mengisi nilai."
+#: ../proxy_wizard/proxy.wiz_.c:4
+msgid "Proxy Configuration Wizard"
+msgstr "Dukun Konfigurasi Proksi"
 
-#: ../proxy_wizard/proxy.wiz_.c:1
-msgid "/etc/services:"
-msgstr "/etc/services:"
+#: ../proxy_wizard/proxy.wiz_.c:8
+msgid "You must choose a port greater than 1024 and lower than 65535"
+msgstr "Port harus lebih dari 1024 dan kurang dari 65535"
 
-#: ../proxy_wizard/proxy.wiz_.c:2
-msgid ""
-"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
-"that actual memory usage of the whole squid process is bigger)."
-msgstr ""
-"Cache Memori adalah jumlah RAM utk meng-cache operasi memori (ingat bhw "
-"penggunaan memori aktual seluruh proses squid lebih besar)"
+#: ../proxy_wizard/proxy.wiz_.c:9 ../samba_wizard/samba.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:11
+msgid "This Wizard needs to run as root"
+msgstr "Dukun ini harus jalan sbg root"
 
-#: ../proxy_wizard/proxy.wiz_.c:3
-msgid "Proxy port:"
-msgstr "Port proksi:"
+#: ../proxy_wizard/proxy.wiz_.c:10
+msgid "Access Control:"
+msgstr "Kontrol Akses:"
 
-#: ../proxy_wizard/proxy.wiz_.c:4
-msgid "The wizard successfully configured your proxy server."
-msgstr "Server proksi Anda sukses dikonfigurasikan."
+#: ../proxy_wizard/proxy.wiz_.c:11
+msgid "Configuring the Proxy"
+msgstr "Konfigurasi Proksi"
 
-#: ../proxy_wizard/proxy.wiz_.c:5
-msgid "You have entered a port that may be useful for this service:"
-msgstr "Anda memasukkan port yg mungkin berguna utk layanan ini:"
+#: ../proxy_wizard/proxy.wiz_.c:13
+msgid "Define an upper level proxy"
+msgstr "Definisikan proksi tingkat atas"
 
-#: ../proxy_wizard/proxy.wiz_.c:8
-msgid "Cache hierarchy"
-msgstr "Hirarki cache"
+#: ../proxy_wizard/proxy.wiz_.c:14
+msgid "Filesystem            Size  Used Avail Use% Mounted on"
+msgstr "Sistem file           Besar Used Sedia Use% Terikat di"
 
-#: ../proxy_wizard/proxy.wiz_.c:9
+#: ../proxy_wizard/proxy.wiz_.c:15
 msgid ""
 "Squid is a web caching proxy server, it allows faster web access for your "
 "local network."
@@ -999,233 +1015,213 @@ msgstr ""
 "Squid adalah server proksi ber-cache pemercepat akses web jaringan lokal "
 "Anda."
 
-#: ../proxy_wizard/proxy.wiz_.c:10
-msgid "Define an upper level proxy"
-msgstr "Definisikan proksi tingkat atas"
-
-#: ../proxy_wizard/proxy.wiz_.c:15
-msgid "Disk space (MB):"
-msgstr "Ruang disk (MB):"
-
 #: ../proxy_wizard/proxy.wiz_.c:16
-msgid "Upper level proxy hostname:"
-msgstr "Nama host proksi tingkat atas:"
+msgid "This wizard will help you in configuring your proxy server."
+msgstr "Dukun ini membantu konfigurasi server proksi."
+
+#: ../proxy_wizard/proxy.wiz_.c:17
+msgid "Upper level proxy port:"
+msgstr "Port proksi tingkat atas:"
 
 #: ../proxy_wizard/proxy.wiz_.c:18
+msgid "For your information, here is /var/spool/squid space on disk:"
+msgstr "Sebagai info, berikut adalah ruang /var/spool/squid di disk:"
+
+#: ../proxy_wizard/proxy.wiz_.c:19
 msgid ""
 "Disk Cache is the amount of disk space that can be used for caching on disk."
 msgstr ""
 "Cache Disk adalah jumlah ruang disk yg dapat digunakan utk caching di disk."
 
 #: ../proxy_wizard/proxy.wiz_.c:20
-msgid "Configuring the Proxy"
-msgstr "Konfigurasi Proksi"
+msgid "Proxy Port"
+msgstr "Port Proksi"
 
 #: ../proxy_wizard/proxy.wiz_.c:21
 msgid ""
-"Proxy port value sets what port the proxy server will listen on for http "
-"requests. Default is 3128, other common value can be 8080, the port value "
-"need to be greater than 1024."
+"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
+"a text format like \\q.domain.net\\q"
 msgstr ""
-"Nilai port proksi menentukan port di mana server proksi akan mendengar "
-"permintaan http. Standarnya 3128, nilai umum yg lain 8080, harus lebih besar "
-"daripada 1024."
+"Anda dapat memakai format numerik seperti \\q192.168.1.0/255.255.255.0\\q "
+"atau teks seperti \\q.domain.net\\q"
 
 #: ../proxy_wizard/proxy.wiz_.c:22
-msgid "Squid wizard"
-msgstr "Dukun squid"
-
-#: ../proxy_wizard/proxy.wiz_.c:23
-msgid "Port:"
-msgstr "Port:"
-
-#: ../proxy_wizard/proxy.wiz_.c:24
-msgid "Filesystem            Size  Used Avail Use% Mounted on"
-msgstr "Sistem file           Besar Used Sedia Use% Terikat di"
-
-#: ../proxy_wizard/proxy.wiz_.c:25 ../samba_wizard/samba.wiz_.c:18
-#: ../server_wizard/server.wiz_.c:22
-msgid "This Wizard need to run as root"
-msgstr "Dukun ini harus jalan sbg root"
-
-#: ../proxy_wizard/proxy.wiz_.c:26
 msgid ""
-"You can safely select \\qNo upper level proxy\\q if you don't need this "
-"feature."
+"Press Next if you want to keep this value, or Back to correct your choice."
 msgstr ""
-"Anda dapat memilih \\qTanpa proksi tingkat atas\\q jika tak perlu fitur ini."
+"Tekan Maju utk memakai nilai ini, atau Kembali utk membetulkan pilihan."
+
+#: ../proxy_wizard/proxy.wiz_.c:24
+msgid "You have entered a port that may be useful for this service:"
+msgstr "Anda memasukkan port yg mungkin berguna utk layanan ini:"
 
 #: ../proxy_wizard/proxy.wiz_.c:27
-msgid "Memory cache (MB):"
-msgstr "Cache memori (MB):"
+msgid "/etc/services:"
+msgstr "/etc/services:"
 
 #: ../proxy_wizard/proxy.wiz_.c:28
-msgid "Access Control:"
-msgstr "Kontrol Akses:"
+msgid "Cache hierarchy"
+msgstr "Hirarki cache"
 
 #: ../proxy_wizard/proxy.wiz_.c:29
 msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"Proxy configuration."
-msgstr "Jika pilih sekarang, Anda akan diantar ke konfigurasi Proksi."
+"You can safely select \\qNo upper level proxy\\q if you don't need this "
+"feature."
+msgstr ""
+"Anda dapat memilih \\qTanpa proksi tingkat atas\\q jika tak perlu fitur ini."
 
 #: ../proxy_wizard/proxy.wiz_.c:30
-msgid "Proxy Port"
-msgstr "Port Proksi"
-
-#: ../proxy_wizard/proxy.wiz_.c:32
-msgid "Press back to change the value."
-msgstr "Tekan Kembali utk mengubah nilai."
+msgid "Port:"
+msgstr "Port:"
 
-#: ../proxy_wizard/proxy.wiz_.c:33
+#: ../proxy_wizard/proxy.wiz_.c:31
 msgid ""
-"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
-"the proxy to use."
+"As an option, Squid can be configured in proxy cascading. You can add a new "
+"upper level proxy by specifying its hostname and port."
 msgstr ""
-"Masukkan nama host resmi (misalnya \\qcache.domain.net\\q) dan port proksi."
+"Sebagai pilihan, Squid dapat dikonfigurasikan dalam proxy cascading. Anda "
+"dapat menambahkan proksi tingkat atas baru dengan menyebutkan nama host dan "
+"portnya."
 
 #: ../proxy_wizard/proxy.wiz_.c:34
+msgid ""
+"The wizard collected the following parameters needed to configure your proxy:"
+msgstr "Parameter konfigurasi proksi telah terkumpul:"
+
+#: ../proxy_wizard/proxy.wiz_.c:36
+msgid "Memory cache (MB):"
+msgstr "Cache memori (MB):"
+
+#: ../proxy_wizard/proxy.wiz_.c:37
 msgid "No upper level proxy (recommended)"
 msgstr "Tanpa proksi tingkat atas (disarankan)"
 
-#: ../proxy_wizard/proxy.wiz_.c:35
-msgid "You must choose a port greater than 1024 and lower than 65535"
-msgstr "Port harus lebih dari 1024 dan kurang dari 65535"
-
 #: ../proxy_wizard/proxy.wiz_.c:38
 msgid "Proxy Cache Size"
 msgstr "Ukuran Cache Proksi"
 
 #: ../proxy_wizard/proxy.wiz_.c:39
+msgid "Press back to change the value."
+msgstr "Tekan Kembali utk mengubah nilai."
+
+#: ../proxy_wizard/proxy.wiz_.c:41
+#, fuzzy
 msgid ""
-"Press Next if you want to keep this value, or Back to correct your choice."
+"Proxy port value sets what port the proxy server will listen on for http "
+"requests. Default is 3128, other common value can be 8080, the port value "
+"needs to be greater than 1024."
 msgstr ""
-"Tekan Maju utk memakai nilai ini, atau Kembali utk membetulkan pilihan."
-
-#: ../proxy_wizard/proxy.wiz_.c:40
-msgid "Localhost - access restricted to this server only"
-msgstr "Host lokal - akses terbatas pada server ini saja"
+"Nilai port proksi menentukan port di mana server proksi akan mendengar "
+"permintaan http. Standarnya 3128, nilai umum yg lain 8080, harus lebih besar "
+"daripada 1024."
 
 #: ../proxy_wizard/proxy.wiz_.c:42
-msgid ""
-"You can use either a numeric format like \\q192.168.1.0/255.255.255.0\\q or "
-"a text format like \\q.domain.net\\q"
-msgstr ""
-"Anda dapat memakai format numerik seperti \\q192.168.1.0/255.255.255.0\\q "
-"atau teks seperti \\q.domain.net\\q"
+msgid "Squid wizard"
+msgstr "Dukun squid"
 
 #: ../proxy_wizard/proxy.wiz_.c:43
-msgid "Proxy Configuration Wizard"
-msgstr "Dukun Konfigurasi Proksi"
+msgid "Proxy port:"
+msgstr "Port proksi:"
+
+#: ../proxy_wizard/proxy.wiz_.c:45
+msgid "Disk space (MB):"
+msgstr "Ruang disk (MB):"
 
 #: ../proxy_wizard/proxy.wiz_.c:46
+msgid "Upper level proxy hostname:"
+msgstr "Nama host proksi tingkat atas:"
+
+#: ../proxy_wizard/proxy.wiz_.c:48
+msgid "Localhost - access restricted to this server only"
+msgstr "Host lokal - akses terbatas pada server ini saja"
+
+#: ../proxy_wizard/proxy.wiz_.c:50
 msgid ""
-"As an option, Squid can be configured in proxy cascading. You can add a new "
-"upper level proxy by specifying its hostname and port."
+"Memory Cache is the amount of RAM dedicated to cache memory operations (note "
+"that actual memory usage of the whole squid process is bigger)."
 msgstr ""
-"Sebagai pilihan, Squid dapat dikonfigurasikan dalam proxy cascading. Anda "
-"dapat menambahkan proksi tingkat atas baru dengan menyebutkan nama host dan "
-"portnya."
+"Cache Memori adalah jumlah RAM utk meng-cache operasi memori (ingat bhw "
+"penggunaan memori aktual seluruh proses squid lebih besar)"
 
-#: ../proxy_wizard/proxy.wiz_.c:49
+#: ../proxy_wizard/proxy.wiz_.c:52
 msgid ""
-"The wizard collected the following parameters needed to configure your proxy:"
-msgstr "Parameter konfigurasi proksi telah terkumpul:"
+"Enter the qualified hostname (like \\qcache.domain.net\\q) and the port of "
+"the proxy to use."
+msgstr ""
+"Masukkan nama host resmi (misalnya \\qcache.domain.net\\q) dan port proksi."
 
-#: ../proxy_wizard/proxy.wiz_.c:50
+#: ../proxy_wizard/proxy.wiz_.c:54
 msgid "The proxy can be configured to use different access control levels."
 msgstr ""
 "Proksi dapat dikonfigurasikan utk menggunakan tingkat kontrol akses yg "
 "berbeda."
 
-#: ../proxy_wizard/proxy.wiz_.c:51
-msgid "Upper level proxy port:"
-msgstr "Port proksi tingkat atas:"
-
-#: ../proxy_wizard/proxy.wiz_.c:53
-msgid "This wizard will help you configuring your proxy server."
-msgstr "Dukun ini membantu konfigurasi server proksi."
+#: ../proxy_wizard/proxy.wiz_.c:55
+msgid "The wizard successfully configured your proxy server."
+msgstr "Server proksi Anda sukses dikonfigurasikan."
 
-#: ../proxy_wizard/proxy.wiz_.c:54
-msgid "For information, here is /var/spool/squid space on disk:"
-msgstr "Sebagai info, berikut adalah ruang /var/spool/squid di disk:"
+#: ../samba_wizard/samba.wiz_.c:3
+msgid "Home:"
+msgstr "Rumah:"
 
-#: ../samba_wizard/samba.wiz_.c:1
+#: ../samba_wizard/samba.wiz_.c:4
 #, fuzzy
-msgid "Enable file sharing area"
-msgstr "Aktifkan area umum /home/samba/public"
-
-#: ../samba_wizard/samba.wiz_.c:2
-msgid ""
-"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
-"= 150.203.15.0/255.255.255.0"
-msgstr ""
-
-#: ../samba_wizard/samba.wiz_.c:3
-msgid "My rules - Ask me allowed and denied hosts"
-msgstr ""
+msgid "Enable all printer"
+msgstr "Layanan Samba Diaktifkan"
 
 #: ../samba_wizard/samba.wiz_.c:5
-msgid "Workgroup:"
-msgstr "Grupkerja:"
+#, fuzzy
+msgid "Make home directories available for their owners"
+msgstr "Buat direktori rumah tersedia bagi pemiliknya"
 
 #: ../samba_wizard/samba.wiz_.c:6
-msgid ""
-"If you choose to configure now, you will automatically continue with the "
-"SAMBA configuration"
-msgstr "Jika pilih sekarang, Anda akan diantar ke konfigurasi SAMBA"
+msgid "Configuring Samba"
+msgstr "Konfigurasi Samba"
 
-#: ../samba_wizard/samba.wiz_.c:7
-msgid "Select which printers you want to be accessible from known users"
+#: ../samba_wizard/samba.wiz_.c:9
+msgid "My rules - Ask me allowed and denied hosts"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:8
-msgid "The Server Banner is incorrect"
-msgstr "Banner Server tak benar"
-
 #: ../samba_wizard/samba.wiz_.c:11
-msgid ""
-"This wizard will help you configuring the Samba services of your server."
-msgstr "Dukun ini membantu konfigurasi layanan Samba server Anda."
+msgid "Samba needs to know the Windows Workgroup it will serve."
+msgstr "Samba perlu tahu Grupkerja Mindows yg akan dilayani."
+
+#: ../samba_wizard/samba.wiz_.c:12
+msgid "Note that access still requires suitable user-level passwords."
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:13
-msgid "Enabled Samba Services"
-msgstr "Layanan Samba Diaktifkan"
+msgid ""
+"Samba can provide a common file sharing area to your Windows workstation, "
+"and can also provide printer sharing for the printers connected to your "
+"server."
+msgstr ""
+"Samba dapat menyajikan area file guna bersama utk stasiunkerja Mindows, juga "
+"dapat menyediakan printer guna bersama terhadap printer yg terhubung dg "
+"server Anda."
 
 #: ../samba_wizard/samba.wiz_.c:14
-msgid "Allow hosts:"
-msgstr ""
+msgid "The wizard successfully configured your Samba server."
+msgstr "Server Samba sukses dikonfigurasikan."
 
 #: ../samba_wizard/samba.wiz_.c:15
-msgid ""
-"The wizard collected the following parameters needed to configure Samba."
-msgstr "Parameter konfigurasi Samba telah terkumpul."
+msgid "Server Banner."
+msgstr "Banner Server."
 
-#: ../samba_wizard/samba.wiz_.c:17
-msgid "Banner:"
-msgstr "Banner:"
+#: ../samba_wizard/samba.wiz_.c:16
+msgid "Print Server:"
+msgstr "Server Cetak:"
 
-#: ../samba_wizard/samba.wiz_.c:19
-msgid "Workgroup"
-msgstr "Grupkerja"
+#: ../samba_wizard/samba.wiz_.c:17
+msgid "Workgroup:"
+msgstr "Grupkerja:"
 
 #: ../samba_wizard/samba.wiz_.c:20
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
-"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
+"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:21
-msgid ""
-"The banner is the way this server will be described in the Windows "
-"workstations."
-msgstr "Banner adalah cara server ini digambarkan di stasiunkerja Mindows."
-
 #: ../samba_wizard/samba.wiz_.c:22
-msgid "File Sharing:"
-msgstr "Pemakaian Bersama File:"
-
-#: ../samba_wizard/samba.wiz_.c:23
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -1233,12 +1229,26 @@ msgstr ""
 "Anda mengizinkan pengguna mengakses direktori rumah mereka via samba tapi "
 "Anda/mereka harus menggunakan smbpasswd utk mengeset katasandi."
 
-#: ../samba_wizard/samba.wiz_.c:25
+#: ../samba_wizard/samba.wiz_.c:23
+msgid ""
+"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
+"150.203. EXCEPT 150.203.6.66"
+msgstr ""
+
+#: ../samba_wizard/samba.wiz_.c:24
 #, fuzzy
-msgid "Enable all printer"
-msgstr "Layanan Samba Diaktifkan"
+msgid "Printers:"
+msgstr "Server Cetak:"
+
+#: ../samba_wizard/samba.wiz_.c:25
+msgid "The Server Banner is incorrect"
+msgstr "Banner Server tak benar"
 
 #: ../samba_wizard/samba.wiz_.c:26
+msgid "Samba Configuration Wizard"
+msgstr "Dukun Konfigurasi Samba"
+
+#: ../samba_wizard/samba.wiz_.c:27
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -1246,291 +1256,282 @@ msgstr ""
 "Samba memungkinkan server Anda menjadi server file dan cetak utk "
 "stasiunkerja sistem non-Linux."
 
-#: ../samba_wizard/samba.wiz_.c:27
-msgid "File permissions"
-msgstr ""
-
 #: ../samba_wizard/samba.wiz_.c:28
-msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\\nhosts allow = "
-"150.203. EXCEPT 150.203.6.66"
+msgid "Deny hosts:"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:29
-msgid "Configuring Samba"
-msgstr "Konfigurasi Samba"
+#: ../samba_wizard/samba.wiz_.c:30
+#, fuzzy
+msgid ""
+"This wizard will help you configuring the Samba services of your server."
+msgstr "Dukun ini membantu konfigurasi layanan Samba server Anda."
 
 #: ../samba_wizard/samba.wiz_.c:31
 msgid "write list:"
 msgstr ""
 
+#: ../samba_wizard/samba.wiz_.c:32
+msgid "Server Banner:"
+msgstr "Banner Server:"
+
 #: ../samba_wizard/samba.wiz_.c:33
-msgid "Server Banner."
-msgstr "Banner Server."
+msgid "Enabled Samba Services"
+msgstr "Layanan Samba Diaktifkan"
 
 #: ../samba_wizard/samba.wiz_.c:34
-msgid "Note that access still requires suitable user-level passwords."
+msgid "Enable Server Printer Sharing"
+msgstr "Aktifkan Guna Bersama Printer Server"
+
+#: ../samba_wizard/samba.wiz_.c:35
+msgid "Select which printers you want to be accessible from known users"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:36
-msgid "The Workgroup is wrong"
-msgstr "Grupkerja salah"
+#: ../samba_wizard/samba.wiz_.c:37
+msgid ""
+"If you choose to configure now, you will automatically continue with the "
+"SAMBA configuration"
+msgstr "Jika pilih sekarang, Anda akan diantar ke konfigurasi SAMBA"
 
 #: ../samba_wizard/samba.wiz_.c:38
-msgid "Deny hosts:"
-msgstr ""
+msgid ""
+"The wizard collected the following parameters needed to configure Samba."
+msgstr "Parameter konfigurasi Samba telah terkumpul."
 
-#: ../samba_wizard/samba.wiz_.c:40
-#, fuzzy
-msgid "Access control"
-msgstr "Kontrol Akses"
+#: ../samba_wizard/samba.wiz_.c:39
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr "Banner adalah cara server ini digambarkan di stasiunkerja Mindows."
 
 #: ../samba_wizard/samba.wiz_.c:41
-msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+msgid "read list:"
 msgstr ""
-"Samba dapat menyajikan area file guna bersama utk stasiunkerja Mindows, juga "
-"dapat menyediakan printer guna bersama terhadap printer yg terhubung dg "
-"server Anda."
+
+#: ../samba_wizard/samba.wiz_.c:42
+msgid "Banner:"
+msgstr "Banner:"
 
 #: ../samba_wizard/samba.wiz_.c:43
-msgid "The wizard successfully configured your Samba server."
-msgstr "Server Samba sukses dikonfigurasikan."
+msgid "The Workgroup is wrong"
+msgstr "Grupkerja salah"
 
 #: ../samba_wizard/samba.wiz_.c:44
-msgid "Samba need to know the Windows Workgroup it will serve."
-msgstr "Samba perlu tahu Grupkerja Mindows yg akan dilayani."
+msgid "Samba wizard"
+msgstr "Dukun Samba"
 
 #: ../samba_wizard/samba.wiz_.c:45
-msgid "Server Banner:"
-msgstr "Banner Server:"
-
-#: ../samba_wizard/samba.wiz_.c:46
 #, fuzzy
 msgid "Access level :"
 msgstr "Kontrol Akses:"
 
 #: ../samba_wizard/samba.wiz_.c:47
-msgid "Print Server:"
-msgstr "Server Cetak:"
+msgid "Workgroup"
+msgstr "Grupkerja"
 
-#: ../samba_wizard/samba.wiz_.c:50
-msgid "Samba wizard"
-msgstr "Dukun Samba"
+#: ../samba_wizard/samba.wiz_.c:48
+msgid "Allow hosts:"
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:51
-msgid "Samba Configuration Wizard"
-msgstr "Dukun Konfigurasi Samba"
+#: ../samba_wizard/samba.wiz_.c:49
+msgid ""
+"Type users or group separated by a comma (groups must be preceded by a \\'@"
+"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:52
+#: ../samba_wizard/samba.wiz_.c:50
 #, fuzzy
-msgid "Make home directories available for their owners"
-msgstr "Buat direktori rumah tersedia bagi pemiliknya"
+msgid "Access control"
+msgstr "Kontrol Akses"
 
-#: ../samba_wizard/samba.wiz_.c:54
+#: ../samba_wizard/samba.wiz_.c:52
 msgid ""
-"Type users or group separated by a coma (groups must be preceded by a \\'@"
-"\\') like this :\\nroot, fred, @users, @wheel for each kind of permission."
+"* Example 4: allow only hosts in NIS netgroup \\qfoonet\\q,  but deny access "
+"from one particular host\\nhosts allow = @foonet\\nhosts deny = pirate"
 msgstr ""
 
-#: ../samba_wizard/samba.wiz_.c:55
-msgid "Enable Server Printer Sharing"
-msgstr "Aktifkan Guna Bersama Printer Server"
-
-#: ../samba_wizard/samba.wiz_.c:56
+#: ../samba_wizard/samba.wiz_.c:53
 #, fuzzy
-msgid "Printers:"
-msgstr "Server Cetak:"
+msgid "Enable file sharing area"
+msgstr "Aktifkan area umum /home/samba/public"
 
-#: ../samba_wizard/samba.wiz_.c:57
-msgid "Home:"
-msgstr "Rumah:"
+#: ../samba_wizard/samba.wiz_.c:56
+msgid ""
+"* Example 2: allow hosts that match the given network/netmask\\nhosts allow "
+"= 150.203.15.0/255.255.255.0"
+msgstr ""
 
 #: ../samba_wizard/samba.wiz_.c:58
-msgid "read list:"
-msgstr ""
+msgid "File Sharing:"
+msgstr "Pemakaian Bersama File:"
 
-#: ../samba_wizard/samba.wiz_.c:60
-msgid ""
-"* Example 3: allow a couple of hosts\\nhosts allow = lapland, arvidsjaur"
+#: ../samba_wizard/samba.wiz_.c:59
+msgid "File permissions"
 msgstr ""
 
 #: ../server_wizard/server.wiz_.c:2
-msgid ""
-"Choose the network device (usually a card) the server should use to connect "
-"to your network. It's the device for the local network, probably not the "
-"same device used for internet access."
-msgstr ""
-"Pilih perangkat jaringan (biasanya kartu) yg harus digunakan server utk "
-"koneksi ke jaringan Anda. Ia adalah perangkat utk jaringan lokal, mungkin "
-"tak sama dg perangkat utk akses internet."
-
-#: ../server_wizard/server.wiz_.c:3
-msgid "The Server IP address is incorrect"
-msgstr "Alamat IP Server tak benar"
+msgid "This wizard will set the basic networking parameters of your server."
+msgstr "Dukun ini mengeset parameter jaringan dasar server Anda."
 
 #: ../server_wizard/server.wiz_.c:4
-msgid "Gateway device:"
-msgstr "Perangkat gateway:"
-
-#: ../server_wizard/server.wiz_.c:5
-msgid "Server Wizard"
-msgstr "Dukun Server"
-
-#: ../server_wizard/server.wiz_.c:6
-msgid ""
-"Network addresses are a list of four numbers smaller than 256, separated by "
-"dots; the last number of the list must be zero."
-msgstr ""
-"Alamat jaringan adalah rentetan 4 bilangan lebih kecil dari 256, dipisahkan "
-"oleh titik; bilangan terakhir harus nol."
+msgid "Host Name:"
+msgstr "Nama Host:"
 
 #: ../server_wizard/server.wiz_.c:7
-msgid "net device"
-msgstr "perangkat jaringan"
+msgid "Basic Network Configuration Wizard"
+msgstr "Dukun Konfigurasi Jaringan Dasar"
+
+#: ../server_wizard/server.wiz_.c:8
+msgid "The network address is wrong"
+msgstr "Alamat jaringan salah"
 
 #: ../server_wizard/server.wiz_.c:9
-msgid ""
-"So, it's very probable that domain name and IP adresses for this local "
-"network are DIFFERENT from the server \\qexternal\\q connection."
-msgstr ""
-"Jadi amat mungkin nama domain dan alamat IP jaringan lokal ini BERBEDA dg "
-"koneksi \\qeksternal\\q server."
+msgid "Server IP address:"
+msgstr "Alamat IP Server:"
 
 #: ../server_wizard/server.wiz_.c:10
+msgid "Network Address"
+msgstr "Alamat Jaringan"
+
+#: ../server_wizard/server.wiz_.c:12
 msgid ""
 "You should not run any other applications while running this wizard and at "
-"the end of the wizard you should exit your session and redo the login."
+"the end of the wizard you should exit your session and login again."
 msgstr ""
 "Jangan jalankan aplikasi lain saat menjalankan dukun ini dan pada tahap "
 "akhir Anda harus keluar session kemudian login lagi."
 
-#: ../server_wizard/server.wiz_.c:11
+#: ../server_wizard/server.wiz_.c:13
 msgid ""
-"Here is your current value for the external gateway (value specified during "
-"the initial installation). The device (network card or modem) should be "
-"different from the one used for the internal network."
-msgstr ""
-"Berikut adalah setting gateway eksternal Anda saat ini (nilai instalasi "
-"awal). Perangkat (kartu jaringan atau modem) harus berbeda dari yg digunakan "
-"utk jaringan internal."
+"The wizard successfully configured the basic networking services of your "
+"server."
+msgstr "Layanan jaringan dasar server Anda sukses dikonfigurasikan"
 
-#: ../server_wizard/server.wiz_.c:12
+#: ../server_wizard/server.wiz_.c:14
 msgid ""
-"As regards these wizards, your computer is seen as a server managing his own "
-"local network (C class network)."
+"(you can change here these values if you know exactly what you're doing)"
 msgstr ""
-"Komputer Anda tampak sbg server pengatur jaringan lokal (jaringan kelas C)."
-
-#: ../server_wizard/server.wiz_.c:14
-msgid "Device:"
-msgstr "Perangkat:"
+"(Anda dapat mengubah nilai di sini jika Anda tahu apa persis yg Anda lakukan)"
 
 #: ../server_wizard/server.wiz_.c:15
-msgid "Warning"
-msgstr "Peringatan"
+msgid ""
+"The network address is a number identifying your network; the proposed value "
+"is designed for a configuration not connected to Internet, or connected "
+"using IP masquerading; unless you know what you are doing, accept the "
+"default value."
+msgstr ""
+"Alamat jaringan adalah nomor identitas jaringan Anda; nilai yg disarankan "
+"dirancang utk konfigurasi tanpa koneksi Internet, atau terhubung menggunakan "
+"topeng IP; kecuali tahu apa yg Anda lakukan, terimalah nilai standar."
 
 #: ../server_wizard/server.wiz_.c:16
-msgid "This page compute the domainname; it should be invisible"
-msgstr "Halaman ini menghitung namadomain; harus tak tampak"
+msgid "Note about networking"
+msgstr "Catatan ttg jaringan"
 
 #: ../server_wizard/server.wiz_.c:17
-msgid "Server Address:"
-msgstr "Alamat Server:"
+msgid "Server Address"
+msgstr "Alamat Server"
 
 #: ../server_wizard/server.wiz_.c:18
-msgid "Computed domain Name"
-msgstr "Nama domain terhitung"
+msgid ""
+"Network addresses are a list of four numbers smaller than 256, separated by "
+"dots; the last number of the list must be zero."
+msgstr ""
+"Alamat jaringan adalah rentetan 4 bilangan lebih kecil dari 256, dipisahkan "
+"oleh titik; bilangan terakhir harus nol."
 
 #: ../server_wizard/server.wiz_.c:19
-msgid "Host Name"
-msgstr "Nama Host"
+msgid ""
+"Note: the gateway IP address should be non empty if you want an access to "
+"outside world."
+msgstr ""
+"Catatan: alamat IP gateway harus tak kosong jika Anda ingin mengakses dunia "
+"luar."
 
 #: ../server_wizard/server.wiz_.c:20
-msgid "This page compute the default server address; should be invisible."
-msgstr "Halaman ini menghitung alamat server standar; harus tak tampak."
+msgid "The Server IP address is incorrect"
+msgstr "Alamat IP Server tak benar"
 
 #: ../server_wizard/server.wiz_.c:21
-msgid "Basic Network Configuration Wizard"
-msgstr "Dukun Konfigurasi Jaringan Dasar"
+msgid "Configuring your network"
+msgstr "Konfigurasi jaringan"
+
+#: ../server_wizard/server.wiz_.c:22
+msgid "Gateway IP:"
+msgstr "IP Gateway:"
 
 #: ../server_wizard/server.wiz_.c:23
-msgid "The host name is not correct"
-msgstr "Nama host tak benar"
+msgid "This page computes the default server address; it should be invisible."
+msgstr "Halaman ini menghitung alamat server standar; harus tak tampak."
 
 #: ../server_wizard/server.wiz_.c:24
-msgid ""
-"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
-"will be an Internet server, the domain name should be the name registered "
-"with your provider. If you will only have intranet any valid name is OK, "
-"like \\qcompany.net\\q."
-msgstr ""
-"Nama host harus berbentuk \\qhost.domain.tipedomain\\q; jika server Anda "
-"jadi server Internet, nama domain harus tercatat di provider Anda. Jika Anda "
-"hanya akan punya intranet sembarang nama seperti \\qperusahaan.net\\q boleh."
+msgid "IP net address:"
+msgstr "Alamat jaringan IP:"
 
 #: ../server_wizard/server.wiz_.c:25
 msgid "External gateway"
 msgstr "Gateway eksternal"
 
 #: ../server_wizard/server.wiz_.c:26
-msgid ""
-"The network address is a number identifying your network; the proposed value "
-"is designed for a configuration not connected to Internet, or connected "
-"using IP masquerading; unless you know what you are doing, accept the "
-"default value."
-msgstr ""
-"Alamat jaringan adalah nomor identitas jaringan Anda; nilai yg disarankan "
-"dirancang utk konfigurasi tanpa koneksi Internet, atau terhubung menggunakan "
-"topeng IP; kecuali tahu apa yg Anda lakukan, terimalah nilai standar."
+msgid "Server Wizard"
+msgstr "Dukun Server"
 
 #: ../server_wizard/server.wiz_.c:27
 msgid ""
-"This wizard will help you configuring the basic networking services of your "
-"server."
-msgstr "Dukun ini membantu konfigurasi layanan jaringan dasar server Anda."
+"So, it's very probable that domain name and IP adresses for this local "
+"network are DIFFERENT from the server \\qexternal\\q connection."
+msgstr ""
+"Jadi amat mungkin nama domain dan alamat IP jaringan lokal ini BERBEDA dg "
+"koneksi \\qeksternal\\q server."
 
 #: ../server_wizard/server.wiz_.c:28
-msgid "This wizard will set the basic networking parameter of your server."
-msgstr "Dukun ini mengeset parameter jaringan dasar server Anda."
-
-#: ../server_wizard/server.wiz_.c:29
-msgid "Note about networking"
-msgstr "Catatan ttg jaringan"
-
-#: ../server_wizard/server.wiz_.c:31
 msgid ""
-"Note: the gateway IP address should be non empty if you want an access to "
-"outside world."
+"Choose the network device (usually a card) the server should use to connect "
+"to your network. It's the device for the local network, probably not the "
+"same device used for internet access."
 msgstr ""
-"Catatan: alamat IP gateway harus tak kosong jika Anda ingin mengakses dunia "
-"luar."
-
-#: ../server_wizard/server.wiz_.c:32
-msgid "Wizard Error."
-msgstr "Error Wizard."
+"Pilih perangkat jaringan (biasanya kartu) yg harus digunakan server utk "
+"koneksi ke jaringan Anda. Ia adalah perangkat utk jaringan lokal, mungkin "
+"tak sama dg perangkat utk akses internet."
 
-#: ../server_wizard/server.wiz_.c:34
+#: ../server_wizard/server.wiz_.c:29
 msgid ""
 "Devices are presented with the Linux name and, if known, with the card "
 "description."
 msgstr "Perangkat disajikan dg nama Linux dan, jika ada, deskripsi kartu."
 
-#: ../server_wizard/server.wiz_.c:37
-msgid "Network Address:"
-msgstr "Alamat Jaringan:"
+#: ../server_wizard/server.wiz_.c:30
+msgid ""
+"Here is your current value for the external gateway (value specified during "
+"the initial installation). The device (network card or modem) should be "
+"different from the one used for the internal network."
+msgstr ""
+"Berikut adalah setting gateway eksternal Anda saat ini (nilai instalasi "
+"awal). Perangkat (kartu jaringan atau modem) harus berbeda dari yg digunakan "
+"utk jaringan internal."
 
-#: ../server_wizard/server.wiz_.c:38
-msgid "Configuring your network"
-msgstr "Konfigurasi jaringan"
+#: ../server_wizard/server.wiz_.c:31
+msgid ""
+"This wizard will help you in configuring the basic networking services of "
+"your server."
+msgstr "Dukun ini membantu konfigurasi layanan jaringan dasar server Anda."
 
-#: ../server_wizard/server.wiz_.c:39
-msgid "Gateway IP:"
-msgstr "IP Gateway:"
+#: ../server_wizard/server.wiz_.c:32
+msgid ""
+"The server IP address is a number identifing your server in your network; "
+"the proposed value designed for a private network , with no internet "
+"visibility, or connected using IP masquerading; unless you know what you are "
+"doing, accept the default value."
+msgstr ""
+"Alamat IP server adalah nomor identifikasi server Anda di jaringan; nilai yg "
+"disarankan dirancang utk jaringan pribadi, tanpa visibilitas internet, atau "
+"terhubung menggunakan topeng IP; kecuali tahu apa yg Anda lakukan, terimalah "
+"nilai standar."
 
-#: ../server_wizard/server.wiz_.c:40
+#: ../server_wizard/server.wiz_.c:34
+msgid "The host name is not correct"
+msgstr "Nama host tak benar"
+
+#: ../server_wizard/server.wiz_.c:35
 msgid ""
 "The hostname is the name under which your server will be known from the "
 "other workstations in your network and maybe on the Internet (depending of "
@@ -1539,402 +1540,414 @@ msgstr ""
 "Nama host adalah nama server Anda yg akan dikenal dari stasiunkerja lain di "
 "jaringan dan mungkin di Internet (tergantung konfigurasi upstream Anda)."
 
-#: ../server_wizard/server.wiz_.c:41
-msgid "Host Name:"
-msgstr "Nama Host:"
+#: ../server_wizard/server.wiz_.c:36
+msgid "Wizard Error."
+msgstr "Error Wizard."
 
-#: ../server_wizard/server.wiz_.c:42
+#: ../server_wizard/server.wiz_.c:37
+msgid "net device"
+msgstr "perangkat jaringan"
+
+#: ../server_wizard/server.wiz_.c:38
+msgid "Computed domain Name"
+msgstr "Nama domain terhitung"
+
+#: ../server_wizard/server.wiz_.c:39
+msgid "This page computes the domainname; it should be invisible"
+msgstr "Halaman ini menghitung namadomain; harus tak tampak"
+
+#: ../server_wizard/server.wiz_.c:40
+msgid "Gateway device:"
+msgstr "Perangkat gateway:"
+
+#: ../server_wizard/server.wiz_.c:41
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "network"
 msgstr "Parameter konfigurasi jaringan telah terkumpul"
 
-#: ../server_wizard/server.wiz_.c:44
-msgid ""
-"External connection is a network from which the computer is client (Internet "
-"or upstream network), connected using another network card or a modem."
-msgstr ""
-"Koneksi eksternal adalah jaringan dari mana komputer adalah klien (Internet "
-"atau jaringan arus atas), terhubung via kartu jaringan lain atau modem."
+#: ../server_wizard/server.wiz_.c:43
+msgid "Warning"
+msgstr "Peringatan"
 
 #: ../server_wizard/server.wiz_.c:45
-msgid ""
-"(you can change here these values if you know exactly what you're doing)"
-msgstr ""
-"(Anda dapat mengubah nilai di sini jika Anda tahu apa persis yg Anda lakukan)"
+msgid "Device:"
+msgstr "Perangkat:"
 
 #: ../server_wizard/server.wiz_.c:46
 msgid ""
-"The server IP address is a number identifing your server in your network; "
-"the proposed value designed for a private network , with no internet "
-"visibility, or connected using IP masquerading; unless you know what you are "
-"doing, accept the default value."
+"In regards to these wizards, your computer is seen as a server managing his "
+"own local network (C class network)."
 msgstr ""
-"Alamat IP server adalah nomor identifikasi server Anda di jaringan; nilai yg "
-"disarankan dirancang utk jaringan pribadi, tanpa visibilitas internet, atau "
-"terhubung menggunakan topeng IP; kecuali tahu apa yg Anda lakukan, terimalah "
-"nilai standar."
+"Komputer Anda tampak sbg server pengatur jaringan lokal (jaringan kelas C)."
 
 #: ../server_wizard/server.wiz_.c:47
-msgid "Server Name:"
-msgstr "Nama Server:"
+msgid "Server Address:"
+msgstr "Alamat Server:"
 
-#: ../server_wizard/server.wiz_.c:48
-msgid "The network address is wrong"
-msgstr "Alamat jaringan salah"
+#: ../server_wizard/server.wiz_.c:49
+msgid ""
+"External connection is a network from which the computer is client (Internet "
+"or upstream network), connected using another network card or a modem."
+msgstr ""
+"Koneksi eksternal adalah jaringan dari mana komputer adalah klien (Internet "
+"atau jaringan arus atas), terhubung via kartu jaringan lain atau modem."
 
 #: ../server_wizard/server.wiz_.c:50
-msgid "Server Address"
-msgstr "Alamat Server"
-
-#: ../server_wizard/server.wiz_.c:51
 msgid ""
-"The wizard successfully configured the basic networking services of your "
-"server."
-msgstr "Layanan jaringan dasar server Anda sukses dikonfigurasikan"
+"Host names must be in the form \\qhost.domain.domaintype\\q; if your server "
+"will be an Internet server, the domain name should be the name registered "
+"with your provider. If you will only have intranet any valid name is OK, "
+"like \\qcompany.net\\q."
+msgstr ""
+"Nama host harus berbentuk \\qhost.domain.tipedomain\\q; jika server Anda "
+"jadi server Internet, nama domain harus tercatat di provider Anda. Jika Anda "
+"hanya akan punya intranet sembarang nama seperti \\qperusahaan.net\\q boleh."
 
 #: ../server_wizard/server.wiz_.c:52
-msgid "Network Device"
-msgstr "Perangkat Jaringan"
+msgid "Host Name"
+msgstr "Nama Host"
 
 #: ../server_wizard/server.wiz_.c:53
-msgid "IP net address:"
-msgstr "Alamat jaringan IP:"
+msgid "Network Address:"
+msgstr "Alamat Jaringan:"
 
 #: ../server_wizard/server.wiz_.c:54
-msgid "Network Address"
-msgstr "Alamat Jaringan"
+msgid "Network Device"
+msgstr "Perangkat Jaringan"
 
 #: ../server_wizard/server.wiz_.c:55
-msgid "Server IP address:"
-msgstr "Alamat IP Server:"
+msgid "Server Name:"
+msgstr "Nama Server:"
 
 #: ../time_wizard/time.wiz_.c:1
-msgid "University of Adelaide, South Australia"
-msgstr "Universitas Adelaide, Australia Selatan"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
+msgstr "CRI, Campus d'Orsay, Universitas Paris Sud, Perancis"
 
 #: ../time_wizard/time.wiz_.c:2
-msgid "Press next to start the time servers test."
-msgstr "Tekan Maju utk memulai tes server waktu."
+msgid "University of Manchester, Manchester, England"
+msgstr "Universitas Manchester, Manchester, Inggris"
 
 #: ../time_wizard/time.wiz_.c:3
-msgid "Time Servers"
-msgstr "Server Waktu"
+msgid "SCI, Universite de Limoges, France"
+msgstr "SCI, Universitas Limoges, Perancis"
 
 #: ../time_wizard/time.wiz_.c:4
-msgid "Secondary Time Server:"
-msgstr "Server Waktu Sekunder:"
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr "Pusat Meteorologi Kanada, Dorval, Quebec, Kanada"
 
 #: ../time_wizard/time.wiz_.c:5
-msgid "Thus your server will be the local time server for your network."
-msgstr "Demikianlah server Anda akan jadi server waktu lokal jaringan Anda."
+msgid "Press next to start the time servers test."
+msgstr "Tekan Maju utk memulai tes server waktu."
 
 #: ../time_wizard/time.wiz_.c:6
-msgid "Your server can now act as a time server for your local network."
-msgstr "Server Anda kini dapat berperan sbg server waktu jaringan lokal Anda."
+msgid ""
+"You can try again to contact time servers, or save configuration without "
+"actually setting time."
+msgstr ""
+"Anda dapat mencoba lagi mengontak server waktu, atau menyimpan konfigurasi "
+"tanpa mengeset waktu secara aktual."
 
 #: ../time_wizard/time.wiz_.c:7
-msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
-msgstr "Pusat Ilmu Pengetahuan Chernogolovka, Moscow, Rusia"
+msgid "(please, choose servers in your geographical area)"
+msgstr "(pilihlah server yg dekat dg Anda)"
 
 #: ../time_wizard/time.wiz_.c:8
-msgid "Baylor College of Medicine, Houston, Tx"
-msgstr "Baylor College of Medicine, Houston, Texas"
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr "Universitas Oklahoma, Norman, Oklahoma, AS"
 
 #: ../time_wizard/time.wiz_.c:9
-msgid "Choose a time zone:"
-msgstr "Pilih zona waktu:"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
+msgstr "Universitas Regina, Regina, Saskatchewan, Kanada"
 
 #: ../time_wizard/time.wiz_.c:10
-msgid "press next to begin, or cancel to leave this wizard"
-msgstr "tekan Maju utk mulai, atau Batal utk keluar"
+msgid "Trinity College, Dublin, Ireland"
+msgstr "Trinity College, Dublin, Irlandia"
 
 #: ../time_wizard/time.wiz_.c:11
-msgid "LAAS/CNRS, Toulouse, France"
-msgstr "LAAS/CNRS, Toulouse, Perancis"
+msgid "Singapore"
+msgstr "Singapura"
 
 #: ../time_wizard/time.wiz_.c:12
-msgid "SCI, Universite de Limoges, France"
-msgstr "SCI, Universitas Limoges, Perancis"
+msgid "Secondary Time Server:"
+msgstr "Server Waktu Sekunder:"
 
 #: ../time_wizard/time.wiz_.c:13
-msgid "MIT Information Systems, Cambridge, MA"
-msgstr "MIT Information Systems, Cambridge, MA"
+msgid "Try again"
+msgstr "Coba lagi"
 
 #: ../time_wizard/time.wiz_.c:14
-msgid "Select a primary and secondary server from the list."
-msgstr "Pilih server primer dan sekunder dari daftar."
+msgid "The Chinese University of Hong Kong"
+msgstr "Universitas Cina, Hong Kong"
 
 #: ../time_wizard/time.wiz_.c:15
-msgid "(please, choose servers in your geographical area)"
-msgstr "(pilihlah server yg dekat dg Anda)"
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr "UNLV College of Engineering, Las Vegas, NV"
 
 #: ../time_wizard/time.wiz_.c:16
-msgid "Loria, Nancy, France"
-msgstr "Loria, Nancy, Perancis"
+msgid "Altea (Alicante/SPAIN)"
+msgstr "Altea (Alicante/SPANYOL)"
 
 #: ../time_wizard/time.wiz_.c:17
-msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
-msgstr "Pusat Meteorologi Kanada, Dorval, Quebec, Kanada"
-
-#: ../time_wizard/time.wiz_.c:18
 msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
 msgstr "Badan Riset Nasional Kanada, Ottawa, Ontario, Kanada"
 
+#: ../time_wizard/time.wiz_.c:18
+msgid "Select a primary and secondary server from the list."
+msgstr "Pilih server primer dan sekunder dari daftar."
+
 #: ../time_wizard/time.wiz_.c:19
-msgid "University of Manchester, Manchester, England"
-msgstr "Universitas Manchester, Manchester, Inggris"
+msgid "CISM, Lyon, France"
+msgstr "CISM, Lyon, Perancis"
 
 #: ../time_wizard/time.wiz_.c:20
-msgid "- no outside network"
-msgstr "- tanpa jaringan luar"
+msgid "Inet, Inc., Seoul, Korea"
+msgstr "Inet, Inc., Seoul, Korea"
 
 #: ../time_wizard/time.wiz_.c:21
-msgid ""
-"If the time server is not immediately available (network or other reason), "
-"you will wait about 30 seconds."
-msgstr ""
-"Jika server waktu tak tersedia segera karena suatu sebab, Anda akan menunggu "
-"sekitar 30 detik."
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr "Pusat Ilmu Pengetahuan Chernogolovka, Moscow, Rusia"
 
 #: ../time_wizard/time.wiz_.c:22
-msgid "Testing the time servers availability"
-msgstr "Pengujian kesediaan server waktu"
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr "Washington State University Tri-Cities, Richland, Wa"
 
 #: ../time_wizard/time.wiz_.c:23
-msgid "University of Oslo, Norway"
-msgstr "Universitas Oslo, Norwegia"
+msgid "University of Adelaide, South Australia"
+msgstr "Universitas Adelaide, Australia Selatan"
 
 #: ../time_wizard/time.wiz_.c:24
-msgid "Computer Science Department, University of Wisconsin-Madison"
-msgstr "Departemen Ilmu Komputer, Universitas Wisconsin-Madison"
+msgid "Time zone:"
+msgstr "Zona waktu:"
 
 #: ../time_wizard/time.wiz_.c:25
-msgid "Trinity College, Dublin, Ireland"
-msgstr "Trinity College, Dublin, Irlandia"
+msgid "The time servers are not responding. The causes could be:"
+msgstr "Server waktu tak bereaksi. Sebabnya mungkin:"
 
 #: ../time_wizard/time.wiz_.c:26
-msgid "University of Regina, Regina, Saskatchewan, Canada"
-msgstr "Universitas Regina, Regina, Saskatchewan, Kanada"
+msgid "CRIUC, Universite de Caen, France"
+msgstr "CRIUC, Universitas Caen, Perancis"
 
 #: ../time_wizard/time.wiz_.c:27
-msgid "The time servers are not responding. The causes could be:"
-msgstr "Server waktu tak bereaksi. Sebabnya mungkin:"
+msgid "- other reasons..."
+msgstr "- alasan lain..."
 
 #: ../time_wizard/time.wiz_.c:28
-msgid "Swiss Fed. Inst. of Technology"
-msgstr "Institut Teknologi Federal Swiss"
+msgid ""
+"If the time server is not immediately available (network or other reason), "
+"there will be about a 30 second delay."
+msgstr ""
+"Jika server waktu tak tersedia segera karena suatu sebab, Anda akan menunggu "
+"sekitar 30 detik."
 
 #: ../time_wizard/time.wiz_.c:29
-msgid "CRIUC, Universite de Caen, France"
-msgstr "CRIUC, Universitas Caen, Perancis"
+msgid "WARNING"
+msgstr "PERINGATAN"
 
 #: ../time_wizard/time.wiz_.c:30
-msgid "CISM, Lyon, France"
-msgstr "CISM, Lyon, Perancis"
+msgid "Loria, Nancy, France"
+msgstr "Loria, Nancy, Perancis"
 
 #: ../time_wizard/time.wiz_.c:31
-#, fuzzy
-msgid ""
-"This wizard will help you to set the time of your server synchronized with "
-"an external time server."
-msgstr ""
-"Dukun ini membantu mengeset jam server Anda, secara lokal atau tersinkron "
-"dengan server waktu luar."
+msgid "Your server can now act as a time server for your local network."
+msgstr "Server Anda kini dapat berperan sbg server waktu jaringan lokal Anda."
 
 #: ../time_wizard/time.wiz_.c:32
-msgid "WARNING"
-msgstr "PERINGATAN"
+msgid "Fukuoka university, Fukuoka, Japan"
+msgstr "Universitaas Fukuoka, Fukuoka, Jepang"
 
 #: ../time_wizard/time.wiz_.c:33
-msgid "Inet, Inc., Seoul, Korea"
-msgstr "Inet, Inc., Seoul, Korea"
+msgid "Time Servers"
+msgstr "Server Waktu"
 
 #: ../time_wizard/time.wiz_.c:34
-msgid "University of Oklahoma, Norman, Oklahoma, USA"
-msgstr "Universitas Oklahoma, Norman, Oklahoma, AS"
+msgid "Swiss Fed. Inst. of Technology"
+msgstr "Institut Teknologi Federal Swiss"
 
 #: ../time_wizard/time.wiz_.c:35
-msgid "The Chinese University of Hong Kong"
-msgstr "Universitas Cina, Hong Kong"
+#, fuzzy
+msgid ""
+"This wizard will help you to set the time of your server synchronized with "
+"an external time server."
+msgstr ""
+"Dukun ini membantu mengeset jam server Anda, secara lokal atau tersinkron "
+"dengan server waktu luar."
 
 #: ../time_wizard/time.wiz_.c:36
-msgid "- other reasons..."
-msgstr "- alasan lain..."
+msgid "LAAS/CNRS, Toulouse, France"
+msgstr "LAAS/CNRS, Toulouse, Perancis"
 
 #: ../time_wizard/time.wiz_.c:37
-msgid "- non existent time servers"
-msgstr "- server waktu tak ada"
+msgid "Testing the time servers availability"
+msgstr "Pengujian kesediaan server waktu"
 
 #: ../time_wizard/time.wiz_.c:38
-msgid "Time zone:"
-msgstr "Zona waktu:"
+msgid "Save config without test"
+msgstr "Simpan konfigurasi tanpa tes"
 
-#: ../time_wizard/time.wiz_.c:39
+#: ../time_wizard/time.wiz_.c:40
 msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr "Dept. Ilmu Komputer, Univ. Strathclyde, Glasgow, Skotlandia"
 
-#: ../time_wizard/time.wiz_.c:40
-msgid ""
-"You can try again to contact time servers, or save configuration without "
-"actually setting time."
-msgstr ""
-"Anda dapat mencoba lagi mengontak server waktu, atau menyimpan konfigurasi "
-"tanpa mengeset waktu secara aktual."
-
 #: ../time_wizard/time.wiz_.c:41
-msgid "Penn State University, University Park, PA"
-msgstr "Penn State University, University Park, PA"
+msgid "MIT Information Systems, Cambridge, MA"
+msgstr "MIT Information Systems, Cambridge, MA"
 
 #: ../time_wizard/time.wiz_.c:42
-msgid "Primary Time Server:"
-msgstr "Server Waktu Primer:"
+msgid "Baylor College of Medicine, Houston, Tx"
+msgstr "Baylor College of Medicine, Houston, Texas"
 
 #: ../time_wizard/time.wiz_.c:43
-msgid "Try again"
-msgstr "Coba lagi"
+msgid "Penn State University, University Park, PA"
+msgstr "Penn State University, University Park, PA"
 
 #: ../time_wizard/time.wiz_.c:44
-msgid "Washington State University Tri-Cities, Richland, Wa"
-msgstr "Washington State University Tri-Cities, Richland, Wa"
+msgid "- non existent time servers"
+msgstr "- server waktu tak ada"
 
 #: ../time_wizard/time.wiz_.c:45
-msgid "Time server configuration saved"
-msgstr "Konfigurasi server waktu telah disimpan"
+msgid "Time wizard"
+msgstr "Dukun waktu"
 
 #: ../time_wizard/time.wiz_.c:46
-msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
-msgstr "CRI, Campus d'Orsay, Universitas Paris Sud, Perancis"
+msgid "University of Oslo, Norway"
+msgstr "Universitas Oslo, Norwegia"
+
+#: ../time_wizard/time.wiz_.c:47
+msgid "Thus your server will be the local time server for your network."
+msgstr "Demikianlah server Anda akan jadi server waktu lokal jaringan Anda."
 
 #: ../time_wizard/time.wiz_.c:48
-msgid "Save config without test"
-msgstr "Simpan konfigurasi tanpa tes"
+msgid "- no outside network"
+msgstr "- tanpa jaringan luar"
 
 #: ../time_wizard/time.wiz_.c:49
-msgid "Singapore"
-msgstr "Singapura"
+msgid "Primary Time Server:"
+msgstr "Server Waktu Primer:"
 
 #: ../time_wizard/time.wiz_.c:50
-msgid "Fukuoka university, Fukuoka, Japan"
-msgstr "Universitaas Fukuoka, Fukuoka, Jepang"
+msgid "Time server configuration saved"
+msgstr "Konfigurasi server waktu telah disimpan"
 
 #: ../time_wizard/time.wiz_.c:51
-msgid "UNLV College of Engineering, Las Vegas, NV"
-msgstr "UNLV College of Engineering, Las Vegas, NV"
+msgid "press next to begin, or cancel to leave this wizard"
+msgstr "tekan Maju utk mulai, atau Batal utk keluar"
 
 #: ../time_wizard/time.wiz_.c:52
-msgid "Altea (Alicante/SPAIN)"
-msgstr "Altea (Alicante/SPANYOL)"
+msgid "Choose a time zone:"
+msgstr "Pilih zona waktu:"
 
 #: ../time_wizard/time.wiz_.c:53
-msgid "Time wizard"
-msgstr "Dukun waktu"
-
-#: ../web_wizard/web.wiz_.c:1
-msgid "user http sub-directory : ~/"
-msgstr ""
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr "Departemen Ilmu Komputer, Universitas Wisconsin-Madison"
 
 #: ../web_wizard/web.wiz_.c:2
-msgid "Modules :"
+msgid ""
+"* User module : allows users to have a directory in their home directories "
+"available on your http server via http://www.yourserver.com/~user, you will "
+"be asked for the name of this directory afterward."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:3
-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."
+msgid ""
+"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/web.wiz_.c:4
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
-msgstr "Server Web Intranet/Internet sukses dikonfigurasikan"
+#, fuzzy
+msgid "Internet web server:"
+msgstr "Server Web Internet:"
 
 #: ../web_wizard/web.wiz_.c:5
-msgid "user dir:"
+msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
-msgid ""
-"The wizard collected the following parameters needed to configure your Web "
-"Server"
-msgstr "Parameter konfigurasi Server Web telah terkumpul"
+#: ../web_wizard/web.wiz_.c:6
+msgid "Document root:"
+msgstr ""
 
-#: ../web_wizard/web.wiz_.c:8
-msgid "Web wizard"
-msgstr "Dukun web"
+#: ../web_wizard/web.wiz_.c:7
+msgid "user http sub-directory : ~/"
+msgstr ""
 
-#: ../web_wizard/web.wiz_.c:11
-msgid "This wizard will help you configuring the Web Server for your network."
-msgstr "Dukun ini membantu konfigurasi Server Web jaringan Anda."
+#: ../web_wizard/web.wiz_.c:9
+msgid "Enable the Web Server for the Intranet"
+msgstr "Aktifkan Server Web utk Intranet"
 
 #: ../web_wizard/web.wiz_.c:12
-#, fuzzy
-msgid "Internet web server:"
-msgstr "Server Web Internet:"
+msgid "Configuring the Web Server"
+msgstr "Konfigurasi Server Web"
 
 #: ../web_wizard/web.wiz_.c:13
-msgid "Enable the Web Server for the Intranet"
-msgstr "Aktifkan Server Web utk Intranet"
+msgid "Web Server"
+msgstr "Server Web"
 
 #: ../web_wizard/web.wiz_.c:14
-msgid ""
-"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/web.wiz_.c:15
 #, fuzzy
 msgid "Enable the Web Server for the Internet"
 msgstr "Aktifkan Server Web utk Intranet"
 
+#: ../web_wizard/web.wiz_.c:15
+#, fuzzy
+msgid "User directory:"
+msgstr "Direktori:"
+
 #: ../web_wizard/web.wiz_.c:16
-msgid "Select the kind of Web service you want to activate:"
-msgstr "Pilih jenis layanan Web yg ingin diaktifkan:"
+#, fuzzy
+msgid "This wizard will help you configuring the Web Server for your network."
+msgstr "Dukun ini membantu konfigurasi Server Web jaringan Anda."
 
 #: ../web_wizard/web.wiz_.c:17
-msgid "document root:"
-msgstr ""
+msgid "Web wizard"
+msgstr "Dukun web"
 
-#: ../web_wizard/web.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:18
 #, fuzzy
 msgid "Intranet web server:"
 msgstr "Server Web Intranet:"
 
-#: ../web_wizard/web.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:20
 msgid ""
-"Type the name of the directory users should create in theirs homes (whitout "
+"Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:24
-msgid "Configuring the Web Server"
-msgstr "Konfigurasi Server Web"
-
 #: ../web_wizard/web.wiz_.c:25
-msgid ""
-"* User module : allows users to get a directory in theirs homes directories "
-"available on your http server via http://www.yourserver.com/~user, you will "
-"be asked for the name of this directory afterward."
+msgid "activate user module"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:26
-msgid "Web Server"
-msgstr "Server Web"
+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/web.wiz_.c:27
-msgid "Web Server Configuration Wizard"
-msgstr "Dukun Konfigurasi Server Web"
+msgid "Select the kind of Web service you want to activate:"
+msgstr "Pilih jenis layanan Web yg ingin diaktifkan:"
+
+#: ../web_wizard/web.wiz_.c:28
+msgid ""
+"The wizard collected the following parameters needed to configure your Web "
+"Server"
+msgstr "Parameter konfigurasi Server Web telah terkumpul"
 
 #: ../web_wizard/web.wiz_.c:29
-msgid "Type the path of the directory you want being the document root."
+msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgstr "Server Web Intranet/Internet sukses dikonfigurasikan"
+
+#: ../web_wizard/web.wiz_.c:30
+msgid "Document Root:"
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:31
-msgid "activate user module"
+msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
 #: ../web_wizard/web.wiz_.c:32
-msgid "Document Root:"
-msgstr ""
+msgid "Web Server Configuration Wizard"
+msgstr "Dukun Konfigurasi Server Web"
 
 msgid "Cancel"
 msgstr "Batal"
diff --git a/po/it.po b/po/it.po
index d29de569..caceddce 100644
--- a/po/it.po
+++ b/po/it.po