English proofreading by Stew Benedict

1 files changed, 1222 insertions, 1209 deletions

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"