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

capitalized "Internet"

1 files changed, 363 insertions, 298 deletions

diff --git a/po/cy.po b/po/cy.po
index 1e348b31..4fed7362 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 12:47+0100\n"
-"PO-Revision-Date: 2004-02-14 20:58-0000\n"
+"POT-Creation-Date: 2004-02-27 02:27+0100\n"
+"PO-Revision-Date: 2004-02-26 14:40-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr "Gwall."
 #: ../dhcp_wizard/Dhcp.pm:124 ../dns_wizard/Bind.pm:244
 #: ../dns_wizard/Bind.pm:254 ../dns_wizard/Bind.pm:261
 #: ../ftp_wizard/Proftpd.pm:148 ../ldap_wizard/ldap.pm:172
-#: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
+#: ../news_wizard/Inn.pm:95 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:141 ../nisautofs_wizard/Nisautofs.pm:148
 #: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:295 ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319
@@ -68,7 +68,6 @@ msgid "Press next to begin, or Cancel to leave this wizard."
 msgstr "Gwasgwch nesaf i gychwyn, neu Diddymu i adael y dewin."
 
 #: ../client_wizard/Bind_client.pm:55
-#, fuzzy
 msgid ""
 "The server will use the information you enter here to make the name of the "
 "client available to other machines into your network."
@@ -190,8 +189,11 @@ msgid "This wizard will help you configuring the DHCP services of your server."
 msgstr "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau DHCP eich gweinydd."
 
 #: ../dhcp_wizard/Dhcp.pm:64
-msgid "If You want to enable PXE for your dhcp server please check the box."
-msgstr "Os ydych am alluogi PXE ar eich gweinydd dhcp ticiwch y blwch."
+msgid ""
+"If You want to enable PXE in your dhcp server please check the box (Pre-boot "
+"eXecution Environment, a protocol that allow computers to boot through the "
+"network)."
+msgstr ""
 
 #: ../dhcp_wizard/Dhcp.pm:64
 msgid "Range of addresses used by dhcp"
@@ -208,15 +210,15 @@ msgstr ""
 "sy'n cael eu cynnig. (hy: 192.168.100.20 192.168.100.40)"
 
 #: ../dhcp_wizard/Dhcp.pm:71 ../dhcp_wizard/Dhcp.pm:114
-msgid "Lowest IP Address:"
+msgid "Lowest IP address:"
 msgstr "Cyfeiriad IP Isaf:"
 
 #: ../dhcp_wizard/Dhcp.pm:72 ../dhcp_wizard/Dhcp.pm:115
-msgid "Highest IP Address:"
+msgid "Highest IP address:"
 msgstr "Cyfeiriad IP Uchaf"
 
 #: ../dhcp_wizard/Dhcp.pm:73 ../dhcp_wizard/Dhcp.pm:116
-msgid "Gateway IP Address:"
+msgid "Gateway IP address:"
 msgstr "Cyfeiriad porth IP"
 
 #: ../dhcp_wizard/Dhcp.pm:74 ../dhcp_wizard/Dhcp.pm:118
@@ -240,7 +242,7 @@ msgid "The IP of the server must not be in range."
 msgstr "Rhaid i IP y gweinydd beidio â bod o fewn amrediad."
 
 #: ../dhcp_wizard/Dhcp.pm:109
-msgid "Configuring the DHCP Server"
+msgid "Configuring the DHCP server"
 msgstr "Ffurfweddu'r Gweinydd DHCP"
 
 #: ../dhcp_wizard/Dhcp.pm:109
@@ -276,7 +278,8 @@ msgid "Interface:"
 msgstr "Rhyngwyneb:"
 
 #: ../dhcp_wizard/Dhcp.pm:124
-msgid "The wizard successfully configured the DHCP services of your server."
+#, fuzzy
+msgid "The wizard successfully configured the DHCP services."
 msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gweinydd."
 
 #: ../dhcp_wizard/Dhcp.pm:129 ../dns_wizard/Bind.pm:268
@@ -352,18 +355,16 @@ msgid "What do you want to do:"
 msgstr "Beth hoffech ei wneud:"
 
 #: ../dns_wizard/Bind.pm:126
-#, fuzzy
 msgid "(You don't need to add the domain after the name)"
-msgstr "(does dim angen teipio'r parth ar ôl yr enw)"
+msgstr "(Does dim angen teipio'r parth ar ôl yr enw)"
 
 #: ../dns_wizard/Bind.pm:135
 msgid "Choose the host you want to remove in the following list."
 msgstr "Dewis y gwesteiwr i'w dynnu o'r rhestr ganlynol."
 
 #: ../dns_wizard/Bind.pm:135
-#, fuzzy
 msgid "Remove a host in existing DNS configuration."
-msgstr "Tynnu gwesteiwr o'r ffurfweddiad dns presennol."
+msgstr "Tynwch westeiwr o'r ffurfweddiad DNS presennol."
 
 #: ../dns_wizard/Bind.pm:135
 msgid "Remove host:"
@@ -488,9 +489,8 @@ msgstr ""
 "tynnu gwestai."
 
 #: ../dns_wizard/Bind.pm:208
-#, fuzzy
 msgid "Wizard will Now build your DNS slave configuration"
-msgstr "Iawn. Adeiladu eich ffurfweddiad DNS"
+msgstr "Bydd y Dewin yn adeiladu eich ffurfweddiad gwas DNS"
 
 #: ../dns_wizard/Bind.pm:208 ../ldap_wizard/ldap.pm:145
 msgid "with this configuration:"
@@ -539,9 +539,8 @@ msgid "The wizard successfully configured the DNS service of your server."
 msgstr "Mae'r dewin wedi ffurfweddu'r gwasanaethau DNS ar gyfer eich gweinydd."
 
 #: ../dns_wizard/Bind.pm:269
-#, fuzzy
 msgid "Please Relaunch drakwizard, and try to change some parameters."
-msgstr "Ailgychwyn drakwizard, a cheisio newid rhai paramedrau."
+msgstr "Ailgychwynwch drakwizard, a cheisio newid rhai paramedrau."
 
 #: ../dns_wizard/Bind.pm:691
 msgid "Configuring your system as Master DNS server ..."
@@ -563,11 +562,11 @@ msgstr "Gweinydd DHCP"
 msgid "DNS server"
 msgstr "Gweinydd DNS"
 
-#: ../drakwizard.pl:43
+#: ../drakwizard.pl:43 ../news_wizard/Inn.pm:49
 msgid "News server"
 msgstr "Gweinydd newyddion"
 
-#: ../drakwizard.pl:44
+#: ../drakwizard.pl:44 ../nfs_wizard/NFS.pm:56
 msgid "NFS server"
 msgstr "Gweinydd NFS"
 
@@ -575,7 +574,7 @@ msgstr "Gweinydd NFS"
 msgid "Mail server"
 msgstr "Gweinydd e-bost"
 
-#: ../drakwizard.pl:46
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
@@ -633,18 +632,14 @@ msgid "FTP wizard"
 msgstr "Dewin FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-msgid "FTP Server Configuration Wizard"
+msgid "FTP server configuration wizard"
 msgstr "Dewin Ffurfweddu Gweinydd FTP"
 
 #: ../ftp_wizard/Proftpd.pm:73
-#, fuzzy
-msgid "This wizard will help you configuring an FTP Server for your network."
+msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
-"Dewin i'ch cynorthwyo i ffurfweddu'r Gweinydd FTP ar gyfer eich rhwydwaith."
-
-#: ../ftp_wizard/Proftpd.pm:79
-msgid "FTP Server"
-msgstr "Gweinydd FTP"
+"Bydd y Dewin hwn yn eich cynorthwyo i ffurfweddu'r Gweinydd FTP ar gyfer "
+"eich rhwydwaith."
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
@@ -652,23 +647,22 @@ msgstr "Dewiswch y math o wasanaeth FTP rydych am ei gychwyn:"
 
 #: ../ftp_wizard/Proftpd.pm:79
 msgid ""
-"Your server can act as an FTP Server toward your internal network (intranet) "
-"and as an FTP Server for the Internet."
+"Your server can act as an FTP server toward your internal network (intranet) "
+"and as an FTP server for the Internet."
 msgstr ""
 "Mae modd i'ch gweinydd weithredu fel Gweinydd FTP ar gyfer eich rhwydwaith "
 "mewnol (mewnrwyd) neu fel Gweinydd FTP ar gyfer y Rhyngrwyd."
 
 #: ../ftp_wizard/Proftpd.pm:81
-msgid "Enable the FTP Server for the Intranet"
+msgid "Enable the FTP server for the intranet"
 msgstr "Galluogi'r Gweinydd FTP ar gyfer y Fewnrwyd"
 
 #: ../ftp_wizard/Proftpd.pm:82
-msgid "Enable the FTP Server for the Internet"
+msgid "Enable the FTP server for the Internet"
 msgstr "Galluogi'r Gweinydd FTP ar gyfer y Rhyngrwyd"
 
 #: ../ftp_wizard/Proftpd.pm:88
-#, fuzzy
-msgid "Admin Email: email address of the FTP administrator."
+msgid "Admin email: email address of the FTP administrator."
 msgstr "E-bost Gweinyddwr: cyfeiriad e-bost gweinyddwr FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
@@ -678,13 +672,11 @@ msgstr ""
 "FTP."
 
 #: ../ftp_wizard/Proftpd.pm:88
-#, fuzzy
 msgid "Allow FXP: allow file transfer via another FTP."
 msgstr "Caniatáu FXP: caniatáu trosglwyddo ffeil drwy FTP arall."
 
 #: ../ftp_wizard/Proftpd.pm:88
-#, fuzzy
-msgid "Chroot Home user: users will only see their home directory."
+msgid "Chroot home user: users will only see their home directory."
 msgstr ""
 "Defnyddiwr Chroot home: bydd y defnyddiwr yn gweld eu cyfeiriadur cartref, "
 "yn unig."
@@ -704,11 +696,11 @@ msgid "Admin email:"
 msgstr "E-bost gweinyddwr:r"
 
 #: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root Login:"
+msgid "Permit root login:"
 msgstr "Caniatáu Mewngofnodi gwraidd"
 
 #: ../ftp_wizard/Proftpd.pm:98
-msgid "Chroot Home user:"
+msgid "Chroot home user:"
 msgstr "Defnyddiwr Chroot Home:"
 
 #: ../ftp_wizard/Proftpd.pm:99
@@ -720,10 +712,9 @@ msgid "Allow FXP:"
 msgstr "Caniatáu FXP"
 
 #: ../ftp_wizard/Proftpd.pm:106
-#, fuzzy
 msgid "You are in DHCP, server may not work with your configuration."
 msgstr ""
-"Rydych yn dhcp, efallai na fydd y gweinydd yn gweithio gyda'ch ffurfweddiad."
+"Rydych yn DHCP, efallai na fydd y gweinydd yn gweithio gyda'ch ffurfweddiad."
 
 #: ../ftp_wizard/Proftpd.pm:111
 msgid ""
@@ -734,31 +725,29 @@ msgstr ""
 "allanol."
 
 #: ../ftp_wizard/Proftpd.pm:115
-#, fuzzy
 msgid ""
-"I can't find bash in list of shells! It seems you modify it by hand ! Please "
-"correct."
-msgstr "Methu canfod bash yn y rhestr cregyn. Cywirwch."
+"I can't find bash in list of shells! It seems you have modified it by hand ! "
+"Please correct."
+msgstr ""
+"Methu canfod bash yn y rhestr cregyn. Rhaid ei newid gyda llaw! Cywirwch."
 
 #: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Rhaid i chi fod yn wraidd i wneud hyn..."
 
 #: ../ftp_wizard/Proftpd.pm:126
-msgid "Configuring the FTP Server"
+msgid "Configuring the FTP server"
 msgstr "Ffurfweddu'r Gweinydd FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
-#, fuzzy
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
-"Server"
+"server"
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol\n"
-"sydd eu hangen ar gyfer ffurfweddu eich Gweinydd FTP"
+"Mae'r dewin wedi casglu'r paramedrau canlynol ar gyfer ffurfweddu eich "
+"Gweinydd FTP"
 
 #: ../ftp_wizard/Proftpd.pm:126
-#, fuzzy
 msgid ""
 "To accept those values, and configure your server, click the next button or "
 "use the back button to correct them"
@@ -767,11 +756,11 @@ msgstr ""
 "Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
 #: ../ftp_wizard/Proftpd.pm:136
-msgid "Intranet FTP Server:"
+msgid "Intranet FTP server:"
 msgstr "Gweinydd FTP Mewnrwyd"
 
 #: ../ftp_wizard/Proftpd.pm:137
-msgid "Internet FTP Server:"
+msgid "Internet FTP server:"
 msgstr "Gwasanaeth FTP y Rhyngrwyd:"
 
 #: ../ftp_wizard/Proftpd.pm:138
@@ -795,15 +784,14 @@ msgid "Allow FXP"
 msgstr "Caniatáu FXP"
 
 #: ../ftp_wizard/Proftpd.pm:148
-msgid "The wizard successfully configured your Intranet/Internet FTP Server"
+msgid "The wizard successfully configured your intranet/Internet FTP server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gweinydd FTP Mewnrwyd/Rhyngrwyd"
 
 #: ../ftp_wizard/Proftpd.pm:155 ../postfix_wizard/Postfix.pm:155
 #: ../pxe_wizard/Pxe.pm:332
-#, fuzzy
 msgid "Please relaunch drakwizard, and try to change some parameters."
-msgstr "Ailgychwyn drakwizard, a cheisio newid rhai paramedrau."
+msgstr "Ailgychwynwch drakwizard, a cheisio newid rhai paramedrau."
 
 #: ../installsrv_wizard/Installsrv.pm:51
 msgid "Configure a MDK install server (via NFS and http)"
@@ -834,16 +822,14 @@ msgstr ""
 "gosodiad Mandrake."
 
 #: ../installsrv_wizard/Installsrv.pm:71
-#, fuzzy
 msgid "The destination directory could not be '/var/install/'"
-msgstr "Cyfeiriadur cyrchfan yn methu bod yn '/var/install/'"
+msgstr "Mae'r cyfeiriadur cyrchfan yn methu bod yn '/var/install/'"
 
 #: ../installsrv_wizard/Installsrv.pm:71
 msgid "ie use: /var/install/mdk-release"
 msgstr "hy, defnyddio: /var/install/mdk-release"
 
 #: ../installsrv_wizard/Installsrv.pm:75
-#, fuzzy
 msgid ""
 "Error, the source directory must be a directory with full Mandrake "
 "installation directory."
@@ -852,12 +838,12 @@ msgstr ""
 "chyfeiriadur gosodiad Mandrake llawn."
 
 #: ../installsrv_wizard/Installsrv.pm:79
-#, fuzzy
-msgid "The Destination directory already in use, please choose another one."
-msgstr "Cyfeiriadur cyrchfan eisoes yn cael ei ddefnyddio, dewiswch un arall."
+msgid "The destination directory already in use, please choose another one."
+msgstr ""
+"Mae'r cyfeiriadur cyrchfan eisoes yn cael ei ddefnyddio, dewiswch un arall."
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "Your install server will be configured with those parameters"
+msgid "Your install server will be configured with these parameters"
 msgstr "Bydd eich gweinydd gosod yn cael ei ffurfweddu gyda'r paramedrau hyn."
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -874,6 +860,9 @@ msgid ""
 "a DHCP server with PXE suport, and a PXE server. So it will be very easy to "
 "install Mandrake through network."
 msgstr ""
+"Llongyfarchiadau, mae gweinydd Gosod Mandrake yn awr yn barod. Mae modd "
+"ffurfweddu gweinydd DHCP gyda chynhaliaeth PXE a gweinydd PXE. Felly, bydd "
+"yn hawdd iawn gosod Mandrake drwy rwydwaith."
 
 #: ../installsrv_wizard/Installsrv.pm:143
 msgid "Copying data to destination directory, can take a while...."
@@ -908,7 +897,6 @@ msgid "Add data in LDAP"
 msgstr "Ychwanegu data yn LDAP"
 
 #: ../ldap_wizard/ldap.pm:84
-#, fuzzy
 msgid "uid, gid, home directory, "
 msgstr "Cyfeiriadur cartref uid, guid."
 
@@ -1074,7 +1062,7 @@ msgstr "Croeso i'r Dewin Newyddion"
 #: ../news_wizard/Inn.pm:49
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet news server is "
+"example, if your provider is \"provider.com\", the Internet news server is "
 "usually \"news.provider.com\"."
 msgstr ""
 "Rhaid i enw'r gwesteiwyr rhyngrwyd fod ar ffurf  \"gwestai.parth.mathparth"
@@ -1082,10 +1070,6 @@ msgstr ""
 "newyddion rhyngrwyd yw \"newyddion.darparwr.com\"."
 
 #: ../news_wizard/Inn.pm:49
-msgid "News Server"
-msgstr "Gweinydd Newyddion"
-
-#: ../news_wizard/Inn.pm:49
 msgid ""
 "The news server name is the name of the host providing the Internet news to "
 "your network; the name is usually provided by your provider."
@@ -1095,24 +1079,24 @@ msgstr ""
 "darparwr."
 
 #: ../news_wizard/Inn.pm:54
-msgid "News Server Name:"
+msgid "News server name:"
 msgstr "Enw Gweinydd Newyddion:"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Depending on the kind of internet connection you have, an appropriate "
+"Depending on the kind of Internet connection you have, an appropriate "
 "polling period can change between 6 and 24 hours."
 msgstr ""
 "Gan ddibynnu ar y math o gysylltiad rhyngrwyd sydd gennych, mae cyfnod galw "
 "priodol yn gallu newid rhwng 6 a 24 awr."
 
 #: ../news_wizard/Inn.pm:60
-msgid "Polling Period"
+msgid "Polling period"
 msgstr "Cyfnod Gofyn"
 
 #: ../news_wizard/Inn.pm:60
 msgid ""
-"Your server will regularly poll the News Server for obtaning the latest "
+"Your server will regularly poll the News server for obtaning the latest "
 "Internet News; the polling period set the interval between two consecutive "
 "polling."
 msgstr ""
@@ -1121,7 +1105,7 @@ msgstr ""
 "dau ofyniad dilynol."
 
 #: ../news_wizard/Inn.pm:65
-msgid "Polling Period (Hours):"
+msgid "Polling period (hours):"
 msgstr "Cyfnod Gofyn (Oriau):"
 
 #: ../news_wizard/Inn.pm:76
@@ -1138,31 +1122,30 @@ msgstr "Ffurfweddu'r Gweinydd Newyddion:"
 
 #: ../news_wizard/Inn.pm:86
 msgid ""
-"The wizard collected the following parameters\n"
-"needed to configure your Internet News Service:"
+"The wizard collected the following parameters needed to configure your "
+"Internet News service:"
 msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol\n"
 "sydd eu hangen ar gyfer ffurfweddu eich Gwasanaeth Newyddion Rhyngrwyd:"
 
-#: ../news_wizard/Inn.pm:87 ../proxy_wizard/Squid.pm:148
-#: ../proxy_wizard/Squid.pm:161 ../samba_wizard/Samba.pm:207
-#: ../web_wizard/Apache.pm:131
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:134
+#, fuzzy
 msgid ""
-"To accept these values, and configure your server, click the Next button or "
-"use the Back button to correct them."
+"To accept these values, and configure your server, click the next button or "
+"use the back button to correct them."
 msgstr ""
-"I dderbyn y gwerth hwn ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
+"I dderbyn y gwerthoedd hyn, ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
 "Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
-#: ../news_wizard/Inn.pm:89
-msgid "News Server:"
+#: ../news_wizard/Inn.pm:88
+msgid "News server:"
 msgstr "Gweinydd Newyddion"
 
-#: ../news_wizard/Inn.pm:90
-msgid "Polling Interval:"
+#: ../news_wizard/Inn.pm:89
+msgid "Polling interval:"
 msgstr "Cyfnod Gofyn:"
 
-#: ../news_wizard/Inn.pm:96
+#: ../news_wizard/Inn.pm:95
 msgid ""
 "The wizard successfully configured your Internet News service of your server."
 msgstr ""
@@ -1173,7 +1156,6 @@ msgid "NFS Wizard"
 msgstr "Dewin NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:37
-#: ../samba_wizard/Samba.pm:65
 msgid "All - No access restriction"
 msgstr "Pob - Dim cyfyngiad mynediad"
 
@@ -1186,27 +1168,24 @@ msgid "NFS Server Configuration Wizard"
 msgstr "Dewin Ffurfweddu Gweinydd NFS"
 
 #: ../nfs_wizard/NFS.pm:51
-msgid "This wizard will help you configuring the NFS Server for your network."
+msgid "This wizard will help you configuring the NFS server for your network."
 msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu eich Gweinydd NFS ar gyfer eich "
 "rhwydwaith."
 
-#: ../nfs_wizard/NFS.pm:56
-msgid "NFS Server"
-msgstr "Gweinydd NFS"
-
 #: ../nfs_wizard/NFS.pm:59
 msgid "Directory:"
 msgstr "Cyfeiriadur:"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
-msgid "Access Control"
-msgstr "Rheoli Mynediad"
+#: ../nfs_wizard/NFS.pm:64 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:119
+msgid "Access control"
+msgstr "Rheoli mynediad"
 
-#: ../nfs_wizard/NFS.pm:64 ../proxy_wizard/Squid.pm:104
+#: ../nfs_wizard/NFS.pm:64
 msgid ""
-"Choose the level that suits your needs. If you don't know, the Local Network "
-"level is usually the most appropriate. Beware that the All level may be not "
+"Choose the level that suits your needs. If you don't know, the local network "
+"level is usually the most appropriate. Beware that the all level may be not "
 "secure."
 msgstr ""
 "Dewiswch lefel s'yn addas i'ch anghenion. Os nad ydych yn siwr, lefel y "
@@ -1256,31 +1235,26 @@ msgid "Netmask :"
 msgstr "Netmask :"
 
 #: ../nfs_wizard/NFS.pm:102
-msgid "The wizard successfully configured your NFS Server"
+msgid "The wizard successfully configured your NFS server"
 msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gweinydd NFS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:64
-#, fuzzy
 msgid ""
 "You need to readjust your NIS domainname. For a NIS server you need a "
 "correct NIS domainname, not equal to localdomain or none."
 msgstr ""
-"Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
-"gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect i'w "
-"newid."
+"Mae angen i chi newid eich enw parth NIS. Mae angen enw parth cywir ar gyfer "
+"gweinydd NIS, nid cydradd i barth lleol na dim."
 
-#: ../nisautofs_wizard/Nisautofs.pm:71
-msgid "NIS Server with autofs map"
+#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:98
+msgid "NIS server with autofs map"
 msgstr "Gweinydd NIS gyda autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
-msgid "NIS Client"
+msgid "NIS client"
 msgstr "Cleient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:98
-msgid "NIS server with autofs map"
-msgstr "Gweinydd NIS gyda autofs map"
-
 #: ../nisautofs_wizard/Nisautofs.pm:77
 msgid "Setup a NIS server with autofs map, auto.home and auto.master files."
 msgstr "Gosod gweinydd Nis gyda autofs map, auto.home a ffeiliau auto.master."
@@ -1288,7 +1262,7 @@ msgstr "Gosod gweinydd Nis gyda autofs map, auto.home a ffeiliau auto.master."
 #: ../nisautofs_wizard/Nisautofs.pm:77
 #, fuzzy
 msgid ""
-"User automatically mount their home directory from server, when they log on "
+"Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
 msgstr ""
 "Mae'r cleient myn gallu gosod eu cyfeiriadur cartref wrth fewngofnodi i "
@@ -1303,27 +1277,26 @@ msgid "Configure computer to be a NIS client"
 msgstr "Ffurfweddu eich cyfrifiadur i fod yn gleient N\t..."
 
 #: ../nisautofs_wizard/Nisautofs.pm:90
-#, fuzzy
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Rhaid gosod nisdomain a nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92
-msgid "NIS Server:"
+#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
+#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+msgid "NIS server:"
 msgstr "Gweinydd NIS"
 
 #: ../nisautofs_wizard/Nisautofs.pm:93
-msgid "NIS Domain:"
+msgid "NIS domain:"
 msgstr "Parth NIS::"
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid ""
-"A NIS server is usefull to create user, hostname database. The wizard also "
-"build autofs map, so it provides the capabilitie for NIS user to automount "
+"A NIS server is useful to create user, hostname database. The wizard also "
+"build autofs map, so it provides the capabilities for NIS user to automount "
 "their home directory on a NIS client computer."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be export through NFS server."
@@ -1332,19 +1305,15 @@ msgstr ""
 "yn allforio drwy weinydd NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
-#, fuzzy
 msgid "NIS domain: NIS domain to use (generally same as your DNS domainaname)."
-msgstr "Parth NIS: parth NIC ar gyfer eich gweinydd NIS:  /."
+msgstr ""
+"Parth NIS: parth NIS i'w ddefnyddio (yn gyffredinol yrun un â'ch enwparth "
+"DNS)."
 
 #: ../nisautofs_wizard/Nisautofs.pm:98
 msgid "NIS server: name of your computer."
 msgstr "Gweinydd NIS: enw'r cyfrifiadur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:100 ../nisautofs_wizard/Nisautofs.pm:110
-#: ../nisautofs_wizard/Nisautofs.pm:125
-msgid "NIS server:"
-msgstr "Gweinydd NIS"
-
 #: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
 msgid "Home NIS:"
 msgstr "NIS Cartref:"
@@ -1355,59 +1324,38 @@ msgid "NIS domainname:"
 msgstr "Enw parth NIS:"
 
 #: ../nisautofs_wizard/Nisautofs.pm:108
-#, fuzzy
 msgid "The wizard will set your NIS server with autofs map"
-msgstr "Bydd yn gosod eich gweinydd NIS gyda  autofs map"
+msgstr "Bydd y dewin yn gosod eich gweinydd NIS gyda  autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:113
 msgid "NIS directory:"
 msgstr "Cyfeiriadur NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:114
-msgid "Network File:"
-msgstr "Ffeil Rhwydwaith"
-
-#: ../nisautofs_wizard/Nisautofs.pm:115
-msgid "NFS exports:"
-msgstr "Allforion NFS"
-
-#: ../nisautofs_wizard/Nisautofs.pm:116
-msgid "Auto master:"
-msgstr "Awto Feistr"
-
-#: ../nisautofs_wizard/Nisautofs.pm:117
-msgid "Auto home:"
-msgstr "Awto cartref"
-
 #: ../nisautofs_wizard/Nisautofs.pm:123
-#, fuzzy
 msgid "NIS domainname: name of NIS domain."
 msgstr "Enw parth NIS: enw parth NIS "
 
 #: ../nisautofs_wizard/Nisautofs.pm:123
-#, fuzzy
 msgid "NIS server: hostname of the NIS server."
 msgstr "Gweinydd NIS: enw parth gweinydd NIS."
 
 #: ../nisautofs_wizard/Nisautofs.pm:123
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding informationdaem."
+"binding information."
 msgstr ""
 
 #: ../nisautofs_wizard/Nisautofs.pm:132
-#, fuzzy
 msgid "Error should be a directory."
 msgstr "Gwall i fod yn gyfeiriadur"
 
 #: ../nisautofs_wizard/Nisautofs.pm:136
-#, fuzzy
 msgid "Error nisdomainame should not be 'none' or 'localdomain'"
-msgstr "Gwall dylai nisdomainame fod yn gywir (nid dim na pharth lleol)"
+msgstr "Gwall dylai nisdomainame fod yn 'dim' neu 'parthlleol'."
 
 #: ../nisautofs_wizard/Nisautofs.pm:136
 msgid "Please adjust it."
-msgstr ""
+msgstr "Newidiwch hwn."
 
 #: ../nisautofs_wizard/Nisautofs.pm:142
 msgid "The wizard successfully configured your machine to be a NIS client."
@@ -1427,11 +1375,11 @@ msgid "Configuring your system to be a NIS server with Autofs map..."
 msgstr "Ffurfweddu eich system fel gweinydd NIS gyda +Autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:310
-msgid "NIS with autofs map"
+msgid "NIS with Autofs map"
 msgstr "NIS gydag autofs map"
 
 #: ../nisautofs_wizard/Nisautofs.pm:339
-msgid "Configuring your system as NIS Client ..."
+msgid "Configuring your system as NIS client ..."
 msgstr "Ffurfweddu eich system fel Cleient NIS..."
 
 #: ../postfix_wizard/Postfix.pm:39
@@ -1489,7 +1437,7 @@ msgstr ""
 
 #: ../postfix_wizard/Postfix.pm:89
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
-msgstr ""
+msgstr "Dylai'r ffuiad fod yn enw parth dilys megis \"fymharth.com\"!"
 
 #: ../postfix_wizard/Postfix.pm:94
 msgid "Masquerade domain name:"
@@ -1522,7 +1470,7 @@ msgstr ""
 #: ../postfix_wizard/Postfix.pm:109
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
-"example, if your provider is \"provider.com\", the internet mail server is "
+"example, if your provider is \"provider.com\", the Internet mail server is "
 "usually \"smtp.provider.com\"."
 msgstr ""
 "Rhaid i enw'r gwesteiwyr rhyngrwyd fod ar ffurf  \"gwesteiwr.parth.mathparth"
@@ -1578,15 +1526,6 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gwasanaeth E-bost Rhyngrwyd:"
 
-#: ../postfix_wizard/Postfix.pm:134
-#, fuzzy
-msgid ""
-"To accept these values, and configure your server, click the next button or "
-"use the back button to correct them."
-msgstr ""
-"I dderbyn y gwerthoedd hyn, ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
-"Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
-
 #: ../postfix_wizard/Postfix.pm:137
 #, fuzzy
 msgid "Form of the address"
@@ -1721,6 +1660,20 @@ msgid "Disk space (MB):"
 msgstr "Lle ar Ddisg (MB)"
 
 #: ../proxy_wizard/Squid.pm:104
+msgid "Access Control"
+msgstr "Rheoli Mynediad"
+
+#: ../proxy_wizard/Squid.pm:104
+msgid ""
+"Choose the level that suits your needs. If you don't know, the Local Network "
+"level is usually the most appropriate. Beware that the All level may be not "
+"secure."
+msgstr ""
+"Dewiswch lefel s'yn addas i'ch anghenion. Os nad ydych yn siwr, lefel y "
+"Rhwydwaith Lleol sydd fel arfer yn fwyaf addas. Nid yw'r Pob lefel yn gwbl "
+"ddiogel."
+
+#: ../proxy_wizard/Squid.pm:104
 msgid "The proxy can be configured to use different access control levels"
 msgstr ""
 "Mae modd ffurfweddu'r dirprwy i ddefnyddio lefelau rheoli mynediad gwahanol"
@@ -1787,6 +1740,15 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich dirprwy:"
 
+#: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
+#: ../samba_wizard/Samba.pm:207 ../web_wizard/Apache.pm:131
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"I dderbyn y gwerth hwn ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
+"Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
+
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
 msgid "Port:"
 msgstr "Porth:"
@@ -1812,14 +1774,12 @@ msgid "PXE Wizard"
 msgstr "Dewin PXE"
 
 #: ../pxe_wizard/Pxe.pm:78
-#, fuzzy
 msgid ""
 "You need to readjust your domainname, not equal to localdomain or none. "
 "Please launch drakconnect to adjust it."
 msgstr ""
-"Mae angen i chi newid eich enw parth. Mae angen enw parth cywir ar gyfer "
-"gweinydd DNS, nid cydradd i barth lleol na dim. Cychwynnwch drakconnect i'w "
-"newid."
+"Mae angen i chi newid eich enw parth, nid cydradd i parthlleol na dim. "
+"Cychwynnwch drakconnect i'w newid."
 
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:193
 msgid "Set PXE server"
@@ -1876,20 +1836,19 @@ msgid ""
 "PXE description is used to explain the rule of the boot image, ie: Mandrake "
 "9.2 image, Mandrake cooker image.."
 msgstr ""
+"Mae disgrifiad PXE yn cael ei ddefnyddio i esbonio rheol y delwedd cychwyn, "
+"hy delwedd Mandrake 9.2, delwedd cooker Mandrake..."
 
 #: ../pxe_wizard/Pxe.pm:135
-#, fuzzy
 msgid ""
 "PXE name: the name displayed in PXE menu (please provide a word or a  "
 "number, with no space)"
-msgstr "Enw PXE: enw yn newislen PXE (un gair/rhif, dim bylchau)"
+msgstr ""
+"Enw PXE: enw yn newislen PXE (rhowch un gair neu rif,  gyda dim bylchau)"
 
 #: ../pxe_wizard/Pxe.pm:135
-#, fuzzy
 msgid "Path to image: provide the full path to the network boot image"
-msgstr ""
-"Llwybr i'r ddelwedd: llwybr llawn i'r ddelwedd (angen delwedd cychwyn "
-"rhwydwaith)"
+msgstr "Llwybr i'r ddelwedd: llwybr llawn i'r ddelwedd cychwyn rhwydwaith"
 
 #: ../pxe_wizard/Pxe.pm:135
 msgid ""
@@ -1899,9 +1858,8 @@ msgid ""
 msgstr ""
 
 #: ../pxe_wizard/Pxe.pm:145
-#, fuzzy
 msgid "Add all.rdz boot image"
-msgstr "Ychwanegu delwedd cychwyn"
+msgstr "Ychwanegu delwedd cychwyn all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:145
 msgid ""
@@ -1909,20 +1867,20 @@ msgid ""
 "boot network computer through a kernel (vmlinuz), and provide one file with "
 "all drivers needed (in our case all.rdz)."
 msgstr ""
+"Am rhesymau technegol, mewn achos o ddelweddau cychwyn niferus, mae'n "
+"symlach cychwyn cyfrifiadur rhwydwaith drwy gnewyllyn (vmlinuz), a darparu "
+"un ffeil gyda'r holl yrrwyr angerheidiol (yn yr achos hwn all.rdz)."
 
 #: ../pxe_wizard/Pxe.pm:145
-#, fuzzy
 msgid ""
 "PXE name: the name displayed in PXE menu (please provide a word or a number, "
 "with no space)"
-msgstr "Enw PXE: enw yn newislen PXE (un gair/rhif, dim bylchau)"
+msgstr ""
+"Enw PXE: enw yn newislen PXE (rhowch un gair neu un rhif, gyda dim bylchau)"
 
 #: ../pxe_wizard/Pxe.pm:145
-#, fuzzy
 msgid "Path to all.rdz: provide the full path to all.rdz image"
-msgstr ""
-"Llwybr i'r ddelwedd: llwybr llawn i'r ddelwedd (angen delwedd cychwyn "
-"rhwydwaith)"
+msgstr "Llwybr i'r all.rdz: darparu llwybr llawn i'r ddelwedd all.rdz"
 
 #: ../pxe_wizard/Pxe.pm:145
 msgid ""
@@ -1930,11 +1888,14 @@ msgid ""
 "to name this image, so each boot image is related to a name in PXE menu. So "
 "user can choose wich image he wants to boot through PXE."
 msgstr ""
+"I gychwyn drwy rhwydwaith, mae'r cyfrifiadur angen delwedd cychwyn. At "
+"hynny, mae angen enw ar gyfer y ddelwedd, fel bo cysylltiad rhwng y "
+"dddelwedd cychwyn ac enw yn newislen PXE. Felly mae'r defnyddiwr yn gallu "
+"dewis pa ddelwedd i'w chychwyn drwy PXE."
 
 #: ../pxe_wizard/Pxe.pm:156
-#, fuzzy
 msgid "Please choose the PXE boot image you want to remove from PXE server."
-msgstr "Dewis y ddelwedd cychwyn PXE rydych am ei dynnu o'r gweinydd PXE."
+msgstr "Dewiswch y ddelwedd cychwyn PXE rydych am ei dynnu o'r gweinydd PXE."
 
 #: ../pxe_wizard/Pxe.pm:156
 msgid "Remove a boot image"
@@ -1943,49 +1904,48 @@ msgstr "Tynnu delwedd cychwyn"
 #: ../pxe_wizard/Pxe.pm:156
 msgid "The PXE boot image, and the related entry in PXE menu will be deleted."
 msgstr ""
+"Bydd y ddelwedd cychwyn PXE, a'r cofnod sy'n perthyn yn newislen PXE yn cael "
+"eu dileu."
 
 #: ../pxe_wizard/Pxe.pm:158
 msgid "Boot image to remove:"
 msgstr "Delwedd cychwyn i'w dynnu"
 
 #: ../pxe_wizard/Pxe.pm:163
-#, fuzzy
 msgid "Add options to boot image"
-msgstr "Ychwanegu dewis i ddelwedd cychwyn:"
+msgstr "Ychwanegu dewis i'r ddelwedd cychwyn"
 
 #: ../pxe_wizard/Pxe.pm:163
 msgid ""
 "In some case, you want to add some option to PXE boot image. This wizard "
 "provides an easy way to custom boot image with common parameters."
 msgstr ""
+"Mewn rhai achosion, byddwch angen ychwanegu dewisiadau i'r ddelwedd cychwyn "
+"PXE. Mae'r dewin yn darparu ffordd hawdd i addasu'r ddelwedd cychwyn gyda "
+"pharamedrau cyffredin."
 
 #: ../pxe_wizard/Pxe.pm:163
-#, fuzzy
 msgid ""
 "Please choose, from the list below, the PXE boot image you want to modify"
-msgstr "Dewiswch ddelwedd cychwyn PXE i'w newid"
+msgstr "Dewiswch, o'r rhestr,  y ddelwedd cychwyn PXE i'w newid"
 
 #: ../pxe_wizard/Pxe.pm:165 ../pxe_wizard/Pxe.pm:173 ../pxe_wizard/Pxe.pm:251
 msgid "Boot image to modify:"
 msgstr "Delwedd cychwyn i'w newid:"
 
 #: ../pxe_wizard/Pxe.pm:171
-#, fuzzy
 msgid "Add option to PXE boot disk"
-msgstr "Ychwanegu dewis i ddelwedd cychwyn:"
+msgstr "Ychwanegu dewis i ddelwedd cychwyn PXE"
 
 #: ../pxe_wizard/Pxe.pm:171
-#, fuzzy
 msgid "Install directory: the full path to MDK install server directory"
-msgstr "Gosod cyfeiriadur: llwybr llawn i gyfeiriadur gweinydd gosod MDK"
+msgstr "Gosod cyfeiriadur: y llwybr llawn i gyfeiriadur gweinydd gosod MDK"
 
 #: ../pxe_wizard/Pxe.pm:171
-#, fuzzy
 msgid "Installation method: choose NFS or HTTP."
-msgstr "Dull gosodi:"
+msgstr "Dull gosod: dewis NFS neu HTTP."
 
 #: ../pxe_wizard/Pxe.pm:171
-#, fuzzy
 msgid ""
 "Server IP: IP address of server, which contain installation directory. You "
 "can create one with MDK install server wizard."
@@ -2019,9 +1979,8 @@ msgstr ""
 "osod."
 
 #: ../pxe_wizard/Pxe.pm:181
-#, fuzzy
 msgid "Ramsize: adjust the ramsize parameter on boot disk."
-msgstr "Ramsize: newid ramsize ar y disg cychwyn."
+msgstr "Ramsize: newid paramedrau ramsize ar y disg cychwyn."
 
 #: ../pxe_wizard/Pxe.pm:181
 msgid "VGA option: if you encounter any problem whith VGA, please adjust. "
@@ -2052,13 +2011,12 @@ msgid "Custom option:"
 msgstr "Dewis addasu:"
 
 #: ../pxe_wizard/Pxe.pm:193
-#, fuzzy
 msgid ""
 "Now the wizard will configure all needed default configurations files to "
 "allow computers to boot through the network."
 msgstr ""
-"Bydd hwn yn ffurfweddu pob ffeil ffurfweddiad rhagosodedig angenrheidiol i "
-"osod gweinydd PXE/"
+"Bydd y dewin yn ffurfweddu pob ffeil ffurfweddiad rhagosodedig angenrheidiol "
+"i ganiatáu i gyfrifiaduron gychywn drwy'r rhwydwaith."
 
 #: ../pxe_wizard/Pxe.pm:193
 msgid ""
@@ -2072,6 +2030,8 @@ msgid ""
 "Please provide a bootable image. To boot through network, network computer "
 "need a boot image."
 msgstr ""
+"Darparwch ddelwedd cychwynadwy. I gychwyn drwy rhwydwaith, mae cyfrifiadur "
+"rhwydwaith angen delwedd cychwyn."
 
 #: ../pxe_wizard/Pxe.pm:201
 #, fuzzy
@@ -2082,7 +2042,7 @@ msgstr "Angen delwedd. Ychwanegwch un."
 msgid ""
 "Please provide an all.rdz image, wich contain all drivers. You can find one "
 "in first CD of Mandrakesoft product, in /isolinux/alt0/ directory."
-msgstr ""
+msgstr "Darparwch ddelwedd all.rdz, sy'n cynnwys yr holl yrwyr."
 
 #: ../pxe_wizard/Pxe.pm:213 ../pxe_wizard/Pxe.pm:217
 #, perl-format
@@ -2090,10 +2050,9 @@ msgid "Please choose an image from a different directory than %s."
 msgstr "Dewiswch ddelwedd o gyfeiriadur gwahanol i %s"
 
 #: ../pxe_wizard/Pxe.pm:221
-#, fuzzy
 msgid ""
 "Please provide a correct PXE name: one word or one number with no space."
-msgstr "Darparwch enw cywir i'r cofnod PXE (un gair)"
+msgstr "Darparwch enw PXE cywir: un gair neu un rhif gyda dim bylchau"
 
 #: ../pxe_wizard/Pxe.pm:225
 msgid ""
@@ -2103,19 +2062,16 @@ msgstr ""
 "PXE' yn gyntaf."
 
 #: ../pxe_wizard/Pxe.pm:230 ../pxe_wizard/Pxe.pm:234
-#, fuzzy
 msgid "A similar name is already used in PXE menu"
-msgstr "Mae enw tebyg yn cael ei ddefnyddio eisoes mewn cofnod dewislen PXE"
+msgstr "Mae enw tebyg yn cael ei ddefnyddio eisoes mewn dewislen PXE"
 
 #: ../pxe_wizard/Pxe.pm:230 ../pxe_wizard/Pxe.pm:234
-#, fuzzy
 msgid "Please provide another one."
-msgstr "Rhowch enw Dewislen PXE gwahanol"
+msgstr "Rhowch un gwahanol"
 
 #: ../pxe_wizard/Pxe.pm:238
-#, fuzzy
 msgid "The wizard will now prepare all default files to set your PXE server"
-msgstr "Yn paratoi pob ffeil rhagosodedig i osod y gweinydd PXE"
+msgstr "Bydd y dewin yn paratoi pob ffeil rhagosodedig i osod y gweinydd PXE"
 
 #: ../pxe_wizard/Pxe.pm:240
 msgid "TFTP directory:"
@@ -2134,14 +2090,12 @@ msgid "PXE 'help' file:"
 msgstr "Ffeil 'cymorth' PXE:"
 
 #: ../pxe_wizard/Pxe.pm:249
-#, fuzzy
 msgid "The wizard will now modify boot options with those parameters:"
-msgstr "Yn newid y dewisiadau cychwyn yn y ddelwedd"
+msgstr "Bydd y dewin yn newid y dewisiadau cychwyn gyda'r paramedrau hynny:"
 
 #: ../pxe_wizard/Pxe.pm:266
-#, fuzzy
 msgid "The wizard will now remove this PXE boot image"
-msgstr "Mae'r dewin wedi tynnu'r ddelwedd cychwyn PXE yn llwyddiannus."
+msgstr "Bydd y dewin yn tynnu'r ddelwedd cychwyn PXE"
 
 #: ../pxe_wizard/Pxe.pm:268
 msgid "PXE entry to remove:"
@@ -2183,15 +2137,16 @@ msgstr "Dewin Samba"
 msgid "%s does not exist."
 msgstr "Nid yw %s yn bod."
 
+#: ../samba_wizard/Samba.pm:65
+#, fuzzy
+msgid "All - no access restriction"
+msgstr "Pob - Dim cyfyngiad mynediad"
+
 #: ../samba_wizard/Samba.pm:66
-msgid "My rules - Ask me allowed and denied hosts"
+msgid "My rules - ask me allowed and denied hosts"
 msgstr "Fy rheol - parthau iawn a drwg"
 
 #: ../samba_wizard/Samba.pm:71
-msgid "Samba Configuration Wizard"
-msgstr "Dewin Ffurfweddu Samba"
-
-#: ../samba_wizard/Samba.pm:71
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2200,6 +2155,10 @@ msgstr ""
 "gyfer gorsafoedd gwaith sy'n rhedeg systemau heblaw Linux."
 
 #: ../samba_wizard/Samba.pm:71
+msgid "Samba configuration wizard"
+msgstr "Dewin Ffurfweddu Samba"
+
+#: ../samba_wizard/Samba.pm:71
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau Samba eich gweinydd."
@@ -2221,7 +2180,7 @@ msgid "The Workgroup is wrong"
 msgstr "Mae'r Grwp Gwaith yn anghywir"
 
 #: ../samba_wizard/Samba.pm:92
-msgid "Server Banner."
+msgid "Server banner."
 msgstr "Baner Gweinydd"
 
 #: ../samba_wizard/Samba.pm:92
@@ -2237,20 +2196,16 @@ msgid "Banner:"
 msgstr "Baner:"
 
 #: ../samba_wizard/Samba.pm:103
-msgid "The Server Banner is incorrect"
+msgid "The server banner is incorrect"
 msgstr "Mae Baner y Gweinydd yn anghywir"
 
-#: ../samba_wizard/Samba.pm:108 ../samba_wizard/Samba.pm:119
-msgid "Access control"
-msgstr "Rheoli mynediad"
-
 #: ../samba_wizard/Samba.pm:114
 msgid "Access level :"
 msgstr "Lefel mynediad:"
 
 #: ../samba_wizard/Samba.pm:119
 msgid ""
-"* Example 1: allow all IPs in 150.203.*.*; except one\n"
+"* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
 msgstr ""
 "* Esiampl 1: caniatáu pob  IPs yn 150.203.*.*; heblaw un\\ngwesteiwr iawn = "
@@ -2296,7 +2251,7 @@ msgid "Deny hosts:"
 msgstr "Gwrthod gwesteiwr"
 
 #: ../samba_wizard/Samba.pm:132
-msgid "Enabled Samba Services"
+msgid "Enabled Samba services"
 msgstr "Gwasanaethau Samba "
 
 #: ../samba_wizard/Samba.pm:132
@@ -2314,7 +2269,7 @@ msgid "Enable file sharing area"
 msgstr "Galluogi gofod rhannu ffeil"
 
 #: ../samba_wizard/Samba.pm:141
-msgid "Enable Server Printer Sharing"
+msgid "Enable server Printer Sharing"
 msgstr "Galluogi gofod rhannu ffeil"
 
 #: ../samba_wizard/Samba.pm:142
@@ -2353,7 +2308,7 @@ msgstr ""
 "root, fred, @defnyddiwr, @olwyn ar gyfer pob math o ganiatâd."
 
 #: ../samba_wizard/Samba.pm:176
-msgid "read list:"
+msgid "Read list:"
 msgstr "rhestr ddarllen:"
 
 #: ../samba_wizard/Samba.pm:176 ../samba_wizard/Samba.pm:177
@@ -2361,7 +2316,7 @@ msgid "root, fred, @users, @wheel"
 msgstr "gwraidd, fred, @defnyddwyr, @olwyn"
 
 #: ../samba_wizard/Samba.pm:177
-msgid "write list:"
+msgid "Write list:"
 msgstr "rhestr ysgrifennu"
 
 #: ../samba_wizard/Samba.pm:182
@@ -2383,15 +2338,15 @@ msgstr ""
 "ffurfweddu Samba."
 
 #: ../samba_wizard/Samba.pm:216
-msgid "Server Banner:"
+msgid "Server banner:"
 msgstr "Baner Gweinydd"
 
 #: ../samba_wizard/Samba.pm:217
-msgid "File Sharing:"
+msgid "File sharing:"
 msgstr "Rhannu Ffeiliau:"
 
 #: ../samba_wizard/Samba.pm:219
-msgid "Print Server:"
+msgid "Print server:"
 msgstr "Gwasanaethwr LDAP"
 
 #: ../samba_wizard/Samba.pm:220
@@ -2451,15 +2406,15 @@ msgid "Select a primary and secondary server from the list."
 msgstr "Dewiswch weinydd cynradd ac eilradd o'r rhestr."
 
 #: ../time_wizard/Ntp.pm:87
-msgid "Time Servers"
+msgid "Time servers"
 msgstr "Gweinyddion Amser"
 
 #: ../time_wizard/Ntp.pm:93 ../time_wizard/Ntp.pm:130
-msgid "Primary Time Server:"
+msgid "Primary time server:"
 msgstr "Gweinydd Amser Cynradd:"
 
 #: ../time_wizard/Ntp.pm:94 ../time_wizard/Ntp.pm:131
-msgid "Secondary Time Server:"
+msgid "Secondary time server:"
 msgstr "Gweinyddion Amser Eilradd"
 
 #: ../time_wizard/Ntp.pm:99 ../time_wizard/Ntp.pm:114
@@ -2532,16 +2487,16 @@ msgid "Web wizard"
 msgstr "Dewin Gwe"
 
 #: ../web_wizard/Apache.pm:71
-msgid "This wizard will help you configuring the Web Server for your network."
+msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu'r Gweinydd Gwe ar gyfer eich rhwydwaith."
 
 #: ../web_wizard/Apache.pm:71
-msgid "Web Server Configuration Wizard"
+msgid "Web server configuration wizard"
 msgstr "Dewin Ffurfweddu Gweinydd Gwe"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Don't check any box if you don't want to activate your Web Server."
+msgid "Don't check any box if you don't want to activate your Web server."
 msgstr "Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gweinydd Gwe."
 
 #: ../web_wizard/Apache.pm:77
@@ -2549,23 +2504,23 @@ msgid "Select the kind of Web service you want to activate:"
 msgstr "Dewiswch y math o wasanaeth Gwe rydych am ei weithredu:"
 
 #: ../web_wizard/Apache.pm:77
-msgid "Web Server"
+msgid "Web server"
 msgstr "Gweinydd Gwe"
 
 #: ../web_wizard/Apache.pm:77
 msgid ""
-"Your server can act as a Web Server toward your internal network (intranet) "
-"and as a Web Server for the Internet."
+"Your server can act as a Web server toward your internal network (intranet) "
+"and as a Web server for the Internet."
 msgstr ""
 "Mae modd i'ch gweinydd weithredu fel Gweinydd Gwe ar gyfer eich rhwydwaith "
 "mewnol (mewnrwyd) ac fel Gweinydd Gwe ar gyfer y Rhyngrwyd."
 
 #: ../web_wizard/Apache.pm:79
-msgid "Enable the Web Server for the Intranet"
+msgid "Enable the Web server for the intranet"
 msgstr "Galluogi'r Gweinydd Gwe ar gyfer y Fewnrwyd"
 
 #: ../web_wizard/Apache.pm:80
-msgid "Enable the Web Server for the Internet"
+msgid "Enable the Web server for the Internet"
 msgstr "Galluogi'r Gweinydd Gwe ar gyfer y Rhyngrwyd"
 
 #: ../web_wizard/Apache.pm:90
@@ -2606,18 +2561,18 @@ msgstr "is-gyfeiriadur defnyddiwr http: ~/"
 msgid "Type the path of the directory you want being the document root."
 msgstr "Teipio Llwybr y cyfeiriadur i gychwyn gwraidd y ddogfen"
 
-#: ../web_wizard/Apache.pm:111
-msgid "Document Root:"
-msgstr "Gwraidd Dogfen:"
+#: ../web_wizard/Apache.pm:111 ../web_wizard/Apache.pm:139
+msgid "Document root:"
+msgstr "Gwraidd dogfen:"
 
 #: ../web_wizard/Apache.pm:131
-msgid "Configuring the Web Server"
+msgid "Configuring the Web server"
 msgstr "Ffurfweddu'r Gweinydd Gwe"
 
 #: ../web_wizard/Apache.pm:131
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
-"Server"
+"server"
 msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gweinydd Gwe"
@@ -2630,16 +2585,12 @@ msgstr "Gweinydd gwe mewnrwyd"
 msgid "Internet web server:"
 msgstr "Gweinydd gwe rhyngrwyd:"
 
-#: ../web_wizard/Apache.pm:139
-msgid "Document root:"
-msgstr "Gwraidd dogfen:"
-
 #: ../web_wizard/Apache.pm:140
 msgid "User directory:"
 msgstr "Cyfeiriadur defnyddiwr:"
 
 #: ../web_wizard/Apache.pm:147
-msgid "The wizard successfully configured your Intranet/Internet Web Server"
+msgid "The wizard successfully configured your intranet/Internet Web server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gweinydd Gwe Mewnrwyd/Rhyngrwyd"
 
@@ -2651,67 +2602,181 @@ msgstr "Gweinydd gwe Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ffurfweddu eich system fel gweinydd Apache..."
 
-#~ msgid "Configuring the Internet Mail"
-#~ msgstr "Ffurfweddu E-bost Rhyngrwyd"
+#~ msgid "If You want to enable PXE for your dhcp server please check the box."
+#~ msgstr "Os ydych am alluogi PXE ar eich gweinydd dhcp ticiwch y blwch."
 
-#, fuzzy
-#~ msgid "Similar PXE name is already used in PXE menu"
-#~ msgstr "Mae enw tebyg yn cael ei ddefnyddio eisoes mewn cofnod dewislen PXE"
+#~ msgid "The wizard successfully configured the DHCP services of your server."
+#~ msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gweinydd."
+
+#~ msgid "FTP Server"
+#~ msgstr "Gweinydd FTP"
+
+#~ msgid "News Server"
+#~ msgstr "Gweinydd Newyddion"
+
+#~ msgid "NFS Server"
+#~ msgstr "Gweinydd NFS"
+
+#~ msgid "NIS Server with autofs map"
+#~ msgstr "Gweinydd NIS gyda autofs map"
+
+#~ msgid ""
+#~ "User automatically mount their home directory from server, when they log "
+#~ "on a NIS client computer network."
+#~ msgstr ""
+#~ "Mae'r defnyddiwr yn gosod yn awtomatig eu cyfeiriadur cartref o'r "
+#~ "gweinydd wrth fewngofnodi i rwydwaith cyfrifiadurol cleient NIS"
+
+#~ msgid "NIS Server:"
+#~ msgstr "Gweinydd NIS"
+
+#~ msgid ""
+#~ "A NIS server is usefull to create user, hostname database. The wizard "
+#~ "also build autofs map, so it provides the capabilitie for NIS user to "
+#~ "automount their home directory on a NIS client computer."
+#~ msgstr ""
+#~ "Mae gweinydd NIS yn ddefnyddiol ar gyfer creu cronfa ddata enw gwesteiwr "
+#~ "defnyddiwr . Mae'r Dewin hefyd yn adeiladu autofs map, ac felly'n "
+#~ "darparu'r gallu  ddefnyddwyr NIS i awto osod eu cyfeiriadur cartref fel "
+#~ "cyfrifiadur cleient NIS."
+
+#~ msgid "Network File:"
+#~ msgstr "Ffeil Rhwydwaith"
+
+#~ msgid "NFS exports:"
+#~ msgstr "Allforion NFS"
+
+#~ msgid "Auto master:"
+#~ msgstr "Awto Feistr"
+
+#~ msgid "Auto home:"
+#~ msgstr "Awto cartref"
+
+#~ msgid ""
+#~ "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
+#~ "binding informationdaem."
+#~ msgstr ""
+#~ "Mae daemon YPBIND yn canfod gweinydd ar gyfer parthau HIS ac yn cynnal "
+#~ "rhwymiad informationdaem NIS."
+
+#~ msgid "External Mail server"
+#~ msgstr "Gweinydd E-bost allanol"
+
+#~ msgid "Internal Mail server"
+#~ msgstr "Gweinydd E-bost mewnol"
+
+#~ msgid "Internet Mail Configuration Wizard"
+#~ msgstr "Dewin Ffurfweddu E-bost Rhyngrwyd"
+
+#~ msgid ""
+#~ "This wizard will help you configuring an Internet Mail serer for your "
+#~ "network, or configure an External Mail server."
+#~ msgstr ""
+#~ "Bydd y dewin yn eich cynorthwyo i ffurfweddu gwasanaethau E-bost "
+#~ "Rhyngrwyd ar gyfer eich rhwydwaith, neu i ffurfweddu gweinydd E-bost "
+#~ "Allannol."
+
+#~ msgid "Outgoing Mail Address"
+#~ msgstr "Cyfeiriad E-bost Allfynd"
+
+#~ msgid "Internet Mail Gateway"
+#~ msgstr "Porth E-bost Rhyngrwyd"
+
+#~ msgid ""
+#~ "Internet host names must be in the form \"host.domain.domaintype\"; for "
+#~ "example, if your provider is \"provider.com\", the internet mail server "
+#~ "is usually \"smtp.provider.com\"."
+#~ msgstr ""
+#~ "Rhaid i enw'r gwesteiwyr rhyngrwyd fod ar ffurf  \"gwesteiwr.parth."
+#~ "mathparth\"; e.e. os eich darparwr yw \"darparwr.com\", fel rheol y "
+#~ "gweinydd e-bost rhyngrwyd yw \"newyddion.darparwr.com\"."
 
-#~ msgid "Congratulations, Mandrake Install server is now ready."
-#~ msgstr "Llongyfarchiadau, mae gweinydd Gosod Mandrake yn barod."
+#~ msgid "Mail Server Name:"
+#~ msgstr "Enw Gweinydd E-bost::"
+
+#~ msgid "Configuring the Internet Mail"
+#~ msgstr "Ffurfweddu E-bost Rhyngrwyd"
 
 #~ msgid ""
-#~ "You need to readjust your NIS domainname. For a NIS server you need a "
-#~ "correct NIS domainname, not equal to localdomain or none. Add "
-#~ "NISDOMAIN=your_nis_domain in /etc/sysconfig/network file, and do a: "
-#~ "nisdomainname your_nis_domain."
+#~ "The wizard collected the following parameters needed to configure your "
+#~ "Internet Mail Service:"
 #~ msgstr ""
-#~ "Rhaid ail newid eich enw parth NIS. Ar gyfer gweinydd NIS rhaid cael enw "
-#~ "parth NIS cywir, nid cydradd â pharth lleol neu ddim. Ychwanegwch "
-#~ "NISDOMAIN=your_nis_domain in /etc/sysconfig/network file, a gwneud: "
-#~ "nisdomainname your_nis_domain."
+#~ "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+#~ "ffurfweddu eich Gwasanaeth E-bost Rhyngrwyd:"
+
+#~ msgid "Form of the Address"
+#~ msgstr "Ffurf y Cyfeiriad"
 
-#~ msgid "The ypbind daemon binds NIS client to a NIS domain"
-#~ msgstr "Mae daemon ypbind yn rhwymo'r cleient NIS i barth NIS"
+#~ msgid "The wizard now will configure an Internal Mail Server."
+#~ msgstr "Bydd y dewin yn ffurfweddu eich Gweinydd E-bost Rhyngrwyd."
+
+#~ msgid "The wizard successfully configured your Externet Mail server."
+#~ msgstr ""
+#~ "Mae'r dewin wedi ffurfweddu eich gweinydd E-bost Allannol yn llwyddiannus."
 
 #~ msgid ""
-#~ "Please adjust with domainname command or in /etc/sysconfig/network file "
-#~ "(NISDOMAIN=yournisdomain)"
+#~ "This wizard will help you configuring the PXE server, and PXE boot image "
+#~ "management. PXE (Pre-boot Execution Environment) is a protocol designed "
+#~ "by Intel that allows computers to boot through the network. PXE is stored "
+#~ "in the ROM of new generation network cards. When the computer boots up, "
+#~ "the BIOS loads the PXE ROM in the memory and executes it. A menu is "
+#~ "displayed, allowing the computer to boot an operating system loaded "
+#~ "through the network."
 #~ msgstr ""
-#~ "Newidiwch eich gorchymyn enw parth neu yn ffeil /etc/sysconfig/network "
-#~ "file (NISDOMAIN=yournisdomain)"
+#~ "Bydd y Dewin yn eich cynorthwyo i osod gweinydd PXE a rheolaeth delwedd "
+#~ "cychwyn PXE. Mae PXE (Pre-boot Execution Environment) yn brotocol wedi ei "
+#~ "gynllunio gan Intel sy'n caniatáu i gyfrifiaduron gychwyn drwy rwydwaith. "
+#~ "Mae PXE yn cael ei gadw ar ROM cenhedlaeth ddiweddaraf o gardiau "
+#~ "rhwydwaith. Pan fydd y cyfrifiadur yn cychwyn, bydd y BIOS yn llwytho'r "
+#~ "ROM PXE i'r cof a'i weithredu. Mae dewislen yn cael ei ddangos, sy'n "
+#~ "caniatáu i'r cyfrifiadur gychwyn cychwynnwr system weithredu drwy'r "
+#~ "rhwydwaith."
 
-#~ msgid "Masquerade not good!"
-#~ msgstr "Ffugio gwael!"
+#~ msgid ""
+#~ "Network client interface: which interface client should used to be "
+#~ "installed."
+#~ msgstr ""
+#~ "Rhyngwyneb cleient rwydwaith: drwy'r hwn ddylai cleient ryngwyneb gael ei "
+#~ "osod."
 
 #~ msgid ""
-#~ "This wizard will provide a pxe service, and ability to add/remove/modify "
-#~ "boot images."
+#~ "We need to use a special dhcpd.conf with PXE parameter. To set such a "
+#~ "DHCP server, launch drakwizard DHPC, and check the box 'enable PXE', if "
+#~ "you don't do that, PXE query will not be answered by this server."
 #~ msgstr ""
-#~ "Bydd y Dewin yn darparu gwasanaeth pxe, â'r gallu i ychwanegu/tynnu/newid "
-#~ "delweddau cychwyn."
+#~ "Mae angen defnyddio dhcpd.conf arbennig gyda pharamedrau PXE. I osod "
+#~ "gweinydd DHCP o'r fath, cychwynnwch DHPC drakwizard, a thicio'r b;lwch "
+#~ "'galluogi PXE', os na wnewch chi hynny, ni fydd ymholiad PXE yn cael ei "
+#~ "ateb gan y gweinydd hwn."
 
-#~ msgid "Boot image to configure:"
-#~ msgstr "Delwedd cychwyn i'w ffurfweddu:"
+#~ msgid "Need an image. Please add one."
+#~ msgstr "Angen delwedd. Ychwanegwch un."
 
-#~ msgid "Installation method: choose nfs/http to install via nfs/http."
-#~ msgstr "Dull gosod: dewis nfs/http i osod drwy nfs/http."
+#~ msgid "Similar PXE name is already used in PXE menu"
+#~ msgstr "Mae enw PXE tebyg yn cael ei ddefnyddio eisoes mewn dewislen PXE"
 
-#~ msgid "Options to add to PXE boot disk"
-#~ msgstr "Dewisiadau i'w hychwanegu at ddisg cychwyn PXE"
+#~ msgid "The wizard Will now add this PXE boot image"
+#~ msgstr "Bydd y dewin yn ychwanegu'r ddelwedd cychwyn PXE."
 
-#~ msgid "We need to use a special dhcpd.conf with PXE parameter."
-#~ msgstr "Byddwn yn defnyddio dhcpd.conf arbennig gyda pharamedr PXE."
+#~ msgid "The wizard successfully add the PXE boot image."
+#~ msgstr "Mae'r dewin wedi ychwanegu'r delwedd cychwyn PXE yn llwyddiannus."
 
-#~ msgid "Please provide a bootable image..."
-#~ msgstr "Darparwch ddelwedd cychwyn..."
+#~ msgid "The wizard successfully modify the boot option."
+#~ msgstr "Mae'r dewin wedi newid y dewis cychwyn."
 
-#~ msgid "Will now remove your PXE boot image"
-#~ msgstr "Yn tynnu eich delwedd cychwyn PXE"
+#~ msgid ""
+#~ "Your server can act as a Web Server toward your internal network "
+#~ "(intranet) and as a Web Server for the Internet."
+#~ msgstr ""
+#~ "Mae modd i'ch gweinydd weithredu fel Gweinydd Gwe ar gyfer eich "
+#~ "rhwydwaith mewnol (mewnrwyd) ac fel Gweinydd Gwe ar gyfer y Rhyngrwyd."
 
-#~ msgid "Will now add your PXE boot image"
-#~ msgstr "Yn ychwanegu eich delwedd PXE"
+#~ msgid "Document Root:"
+#~ msgstr "Gwraidd Dogfen:"
 
-#~ msgid "The wizard successfully modify image(s)."
-#~ msgstr "Mae'r dewin wedi newid delwedd(au) yn llwyddiannus."
+#~ msgid ""
+#~ "The wizard collected the following parameters needed to configure your "
+#~ "Web Server"
+#~ msgstr ""
+#~ "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+#~ "ffurfweddu eich Gweinydd Gwe"