updated pot file

1 files changed, 244 insertions, 177 deletions

diff --git a/po/cy.po b/po/cy.po
index 550fd16e..c2601380 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 15:19+0100\n"
+"POT-Creation-Date: 2004-01-30 15:54+0100\n"
 "PO-Revision-Date: 2003-12-31 18:24-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -18,7 +18,7 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "dewin ffurfweddu"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:107 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:81 ../proxy_wizard/Squid.pm:88
 #: ../samba_wizard/Samba.pm:147 ../samba_wizard/Samba.pm:195
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
@@ -26,9 +26,9 @@ msgstr "dewin ffurfweddu"
 msgid "Warning."
 msgstr "Rhybudd."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:187 ../ftp_wizard/Proftpd.pm:112
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:186 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81 ../nfs_wizard/NFS.pm:83
-#: ../postfix_wizard/Postfix.pm:69 ../samba_wizard/Samba.pm:87
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Samba.pm:87
 #: ../samba_wizard/Samba.pm:103 ../samba_wizard/Samba.pm:164
 #: ../samba_wizard/Samba.pm:201 ../web_wizard/Apache.pm:116
 #: ../web_wizard/Apache.pm:124
@@ -36,12 +36,12 @@ msgid "Error."
 msgstr "Gwall."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:111 ../dns_wizard/Bind.pm:243
-#: ../dns_wizard/Bind.pm:253 ../dns_wizard/Bind.pm:260
-#: ../ftp_wizard/Proftpd.pm:140 ../ldap_wizard/ldap.pm:175
+#: ../dhcp_wizard/Dhcp.pm:116 ../dns_wizard/Bind.pm:242
+#: ../dns_wizard/Bind.pm:252 ../dns_wizard/Bind.pm:259
+#: ../ftp_wizard/Proftpd.pm:149 ../ldap_wizard/ldap.pm:175
 #: ../news_wizard/Inn.pm:96 ../nfs_wizard/NFS.pm:102
 #: ../nisautofs_wizard/Nisautofs.pm:140 ../nisautofs_wizard/Nisautofs.pm:147
-#: ../postfix_wizard/Postfix.pm:104 ../proxy_wizard/Squid.pm:172
+#: ../postfix_wizard/Postfix.pm:149 ../proxy_wizard/Squid.pm:172
 #: ../pxe_wizard/Pxe.pm:243 ../pxe_wizard/Pxe.pm:255 ../pxe_wizard/Pxe.pm:267
 #: ../pxe_wizard/Pxe.pm:272 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:145
@@ -82,15 +82,15 @@ msgid "This wizard will help you in adding a new client in your local DNS."
 msgstr ""
 "Bydd y dewin yn eich cynorthwyo i ychwanegu cleient newydd yn eich DNS."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "(you don't need to type the domain after the name)"
 msgstr "(does dim angen teipio'r parth ar ôl yr enw)"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid "Client identification:"
 msgstr "Enw cleient:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 #, fuzzy
 msgid ""
 "Note that the given IP address and client name should be unique in the "
@@ -99,7 +99,7 @@ msgstr ""
 "Sylwer bod yn rhaid i'r rhif IP a'r enw cleient fod yn unigryw o fewn y "
 "rhwydwaith."
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:125
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:124
 msgid ""
 "Your client on the network will be identified by name, as in clientname."
 "company.net. Every machine on the network must have a (unique) IP address, "
@@ -109,29 +109,30 @@ msgstr ""
 "enwcleient.cwmni.net. Rhaid i bob peiriant ar eich rhwydwaith gael cyfeiriad "
 "IP unigryw, yn ôl y gystrawen collnod arferol"
 
-#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:127
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:126
 msgid "Name of the machine:"
 msgstr "Enw'r peiriant"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:128
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:127
 #, fuzzy
 msgid "IP address of the machine:"
 msgstr "Rhif IP'y peiriant:"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dhcp_wizard/Dhcp.pm:91 ../dns_wizard/Bind.pm:182
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dhcp_wizard/Dhcp.pm:92 ../dns_wizard/Bind.pm:181
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:81
-#: ../dns_wizard/Bind.pm:182 ../web_wizard/Apache.pm:84
+#: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:82
+#: ../dns_wizard/Bind.pm:181 ../ftp_wizard/Proftpd.pm:106
+#: ../web_wizard/Apache.pm:84
 msgid "You are in dhcp, server may not work with your configuration."
 msgstr ""
 "Rydych yn dhcp, efallai na fydd y gwasanaethwr yn gweithio gyda'ch "
 "ffurfweddiad."
 
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
-#: ../dhcp_wizard/Dhcp.pm:86 ../dhcp_wizard/Dhcp.pm:96 ../drakwizard.pl:70
+#: ../dhcp_wizard/Dhcp.pm:87 ../dhcp_wizard/Dhcp.pm:97 ../drakwizard.pl:70
 #: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142
 #: ../ldap_wizard/ldap.pm:171
 msgid "Error"
@@ -177,7 +178,7 @@ msgstr "IP Cleient:"
 msgid "The wizard successfully added the client."
 msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
-#: ../dhcp_wizard/Dhcp.pm:39 ../dhcp_wizard/Dhcp.pm:52
+#: ../dhcp_wizard/Dhcp.pm:38 ../dhcp_wizard/Dhcp.pm:52
 msgid "DHCP Wizard"
 msgstr "Dewin DHCP"
 
@@ -195,49 +196,58 @@ msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau DHCP eich gwasanaethwr."
 
 #: ../dhcp_wizard/Dhcp.pm:58
+msgid "If You want to enable PXE for your dhcp server please check the box."
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:58
 msgid "Range of addresses used by dhcp"
 msgstr "Ystod y cyfeiriadau defnyddir gan dhcp"
 
 #: ../dhcp_wizard/Dhcp.pm:58
+#, fuzzy
 msgid ""
 "Select the range of addresses assigned to the workstations by the DHCP "
 "service; unless you have special needs, you can safely accept the proposed "
-"values."
+"values. (ie: 192.168.100.20 192.168.100.40)"
 msgstr ""
 "Dewiswch ystod cyfeiriadau dynodwyd i'r orsaf waith gan y gwasanaeth DHCP; "
 "oni bai fod gennych anghenion arbennig, bydd modd i chi dderbyn y gwerthoedd "
 "sy'n cael eu cynnig."
 
-#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:103
+#: ../dhcp_wizard/Dhcp.pm:65 ../dhcp_wizard/Dhcp.pm:107
 msgid "Lowest IP Address:"
 msgstr "Cyfeiriad IP Isaf:"
 
-#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:104
+#: ../dhcp_wizard/Dhcp.pm:66 ../dhcp_wizard/Dhcp.pm:108
 msgid "Highest IP Address:"
 msgstr "Cyfeiriad IP Uchaf"
 
-#: ../dhcp_wizard/Dhcp.pm:71
+#: ../dhcp_wizard/Dhcp.pm:67 ../dhcp_wizard/Dhcp.pm:110
+msgid "Enable PXE:"
+msgstr ""
+
+#: ../dhcp_wizard/Dhcp.pm:72
 msgid "Interface the dhcp server must listen to"
 msgstr "Rhyngwyneb y mae'n rhaid i wasanaethwr dhcp wrando amdano"
 
-#: ../dhcp_wizard/Dhcp.pm:86
+#: ../dhcp_wizard/Dhcp.pm:87
 msgid "The IP range specified is not correct."
 msgstr "Nid yw'r amrediad IP rhoddwyd yn gywir."
 
-#: ../dhcp_wizard/Dhcp.pm:91
+#: ../dhcp_wizard/Dhcp.pm:92
 msgid "The IP range specified is not in server address range."
 msgstr ""
 "Nid yw'r amrediad IP rhoddwyd o fewn amrediad cyfeiriad y gwasanaethwr."
 
-#: ../dhcp_wizard/Dhcp.pm:96
+#: ../dhcp_wizard/Dhcp.pm:97
 msgid "The IP of the server must not be in range."
 msgstr "Rhaid i IP y gwasanaethwr beidio â bod o fewn amrediad."
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid "Configuring the DHCP Server"
 msgstr "Ffurfweddu'r Gwasanaethwr DHCP"
 
-#: ../dhcp_wizard/Dhcp.pm:101
+#: ../dhcp_wizard/Dhcp.pm:102
 msgid ""
 "The wizard collected the following parameters needed to configure your DHCP "
 "service:"
@@ -245,11 +255,31 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer eich "
 "gwasanaeth DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:105
+#: ../dhcp_wizard/Dhcp.pm:104 ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:130 ../ftp_wizard/Proftpd.pm:131
+#: ../ftp_wizard/Proftpd.pm:132 ../ftp_wizard/Proftpd.pm:133
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "disabled"
+msgstr "anablwyd"
+
+#: ../dhcp_wizard/Dhcp.pm:104 ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:130 ../ftp_wizard/Proftpd.pm:131
+#: ../ftp_wizard/Proftpd.pm:132 ../ftp_wizard/Proftpd.pm:133
+#: ../ftp_wizard/Proftpd.pm:134 ../installsrv_wizard/Installsrv.pm:85
+#: ../installsrv_wizard/Installsrv.pm:86 ../samba_wizard/Samba.pm:211
+#: ../samba_wizard/Samba.pm:212 ../samba_wizard/Samba.pm:213
+#: ../web_wizard/Apache.pm:132 ../web_wizard/Apache.pm:133
+msgid "enabled"
+msgstr "galluogwyd"
+
+#: ../dhcp_wizard/Dhcp.pm:109
 msgid "Interface:"
 msgstr "Rhyngwyneb:"
 
-#: ../dhcp_wizard/Dhcp.pm:111
+#: ../dhcp_wizard/Dhcp.pm:116
 msgid "The wizard successfully configured the DHCP services of your server."
 msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gwasanaethwr."
 
@@ -257,20 +287,20 @@ msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gwasanaethwr."
 msgid "You need to readjust your hostname."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:75
+#: ../dns_wizard/Bind.pm:75 ../pxe_wizard/Pxe.pm:72
 msgid ""
 "You need to readjust your domainname. For a DNS server you need a correct "
 "domainname, not equal to localdomain or none. Launch drakconnect to adjust "
 "it."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:82 ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Master DNS server"
 msgstr "Gwasanaethwr NFS"
 
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:142
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:141
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Slave DNS server"
 msgstr "Gwasanaethwr NFS"
@@ -308,71 +338,72 @@ msgstr ""
 "cyfrifiaduron lleol, gyda cheisiadau allanol yn cael eu hanfon ymlaen i DNS "
 "allanol."
 
-#: ../dns_wizard/Bind.pm:119 ../pxe_wizard/Pxe.pm:121
+#: ../dns_wizard/Bind.pm:119 ../postfix_wizard/Postfix.pm:76
+#: ../pxe_wizard/Pxe.pm:121
 msgid "What do you want to do:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Choose the host you want to remove in the following list."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 msgid "Remove a host in existing dns configuration."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:133
 #, fuzzy
 msgid "Remove host:"
 msgstr "Gwrthod gwesteiwr"
 
-#: ../dns_wizard/Bind.pm:136
+#: ../dns_wizard/Bind.pm:135
 #, fuzzy
 msgid "Computer Name:"
 msgstr "Enw Gwasanaethwr Newyddion:"
 
-#: ../dns_wizard/Bind.pm:142
+#: ../dns_wizard/Bind.pm:141
 msgid ""
 "A slave name server will take some of the burden away from your primary name "
 "server, and will also function as a backup server, in case your master "
 "server is unreachable."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:144 ../dns_wizard/Bind.pm:209
+#: ../dns_wizard/Bind.pm:143 ../dns_wizard/Bind.pm:208
 #, fuzzy
 msgid "IP Address of the master DNS server:"
 msgstr "Ffurfweddu'r Gwasanaethwr DHCP"
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid "IP of your forwarder"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:151
+#: ../dns_wizard/Bind.pm:150
 msgid ""
 "So if you need it and know your ip forwarder enter IP address of it, if you "
 "dont know leave it blank"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:153 ../dns_wizard/Bind.pm:236
+#: ../dns_wizard/Bind.pm:152 ../dns_wizard/Bind.pm:235
 msgid "External DNS:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid "Add search domain"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:159
+#: ../dns_wizard/Bind.pm:158
 msgid ""
 "Search list for host-name lookup.  The search list is normally determined "
 "from the local domain name; by default, it contains only the local domain "
@@ -380,119 +411,119 @@ msgid ""
 "following the search keyword"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:237
+#: ../dns_wizard/Bind.pm:161 ../dns_wizard/Bind.pm:236
 msgid "Default domain name to search:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:167
+#: ../dns_wizard/Bind.pm:166
 #, fuzzy
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad dilys...gwasgwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:172
+#: ../dns_wizard/Bind.pm:171
 #, fuzzy
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad dilys...gwasgwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:177
+#: ../dns_wizard/Bind.pm:176
 #, fuzzy
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad dilys...gwasgwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:186
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 #, fuzzy
 msgid "Error:"
 msgstr "Gwall"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:191
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:197
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that your are not a master DNS server, but just a slave one. So i "
 "can't add/remove host."
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:206
 msgid "Ok Now building your DNS slave configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:207 ../ldap_wizard/ldap.pm:150
+#: ../dns_wizard/Bind.pm:206 ../ldap_wizard/ldap.pm:150
 #, fuzzy
 msgid "with this configuration:"
 msgstr "Dns (ffurfweddu)"
 
-#: ../dns_wizard/Bind.pm:215
+#: ../dns_wizard/Bind.pm:214
 msgid "Client with this identification will be added to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:217 ../dns_wizard/Bind.pm:226
+#: ../dns_wizard/Bind.pm:216 ../dns_wizard/Bind.pm:225
 msgid "Computer name:"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:218
+#: ../dns_wizard/Bind.pm:217
 #, fuzzy
 msgid "Computer IP address:"
 msgstr "Enw Gwasanaethwr Newyddion:"
 
-#: ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:223
 msgid "Client with this identification will be removed to your DNS"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:231
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 
-#: ../dns_wizard/Bind.pm:234
+#: ../dns_wizard/Bind.pm:233
 #, fuzzy
 msgid "Server Hostname:"
 msgstr "Baner Gwasanaethwr"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:234
 #, fuzzy
 msgid "Domainname:"
 msgstr "Nis Domain:"
 
-#: ../dns_wizard/Bind.pm:244
+#: ../dns_wizard/Bind.pm:243
 #, fuzzy
 msgid "The wizard successfully add host in your DNS."
 msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
-#: ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:253
 #, fuzzy
 msgid "The wizard successfully remove host in your DNS."
 msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:260
 #, fuzzy
 msgid "The wizard successfully configured the DNS service of your server."
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu'r gwasanaethau DNS ar gyfer eich "
 "gwasanaethwr."
 
-#: ../dns_wizard/Bind.pm:680
+#: ../dns_wizard/Bind.pm:679
 #, fuzzy
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Ffurfweddu eich system fel gwasanaethwr Nis+Autofs(nfs)..."
 
-#: ../dns_wizard/Bind.pm:693
+#: ../dns_wizard/Bind.pm:692
 #, fuzzy
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Ffurfweddu eich system fel gwasanaethwr Nis+Autofs(nfs)..."
@@ -584,30 +615,25 @@ msgstr "Methodd y gosod"
 msgid "FTP wizard"
 msgstr "Dewin FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "FTP Server Configuration Wizard"
 msgstr "Dewin Ffurfweddu Gwasanaethwr FTP"
 
-#: ../ftp_wizard/Proftpd.pm:72
+#: ../ftp_wizard/Proftpd.pm:73
 msgid "This wizard will help you configuring the FTP Server for your network."
 msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu'r Gwasanaethwr FTP ar gyfer eich "
 "rhwydwaith."
 
-#: ../ftp_wizard/Proftpd.pm:78
-msgid "Don't check any box if you don't want to activate your FTP Server."
-msgstr ""
-"Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gwasanaethwr FTP."
-
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "FTP Server"
 msgstr "Gwasanaethwr FTP"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Dewiswch y matho o wasanaeth FTP rydych am ei gychwyn:"
 
-#: ../ftp_wizard/Proftpd.pm:78
+#: ../ftp_wizard/Proftpd.pm:79
 msgid ""
 "Your server can act as an FTP Server toward your internal network (intranet) "
 "and as an FTP Server for the Internet."
@@ -615,75 +641,76 @@ msgstr ""
 "Mae modd i'ch gwasanaethwr weithredu fel Gwasanaethwr FTP ar gyfer eich "
 "rhwydwaith mewnol (mewnrwyd) neu fel Gwasanaethwr FTP ar gyfer y Rhyngrwyd."
 
-#: ../ftp_wizard/Proftpd.pm:84
+#: ../ftp_wizard/Proftpd.pm:81
 msgid "Enable the FTP Server for the Intranet"
 msgstr "Galluogi'r Gwasanaethwr FTP ar gyfer y Fewnrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:85
+#: ../ftp_wizard/Proftpd.pm:82
 msgid "Enable the FTP Server for the Internet"
 msgstr "Galluogi'r Gwasanaethwr FTP ar gyfer y Rhyngrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Admin Email: email address of FTP maintainer."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Admin Email: email address of FTP administrator."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Allow FXP: allow file transfer via other ftp."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Chroot Home user: Block user in their home directory."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Allow FXP: allow file transfer via other FTP."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Ftp Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Chroot Home user: the users will only see their home directory."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "Permit root login: allow root to log on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "FTP Proftpd server options"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:90
-msgid "allow FTP resume: allow resume upload or download on ftp server."
+#: ../ftp_wizard/Proftpd.pm:88
+msgid "Permit root login: allow root to log on FTP server."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:98 ../ftp_wizard/Proftpd.pm:130
-msgid "Admin email"
+#: ../ftp_wizard/Proftpd.pm:96
+msgid "Admin email:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:99 ../ftp_wizard/Proftpd.pm:131
-msgid "Permit root Login"
+#: ../ftp_wizard/Proftpd.pm:97
+msgid "Permit root Login:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:100 ../ftp_wizard/Proftpd.pm:132
-msgid "Chroot Home user"
+#: ../ftp_wizard/Proftpd.pm:98
+msgid "Chroot Home user:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:101 ../ftp_wizard/Proftpd.pm:133
-msgid "Allow FTP resume"
+#: ../ftp_wizard/Proftpd.pm:99
+msgid "Allow FTP resume:"
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:102 ../ftp_wizard/Proftpd.pm:134
-msgid "Allow FXP"
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "Allow FXP:"
+msgstr "Caniatáu gwesteiwr:"
+
+#: ../ftp_wizard/Proftpd.pm:111
+msgid "Please choose allow connection to FTP server from internal or external."
 msgstr ""
 
-#: ../ftp_wizard/Proftpd.pm:107
-msgid ""
-"Warning\n"
-"You are in dhcp, server may not work with your configuration."
+#: ../ftp_wizard/Proftpd.pm:115
+msgid "I can't find bash in list of shells. Please correct."
 msgstr ""
-"Rhybudd\\nRydych yn dhcp, efallai na fydd y gwasanaethwr yn gweithio gyda'ch "
-"ffufrweddiad."
 
-#: ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:121
 msgid "Sorry, you must be root to do this..."
 msgstr "Rhaid i chi fod yn wraidd i wneud hyn..."
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid "Configuring the FTP Server"
 msgstr "Ffurfweddu'r Gwasanaethwr FTP"
 
-#: ../ftp_wizard/Proftpd.pm:117
+#: ../ftp_wizard/Proftpd.pm:126
 msgid ""
 "The wizard collected the following parameters\n"
 "needed to configure your FTP Server"
@@ -691,7 +718,7 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol\n"
 "sydd eu hangen ar gyfer ffurfweddu eich Gwasanaethwr FTP"
 
-#: ../ftp_wizard/Proftpd.pm:118
+#: ../ftp_wizard/Proftpd.pm:127
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them"
@@ -699,35 +726,35 @@ msgstr ""
 "I dderbyn y gwerthoedd hyn, ac i ffurfweddu eich gwasanaethwr, cliciwch  y "
 "botwm Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "disabled"
-msgstr "anablwyd"
-
-#: ../ftp_wizard/Proftpd.pm:120 ../ftp_wizard/Proftpd.pm:121
-#: ../ftp_wizard/Proftpd.pm:122 ../ftp_wizard/Proftpd.pm:123
-#: ../ftp_wizard/Proftpd.pm:124 ../ftp_wizard/Proftpd.pm:125
-#: ../installsrv_wizard/Installsrv.pm:85 ../installsrv_wizard/Installsrv.pm:86
-#: ../samba_wizard/Samba.pm:211 ../samba_wizard/Samba.pm:212
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:132
-#: ../web_wizard/Apache.pm:133
-msgid "enabled"
-msgstr "galluogwyd"
-
-#: ../ftp_wizard/Proftpd.pm:128
+#: ../ftp_wizard/Proftpd.pm:137
 msgid "Intranet FTP Server:"
 msgstr "Gwasanaethwr FTP Mewnrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:129
+#: ../ftp_wizard/Proftpd.pm:138
 msgid "Internet FTP Server:"
 msgstr "Gwasanaeth FTP y Rhyngrwyd:"
 
+#: ../ftp_wizard/Proftpd.pm:139
+msgid "Admin email"
+msgstr ""
+
 #: ../ftp_wizard/Proftpd.pm:140
+msgid "Permit root Login"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:141
+msgid "Chroot Home user"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:142
+msgid "Allow FTP resume"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:143
+msgid "Allow FXP"
+msgstr ""
+
+#: ../ftp_wizard/Proftpd.pm:149
 msgid "The wizard successfully configured your Intranet/Internet FTP Server"
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr FTP Mewnrwyd/"
@@ -777,7 +804,7 @@ msgid "Destination directory already in use, please choose another one."
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:83
-msgid "I will configure your install server with those parameters"
+msgid "Your install server will be configured with those parameters"
 msgstr ""
 
 #: ../installsrv_wizard/Installsrv.pm:91
@@ -1060,7 +1087,7 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol\n"
 "sydd eu hangen ar gyfer ffurfweddu eich Gwasanaeth Newyddion Rhyngrwyd:"
 
-#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:94
+#: ../news_wizard/Inn.pm:87 ../postfix_wizard/Postfix.pm:139
 #: ../proxy_wizard/Squid.pm:148 ../proxy_wizard/Squid.pm:161
 #: ../samba_wizard/Samba.pm:208 ../web_wizard/Apache.pm:130
 msgid ""
@@ -1342,27 +1369,42 @@ msgstr "Ffurfweddu eich system fel Cleient Nis..."
 msgid "Nis Client"
 msgstr "Cleient Nis"
 
-#: ../postfix_wizard/Postfix.pm:36
+#: ../postfix_wizard/Postfix.pm:39
 msgid "Postfix wizard"
 msgstr "Dewin Postfix"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:49
+msgid "Error, can't find your hostname in /etc/hosts. Exiting."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:59
+#, fuzzy
+msgid "External Mail server"
+msgstr "Gwasanaethwr e-bost"
+
+#: ../postfix_wizard/Postfix.pm:60
+#, fuzzy
+msgid "Internal Mail server"
+msgstr "Gwasanaethwr e-bost"
+
+#: ../postfix_wizard/Postfix.pm:66
 msgid "Internet Mail Configuration Wizard"
 msgstr "Dewin Ffurfweddu E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:48
+#: ../postfix_wizard/Postfix.pm:66
+#, fuzzy
 msgid ""
 "This wizard will help you configuring the Internet Mail services for your "
-"network."
+"network, or configure an Internet Mail server."
 msgstr ""
 "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau E-bost Rhyngrwyd ar gyfer "
 "eich rhwydwaith."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid "Outgoing Mail Address"
 msgstr "Cyfeiriad E-bost Allfynd"
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "This should be chosen consistently with the address you use for incoming "
 "mail."
@@ -1370,7 +1412,7 @@ msgstr ""
 "Rhaid i hyn gael ei ddewis yn gyson gyda'r cyfeiriad sy'n cael ei ddefnyddio "
 "ar gyfer e-bost sy'n cyrraedd."
 
-#: ../postfix_wizard/Postfix.pm:54
+#: ../postfix_wizard/Postfix.pm:82
 msgid ""
 "You can select the kind of address that outgoing mail will show in the "
 "\"From:\" and \"Reply-to\" field."
@@ -1378,19 +1420,27 @@ msgstr ""
 "Mae modd dewis y math o gyfeiriad fydd e-bost allfynd yn ei ddangos ym maes "
 "\"Oddi wrth:\" a \"Ateb i\"."
 
-#: ../postfix_wizard/Postfix.pm:60
+#: ../postfix_wizard/Postfix.pm:88
 msgid "Masquerade domain name:"
 msgstr "Enw parth ffug:"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:93
+msgid "tata"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:95
+msgid "aa"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:100
 msgid "Warning:"
 msgstr "Rhybudd"
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid "You entered an empty address for the mail gateway."
 msgstr "Rydych wedi rhoi cyfeiriad gwag ar gyfer porth e-bost."
 
-#: ../postfix_wizard/Postfix.pm:65
+#: ../postfix_wizard/Postfix.pm:100
 msgid ""
 "Your choice can be accepted, but this will not allow you to send mail "
 "outside your local network. Press next to continue, or back to enter a value."
@@ -1399,15 +1449,21 @@ msgstr ""
 "allan i'ch rhwydwaith lleol. Cliciwch nesaf i barhau, neu nôl i gynnig "
 "gwerth."
 
-#: ../postfix_wizard/Postfix.pm:69
+#: ../postfix_wizard/Postfix.pm:104
 msgid "Masquerade not good!"
 msgstr "Ffugio gwael!"
 
-#: ../postfix_wizard/Postfix.pm:73 ../postfix_wizard/Postfix.pm:96
+#: ../postfix_wizard/Postfix.pm:108
+msgid ""
+"Error, sendmail is installed, please remove it before install and configure "
+"Postfix"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:114 ../postfix_wizard/Postfix.pm:141
 msgid "Internet Mail Gateway"
 msgstr "Porth E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Internet host names must be in the form \"host.domain.domaintype\"; for "
 "example, if your provider is \"provider.com\", the internet mail server is "
@@ -1417,7 +1473,7 @@ msgstr ""
 "\"; e.e. os eich darparwr yw \"darparwr.com\", fel rheol y gwasanaethwr e-"
 "bost rhyngrwyd yw \"newyddion.darparwr.com\"."
 
-#: ../postfix_wizard/Postfix.pm:73
+#: ../postfix_wizard/Postfix.pm:114
 msgid ""
 "Your server will send the outgoing through a mail gateway, that will take "
 "care of the final delivery."
@@ -1425,29 +1481,29 @@ msgstr ""
 "Bydd eich gwasanaethwr yn anfon yr e-bost allfynd drwy borth e-bost, gan "
 "ofalu am y trosglwyddiad terfynol."
 
-#: ../postfix_wizard/Postfix.pm:79
+#: ../postfix_wizard/Postfix.pm:120
 msgid "Mail Server Name:"
 msgstr "Enw Gwasanaethwr E-bost::"
 
-#: ../postfix_wizard/Postfix.pm:84
-msgid "The default is to append $myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:125
+msgid "The default is to append myhostname which is fine for small sites."
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:84
+#: ../postfix_wizard/Postfix.pm:125
 msgid ""
 "The myorigin parameter specifies the domain that locally-posted mail appears "
 "to come from"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:89
+#: ../postfix_wizard/Postfix.pm:130
 msgid "myorigin:"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid "Configuring the Internet Mail"
 msgstr "Ffurfweddu E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:94
+#: ../postfix_wizard/Postfix.pm:139
 msgid ""
 "The wizard collected the following parameters needed to configure your "
 "Internet Mail Service:"
@@ -1455,30 +1511,35 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
 "ffurfweddu eich Gwasanaeth E-bost Rhyngrwyd:"
 
-#: ../postfix_wizard/Postfix.pm:97
+#: ../postfix_wizard/Postfix.pm:142
 msgid "Form of the Address"
 msgstr "Ffurf y Cyfeiriad"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:143
 msgid "myorigin"
 msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:104
+#: ../postfix_wizard/Postfix.pm:149
 msgid ""
 "The wizard successfully configured your Internet Mail service of your server."
 msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaeth E-bost Rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:151
-#, fuzzy
-msgid "Configuring your Postfix server."
-msgstr "Ffurfweddu'r Gwasanaethwr FTP"
+#: ../postfix_wizard/Postfix.pm:164
+msgid "Check if sendmail is installed, to avoid conflict...."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:151
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:228
+#: ../postfix_wizard/Postfix.pm:255
 #, fuzzy
 msgid "Postfix Server"
 msgstr "Gwasanaethwr Argraffu:"
 
+#: ../postfix_wizard/Postfix.pm:228 ../postfix_wizard/Postfix.pm:255
+#, fuzzy
+msgid "Configuring your Postfix server....."
+msgstr "Ffurfweddu'r Gwasanaethwr FTP"
+
 #: ../proxy_wizard/Squid.pm:39
 msgid "Localhost - access restricted to this server only"
 msgstr "Gwestai Lleol - cyfyngu mynediad i'r gwasanaethwr hwn yn unig"
@@ -1656,7 +1717,8 @@ msgid "Access Control:"
 msgstr "Rheoli Mynediad:"
 
 #: ../proxy_wizard/Squid.pm:172
-msgid "The wizard successfully configured your proxy server."
+#, fuzzy
+msgid "The wizard have successfully configured your proxy server."
 msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gwasanaethwr dirprwyol."
 
 #: ../proxy_wizard/Squid.pm:217
@@ -1674,12 +1736,6 @@ msgstr "Dewin Squid"
 msgid "PXE Wizard"
 msgstr "Dewin PXE"
 
-#: ../pxe_wizard/Pxe.pm:72
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not egal to localdomain or none. Launch drakconnect to adjust it."
-msgstr ""
-
 #: ../pxe_wizard/Pxe.pm:79 ../pxe_wizard/Pxe.pm:174
 msgid "Set PXE server"
 msgstr "Gosod wasanaethwr PXE"
@@ -2415,6 +2471,17 @@ msgstr ""
 "Llwyddiant! Mae'r dewin wedi ffurfweddu eich Gwasanaethwr Gwe Mewnrwyd/"
 "Rhyngrwyd"
 
+#~ msgid "Don't check any box if you don't want to activate your FTP Server."
+#~ msgstr ""
+#~ "Peidiwch ticio unrhyw flwch os nad ydych am gychwyn eich Gwasanaethwr FTP."
+
+#~ msgid ""
+#~ "Warning\n"
+#~ "You are in dhcp, server may not work with your configuration."
+#~ msgstr ""
+#~ "Rhybudd\\nRydych yn dhcp, efallai na fydd y gwasanaethwr yn gweithio "
+#~ "gyda'ch ffufrweddiad."
+
 #, fuzzy
 #~ msgid "Setup a ldap server."
 #~ msgstr "Gosod gwasanaethwr PXE"