updated pot file

1 files changed, 302 insertions, 295 deletions

diff --git a/po/cy.po b/po/cy.po
index 3199fc63..870b2a0c 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-11-05 12:19+0100\n"
+"POT-Creation-Date: 2005-01-03 09:17+0100\n"
 "PO-Revision-Date: 2004-03-28 22:26-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -20,31 +20,31 @@ msgstr "dewin ffurfweddu"
 
 #: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../samba_wizard/Samba.pm:148 ../samba_wizard/Samba.pm:207
+#: ../samba_wizard/Samba.pm:152 ../samba_wizard/Samba.pm:211
 #: ../time_wizard/Ntp.pm:137 ../time_wizard/Ntp.pm:144
 #: ../web_wizard/Apache.pm:85
 msgid "Warning."
 msgstr "Rhybudd."
 
-#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:202 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:121
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../samba_wizard/Samba.pm:88 ../samba_wizard/Samba.pm:104
-#: ../samba_wizard/Samba.pm:166 ../samba_wizard/Samba.pm:171
-#: ../samba_wizard/Samba.pm:213 ../web_wizard/Apache.pm:117
+#: ../samba_wizard/Samba.pm:92 ../samba_wizard/Samba.pm:108
+#: ../samba_wizard/Samba.pm:170 ../samba_wizard/Samba.pm:175
+#: ../samba_wizard/Samba.pm:217 ../web_wizard/Apache.pm:117
 #: ../web_wizard/Apache.pm:125
 msgid "Error."
 msgstr "Gwall."
 
 #: ../Wiztemplate.pm:78 ../client_wizard/Bind_client.pm:97
-#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:260
-#: ../dns_wizard/Bind.pm:266 ../dns_wizard/Bind.pm:273
-#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:100
-#: ../ldap_wizard/Ldap.pm:250 ../news_wizard/Inn.pm:95
-#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:141
-#: ../nisautofs_wizard/Nisautofs.pm:148 ../postfix_wizard/Postfix.pm:148
+#: ../dhcp_wizard/Dhcp.pm:125 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:260 ../dns_wizard/Bind.pm:267
+#: ../ftp_wizard/Proftpd.pm:148 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:233 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:138
+#: ../nisautofs_wizard/Nisautofs.pm:145 ../postfix_wizard/Postfix.pm:148
 #: ../proxy_wizard/Squid.pm:174 ../pxe_wizard/Pxe.pm:295
 #: ../pxe_wizard/Pxe.pm:307 ../pxe_wizard/Pxe.pm:319 ../pxe_wizard/Pxe.pm:324
-#: ../samba_wizard/Samba.pm:239 ../web_wizard/Apache.pm:146
+#: ../samba_wizard/Samba.pm:243 ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
 
@@ -85,11 +85,11 @@ msgstr ""
 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:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid "Client identification:"
 msgstr "Enw cleient:"
 
-#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 msgid ""
 "Note that the given IP address and client name should be unique in the "
 "network."
@@ -97,7 +97,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:134
+#: ../client_wizard/Bind_client.pm:61 ../dns_wizard/Bind.pm:128
 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, "
@@ -107,21 +107,21 @@ msgstr ""
 "cleient.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:138
+#: ../client_wizard/Bind_client.pm:67 ../dns_wizard/Bind.pm:132
 msgid "Name of the machine:"
 msgstr "Enw'r peiriant"
 
-#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:139
+#: ../client_wizard/Bind_client.pm:68 ../dns_wizard/Bind.pm:133
 msgid "IP address of the machine:"
 msgstr "Cyfeiriad porth IP"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:197
+#: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
 msgid "Warning"
 msgstr "Rhybudd"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
-#: ../dns_wizard/Bind.pm:197 ../web_wizard/Apache.pm:85
+#: ../dns_wizard/Bind.pm:191 ../web_wizard/Apache.pm:85
 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."
@@ -129,12 +129,12 @@ msgstr ""
 #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83
 #: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:80
 #: ../drakwizard.pl:106 ../drakwizard.pl:157 ../drakwizard.pl:161
-#: ../kolab_wizard/Kolab.pm:114 ../ldap_wizard/Ldap.pm:124
-#: ../ldap_wizard/Ldap.pm:133 ../ldap_wizard/Ldap.pm:162
-#: ../ldap_wizard/Ldap.pm:166 ../ldap_wizard/Ldap.pm:170
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:190
-#: ../ldap_wizard/Ldap.pm:211 ../ldap_wizard/Ldap.pm:215
-#: ../ldap_wizard/Ldap.pm:219 ../nfs_wizard/NFS.pm:62
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:113
+#: ../ldap_wizard/Ldap.pm:120 ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:151 ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:174
+#: ../ldap_wizard/Ldap.pm:194 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:202 ../nfs_wizard/NFS.pm:62
 #: ../postfix_wizard/Postfix.pm:88
 msgid "Error"
 msgstr "Gwall"
@@ -179,12 +179,33 @@ msgstr "IP Cleient:"
 msgid "The wizard successfully added the client."
 msgstr "Mae'r dewin wedi ychwanegu'r cleient yn llwyddiannus."
 
-#: ../common/Wizcommon.pm:86
+#: ../common/Wizcommon.pm:57
+#, fuzzy
+msgid ""
+"You need to readjust your hostname. 'localhost' is not a correct hostname "
+"for a DNS server. Hostname must be a FQDN: Fully Qualified Domain Name"
+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."
+
+#: ../common/Wizcommon.pm:60
+#, fuzzy
+msgid ""
+"You need to readjust your domainname. For a DNS server you need a correct "
+"domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully "
+"Qualified Domain Name. 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."
+
+#: ../common/Wizcommon.pm:98
 msgid ""
 "The command is still running. Do you want to kill it and quit the Wizard?"
 msgstr ""
 
-#: ../common/Wizcommon.pm:103
+#: ../common/Wizcommon.pm:115
 msgid "Close"
 msgstr "Cau"
 
@@ -276,8 +297,8 @@ msgstr ""
 #: ../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 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "anablwyd"
@@ -286,8 +307,8 @@ msgstr "anablwyd"
 #: ../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 ../installsrv_wizard/Installsrv.pm:87
-#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:222
-#: ../samba_wizard/Samba.pm:223 ../samba_wizard/Samba.pm:224
+#: ../installsrv_wizard/Installsrv.pm:88 ../samba_wizard/Samba.pm:226
+#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
 #: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "galluogwyd"
@@ -300,53 +321,38 @@ msgstr "Rhyngwyneb:"
 msgid "The wizard successfully configured the DHCP services."
 msgstr "Mae'r dewin wedi ffurfweddu gwasanaethau DHCP eich gweinydd."
 
-#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:280
+#: ../dhcp_wizard/Dhcp.pm:130 ../dns_wizard/Bind.pm:274
 #: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:155 ../postfix_wizard/Postfix.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:244 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Methwyd"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:156 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:245 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
+#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwyn drakwizard, a cheisio newid rhai paramedrau."
 
-#: ../dns_wizard/Bind.pm:73 ../ldap_wizard/Ldap.pm:61
-msgid "You need to readjust your hostname."
-msgstr "Mae angen i chi newid eich enw gwesteiwr"
-
-#: ../dns_wizard/Bind.pm:76
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For a DNS server you need a correct "
-"domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully "
-"Qualified Domain Name. 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."
-
-#: ../dns_wizard/Bind.pm:83 ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:77 ../dns_wizard/Bind.pm:712
 msgid "Master DNS server"
 msgstr "Prif weinydd DNS"
 
-#: ../dns_wizard/Bind.pm:84 ../dns_wizard/Bind.pm:153
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:78 ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:726
 msgid "Slave DNS server"
 msgstr "Is weinydd DNS"
 
-#: ../dns_wizard/Bind.pm:85
+#: ../dns_wizard/Bind.pm:79
 msgid "Add host in DNS"
 msgstr "Ychwanegu gwesteiwr yn DNS"
 
-#: ../dns_wizard/Bind.pm:86
+#: ../dns_wizard/Bind.pm:80
 msgid "Remove host in DNS"
 msgstr "Tynnu gwesteiwr yn DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid ""
 "DNS (Domain Name Server) is the service that maps an IP address of a machine "
 "with an internet host name."
@@ -354,11 +360,11 @@ msgstr ""
 "DNS (Domain Name Server) yw'r gwasanaeth sy'n rhoi cyfathrebiad i beiriant "
 "sydd ag enw gwestai rhyngrwyd"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 msgid "DNS Master configuration wizard"
 msgstr "Dewin ffurfweddu Prif DNS"
 
-#: ../dns_wizard/Bind.pm:105
+#: ../dns_wizard/Bind.pm:99
 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, "
@@ -368,47 +374,47 @@ msgstr ""
 "Bydd yn darparu gwasanaeth DNS lleol ar gyfer enwau cyfrifiaduron lleol, "
 "gyda cheisiadau allanol yn cael eu hanfon ymlaen i DNS allanol."
 
-#: ../dns_wizard/Bind.pm:121 ../postfix_wizard/Postfix.pm:76
+#: ../dns_wizard/Bind.pm:115 ../postfix_wizard/Postfix.pm:76
 #: ../pxe_wizard/Pxe.pm:126
 msgid "What do you want to do:"
 msgstr "Beth hoffech ei wneud:"
 
-#: ../dns_wizard/Bind.pm:126
+#: ../dns_wizard/Bind.pm:120
 #, fuzzy
 msgid "DNS server Interface"
 msgstr "Gweinydd DNS"
 
-#: ../dns_wizard/Bind.pm:134
+#: ../dns_wizard/Bind.pm:128
 msgid "(You don't need to add the domain after the name)"
 msgstr "(Does dim angen teipio'r parth ar ôl yr enw)"
 
-#: ../dns_wizard/Bind.pm:136 ../dns_wizard/Bind.pm:232
+#: ../dns_wizard/Bind.pm:130 ../dns_wizard/Bind.pm:226
 #, fuzzy
 msgid "Server:"
 msgstr "IP gweinydd:"
 
-#: ../dns_wizard/Bind.pm:137 ../dns_wizard/Bind.pm:233
+#: ../dns_wizard/Bind.pm:131 ../dns_wizard/Bind.pm:227
 #, fuzzy
 msgid "DNS Domainname:"
 msgstr "Enw parth NIS:"
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 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:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove a host in existing DNS configuration."
 msgstr "Tynwch westeiwr o'r ffurfweddiad DNS presennol."
 
-#: ../dns_wizard/Bind.pm:145
+#: ../dns_wizard/Bind.pm:139
 msgid "Remove host:"
 msgstr "Tynnu gwesteiwr"
 
-#: ../dns_wizard/Bind.pm:147
+#: ../dns_wizard/Bind.pm:141
 msgid "Computer Name:"
 msgstr "Enw'r Cyfrifiadur:"
 
-#: ../dns_wizard/Bind.pm:153
+#: ../dns_wizard/Bind.pm:147
 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 "
@@ -418,11 +424,11 @@ msgstr ""
 "enw cynradd, a bydd hefyd yn gweithio fel gweinydd wrth gefn, rhag ofn nad "
 "oes modd cyrraedd eich prif weinydd."
 
-#: ../dns_wizard/Bind.pm:155 ../dns_wizard/Bind.pm:224
+#: ../dns_wizard/Bind.pm:149 ../dns_wizard/Bind.pm:218
 msgid "IP Address of the master DNS server:"
 msgstr "Ffurfweddu'r prif weinydd DNS"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid ""
 "Forwarding occurs on only those queries for which the server is not "
 "authoritative and  does not have the answer in its cache."
@@ -430,11 +436,11 @@ msgstr ""
 "Mae blaenyrru'n digwydd dim ond i'r ymholiadau nad yw'r gweinydd yn "
 "awdurdodol ac nad yw'r ateb yn ei storfa."
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid "IP of your forwarder"
 msgstr "IP eich blaenyrrwr"
 
-#: ../dns_wizard/Bind.pm:162
+#: ../dns_wizard/Bind.pm:156
 msgid ""
 "If you need it and know your IP forwarder enter IP address of it, if you "
 "dont know leave it blank"
@@ -442,15 +448,15 @@ msgstr ""
 "Os mae ei angen arnoch ac rydych yn gwybod eich blaenyrrwr rhowch ei "
 "gyfeiriad IP, os nad ydych yn ei wybod, gadwech yn wag."
 
-#: ../dns_wizard/Bind.pm:168 ../dns_wizard/Bind.pm:253
+#: ../dns_wizard/Bind.pm:162 ../dns_wizard/Bind.pm:247
 msgid "External DNS:"
 msgstr "DNS Allanol:"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid "Add search domain"
 msgstr "Ychwanegu parth chwilio"
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 msgid ""
 "Domainname of this server is automatically added, and you dont need to add "
 "it here."
@@ -458,7 +464,7 @@ msgstr ""
 "Bydd enw parth y gweinydd yn cael ei ychwanegu'n awtomatig, does dim angen "
 "ei ychwanegu."
 
-#: ../dns_wizard/Bind.pm:174
+#: ../dns_wizard/Bind.pm:168
 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 "
@@ -470,24 +476,24 @@ msgstr ""
 "yn unig. Gall hyn gael ei newid drwy restru llwybr y chwiliad parth sy'n "
 "dilyn chwilio'r allweddair."
 
-#: ../dns_wizard/Bind.pm:177 ../dns_wizard/Bind.pm:254
+#: ../dns_wizard/Bind.pm:171 ../dns_wizard/Bind.pm:248
 msgid "Default domain name to search:"
 msgstr "Chwilio am  enw parth rhagosodedig:"
 
-#: ../dns_wizard/Bind.pm:182
+#: ../dns_wizard/Bind.pm:176
 msgid ""
 "This is not a valid IP address for your forwarder... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad dilys...cliciwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:187
+#: ../dns_wizard/Bind.pm:181
 msgid "This is not a valid Master DNS IP address... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad IP DNS Prif dilys...gwasgwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:192
+#: ../dns_wizard/Bind.pm:186
 msgid "This is not a valid IP address... press next to continue"
 msgstr "Nid yw hwn yn gyfeiriad IP dilys...cliciwch nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:202
+#: ../dns_wizard/Bind.pm:196
 msgid ""
 "It seems that host is already in your DNS configuration... press next to "
 "continue"
@@ -495,18 +501,18 @@ msgstr ""
 "Mae'n ymddangos fod y gwestai eisoes yn eich ffurfweddiad DNS...cliciwch "
 "Nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:207 ../kolab_wizard/Kolab.pm:76
+#: ../dns_wizard/Bind.pm:201 ../kolab_wizard/Kolab.pm:73
 msgid "Error:"
 msgstr "Gwall:"
 
-#: ../dns_wizard/Bind.pm:207
+#: ../dns_wizard/Bind.pm:201
 msgid ""
 "It seems that this is not present in your DNS configuration... press next to "
 "continue"
 msgstr ""
 "Mae'n ymddangos nad yw hwn yn eich ffurfweddiad DNS...cliciwch Nesaf i barhau"
 
-#: ../dns_wizard/Bind.pm:212
+#: ../dns_wizard/Bind.pm:206
 msgid ""
 "It seems that no DNS server has been set through wizard. Please run DNS "
 "wizard: Master DNS server."
@@ -514,72 +520,72 @@ msgstr ""
 "Mae'n ymddangos nad oes gweinydd DNS wedi ei osod drwy'r Dewin. Defnyddiwch "
 "Ddewin DNS: Prif weinydd DNS."
 
-#: ../dns_wizard/Bind.pm:217
+#: ../dns_wizard/Bind.pm:211
 msgid ""
 "It seems that you are not a master DNS server, so I can't add/remove host."
 msgstr ""
 "Mae'n ymddangos nad ydych yn brif weinydd DNS, felly nid oes modd i mi  "
 "ychwanegu/tynnu gwestai."
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "Wizard will Now build your DNS slave configuration"
 msgstr "Bydd y Dewin yn adeiladu eich ffurfweddiad gwas DNS"
 
-#: ../dns_wizard/Bind.pm:222
+#: ../dns_wizard/Bind.pm:216
 msgid "with this configuration:"
 msgstr "gyda'r ffurfweddiad yma:"
 
-#: ../dns_wizard/Bind.pm:230
+#: ../dns_wizard/Bind.pm:224
 msgid "Client with this identification will be added to your DNS"
 msgstr "Bydd cleient gyda'r enw hwn yn cael ei ychwanegu at eich DNS"
 
-#: ../dns_wizard/Bind.pm:234 ../dns_wizard/Bind.pm:243
+#: ../dns_wizard/Bind.pm:228 ../dns_wizard/Bind.pm:237
 msgid "Computer name:"
 msgstr "Enw'r Cyfrifiadur"
 
-#: ../dns_wizard/Bind.pm:235
+#: ../dns_wizard/Bind.pm:229
 msgid "Computer IP address:"
 msgstr "Cyfeiriad IP y Cyfrifiadur"
 
-#: ../dns_wizard/Bind.pm:241
+#: ../dns_wizard/Bind.pm:235
 msgid "Client with this identification will be removed from your DNS"
 msgstr "Bydd cleient gyda'r enw hwn yn cael ei dynnu o'ch DNS"
 
-#: ../dns_wizard/Bind.pm:249
+#: ../dns_wizard/Bind.pm:243
 msgid ""
 "The DNS server is about to be configured with the following configuration"
 msgstr ""
 "Mae'r gweinydd DNS ar fin cael ei ffurfweddu gyda'r ffurfweddiad canlynol"
 
-#: ../dns_wizard/Bind.pm:251
+#: ../dns_wizard/Bind.pm:245
 msgid "Server Hostname:"
 msgstr "Enw gwestai'r Gweinydd"
 
-#: ../dns_wizard/Bind.pm:252
+#: ../dns_wizard/Bind.pm:246
 msgid "Domainname:"
 msgstr "Enw Parth:"
 
-#: ../dns_wizard/Bind.pm:261
+#: ../dns_wizard/Bind.pm:255
 msgid "The wizard successfully added the host in your DNS."
 msgstr "Mae'r dewin wedi ychwanegu'r gwestai'n llwyddiannus i'ch DNS."
 
-#: ../dns_wizard/Bind.pm:267
+#: ../dns_wizard/Bind.pm:261
 msgid "The wizard successfully removed the host from your DNS."
 msgstr "Mae'r dewin wedi tynnu'r gwestai'n llwyddiannus o'ch DNS."
 
-#: ../dns_wizard/Bind.pm:274
+#: ../dns_wizard/Bind.pm:268
 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:281
+#: ../dns_wizard/Bind.pm:275
 msgid "Please Relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwynwch drakwizard, a cheisio newid rhai paramedrau."
 
-#: ../dns_wizard/Bind.pm:718
+#: ../dns_wizard/Bind.pm:712
 msgid "Configuring your system as Master DNS server ..."
 msgstr "Ffurfweddu eich system fel Prif weinydd DNS..."
 
-#: ../dns_wizard/Bind.pm:732
+#: ../dns_wizard/Bind.pm:726
 msgid "Configuring your system as Slave DNS server ..."
 msgstr "Ffurfweddu eich system fel gweinydd DNS Gwas..."
 
@@ -607,7 +613,7 @@ msgstr "Gweinydd e-bost"
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:521
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
 msgid "Samba server"
 msgstr "Gweinydd Samba"
 
@@ -632,7 +638,7 @@ msgstr "Map autofs gweinydd NIS"
 msgid "Mandrakelinux Install server"
 msgstr "Gweinydd Gosod Mandrake"
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:131
+#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
 msgid "Kolab server"
 msgstr "Gweinydd Kolab"
 
@@ -658,7 +664,7 @@ msgstr ""
 "Nid yw %s wedi ei osod\n"
 "Cliciwch \"Nesaf\"i'w osod neu \"Diddymu\" i adael."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:114
+#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
@@ -913,15 +919,7 @@ msgstr ""
 msgid "Kolab configuration wizard"
 msgstr "Dewin Ffurfweddu Kolab"
 
-#: ../kolab_wizard/Kolab.pm:43 ../pxe_wizard/Pxe.pm:78
-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, nid cydradd i parthlleol na dim. "
-"Cychwynnwch drakconnect i'w newid."
-
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid ""
 "Kolab is a secure, scalable and reliable groupware server. Some of the major "
 "features include: a web administration interface, a shared address book with "
@@ -933,7 +931,7 @@ msgstr ""
 "rhanadwy gyda'r cyfleuster o flychau e-bost, cysylltiadau a POP3 yn ogystal "
 "â mynediad IMAP4(rev1) i e-bost."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid ""
 "Warning: Kolab needs to configure many other services: Proftpd, LDAP, Cyrus, "
 "Postfix, Imap, Saslauth. Wizard will make a backup of all your previous "
@@ -943,39 +941,39 @@ msgstr ""
 "LDAP, Cyrus, Postfix, Imap, Saslauth. Bydd y Dewin yn gwneud copi wrth gefn "
 "o'ch ffeiliau ffurfweddiad blaenorol ar gyfer y gwasanaethau hyn."
 
-#: ../kolab_wizard/Kolab.pm:59
+#: ../kolab_wizard/Kolab.pm:56
 msgid "Welcome to the Kolab Groupware server configuration Wizard."
 msgstr "Croeso i Dewin ffurfweddu gweinydd Kolab Groupware"
 
-#: ../kolab_wizard/Kolab.pm:73
+#: ../kolab_wizard/Kolab.pm:70
 msgid "Enter pasword for the manager account of Kolab server."
 msgstr "Rhowch gyfrinair ar gyfer cyfrif rheolwr gweinydd Kolab"
 
-#: ../kolab_wizard/Kolab.pm:76
+#: ../kolab_wizard/Kolab.pm:73
 msgid "Password mismatch, or null password, please correct."
 msgstr "Cyfrinair gwallus, cywirwch."
 
-#: ../kolab_wizard/Kolab.pm:82 ../ldap_wizard/Ldap.pm:181
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../kolab_wizard/Kolab.pm:84
+#: ../kolab_wizard/Kolab.pm:81
 msgid "Password again:"
 msgstr "Cyfrinair eto:"
 
-#: ../kolab_wizard/Kolab.pm:89
+#: ../kolab_wizard/Kolab.pm:86
 msgid "The wizard will now configure Kolab server with these parameters"
 msgstr "Bydd y dewin yn ffurfweddu gweinydd Kolab gyda'r paramedrau hyn"
 
-#: ../kolab_wizard/Kolab.pm:92
+#: ../kolab_wizard/Kolab.pm:89
 msgid "Hostname:"
 msgstr "Enw Gwestai:"
 
-#: ../kolab_wizard/Kolab.pm:94
+#: ../kolab_wizard/Kolab.pm:91
 msgid "Mail domain:"
 msgstr "Parth E-bost:"
 
-#: ../kolab_wizard/Kolab.pm:100
+#: ../kolab_wizard/Kolab.pm:97
 msgid ""
 "The kolab server is now configured and running. Log in as 'manager' with the "
 "password you entered at https://127.0.0.1/kolab/admin/"
@@ -983,260 +981,245 @@ msgstr ""
 "Mae'r gweinydd kolab wedi ei ffurfweddu ac yn rhedeg. Mewngofnodwch fel "
 "'rheolwr' gyda'r cyfrinair rhoesoch yn https://127.0.0.1/kolab/admin/"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Install in progress"
 msgstr "Wrthi'n gosod"
 
-#: ../kolab_wizard/Kolab.pm:109
+#: ../kolab_wizard/Kolab.pm:106
 msgid "Installing Kolab server on your system..."
 msgstr "Gosod gweinydd Kolab ar eich system..."
 
-#: ../kolab_wizard/Kolab.pm:131
+#: ../kolab_wizard/Kolab.pm:128
 msgid "Configuring Kolab server on your system..."
 msgstr "Ffurfweddu gweinydd Kolab ar eich system..."
 
-#: ../ldap_wizard/Ldap.pm:32
+#: ../ldap_wizard/Ldap.pm:31
 msgid "Ldap wizard"
 msgstr "Dewin Ldap"
 
-#: ../ldap_wizard/Ldap.pm:64
-#, fuzzy
-msgid ""
-"You need to readjust your domainname. For an LDAP server you need a correct "
-"domainname, not equal to localdomain or none. Hostname must be a FQDN: Fully "
-"Qualified Domain Name. 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."
-
-#: ../ldap_wizard/Ldap.pm:99
+#: ../ldap_wizard/Ldap.pm:91
 #, fuzzy
 msgid "Show Ldap configuration"
 msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:100
+#: ../ldap_wizard/Ldap.pm:92
 #, fuzzy
 msgid "Add user in Ldap server"
 msgstr "Ychwanegu - ychwanegu cofnod mewn gweinydd LDAP"
 
-#: ../ldap_wizard/Ldap.pm:101
+#: ../ldap_wizard/Ldap.pm:93
 #, fuzzy
 msgid "Delete Ldap configuration"
 msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:98
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:106 ../ldap_wizard/Ldap.pm:116
+#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
 #, fuzzy
 msgid "Ldap configuration wizard"
 msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:124 ../ldap_wizard/Ldap.pm:133
+#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
 #, fuzzy
 msgid "You must setup an Ldap server first."
 msgstr "Gosod gweinydd PXE"
 
-#: ../ldap_wizard/Ldap.pm:140
+#: ../ldap_wizard/Ldap.pm:126
 msgid "Your choice:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 #, fuzzy
 msgid "Delete configuration"
 msgstr "Gosod ffurfweddiad gweinydd"
 
-#: ../ldap_wizard/Ldap.pm:146
+#: ../ldap_wizard/Ldap.pm:131
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:136
 msgid "LDAP Adding User"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:154
-#, fuzzy
-msgid "User Created in: "
+#: ../ldap_wizard/Ldap.pm:139
+#, fuzzy, perl-format
+msgid "User Created in: %s, %s"
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:156
+#: ../ldap_wizard/Ldap.pm:141
 msgid "First Name:"
 msgstr "Enw Cyntaf:"
 
-#: ../ldap_wizard/Ldap.pm:157 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
 #, fuzzy
 msgid "Name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:158
+#: ../ldap_wizard/Ldap.pm:143
 #, fuzzy
 msgid "User Login:"
 msgstr "Cynhwysydd:"
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:147
 msgid "You must enter a valid First Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:151
 msgid "You must enter a valid Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:170
+#: ../ldap_wizard/Ldap.pm:155
 msgid "You must enter a valid User Name."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:178
+#: ../ldap_wizard/Ldap.pm:162
 #, fuzzy
 msgid "LDAP User Password"
 msgstr "Cyfrinair:"
 
-#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
 msgid "passwords must match"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:182
+#: ../ldap_wizard/Ldap.pm:166
 #, fuzzy
 msgid "Password (again):"
 msgstr "Cyfrinair eto:"
 
-#: ../ldap_wizard/Ldap.pm:186 ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
 msgid "You must enter a password for LDAP."
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:190 ../ldap_wizard/Ldap.pm:219
+#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
 msgid "The passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
-#: ../ldap_wizard/Ldap.pm:197 ../ldap_wizard/Ldap.pm:206
-msgid "Administrator"
-msgstr ""
-
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "Administrator is a power user with grant access on LDAP database"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181 ../ldap_wizard/Ldap.pm:190
+#, perl-format
+msgid "Administrator,%s"
+msgstr ",%s"
+
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "Configuring LDAP Server"
 msgstr "Ffurfweddu Samba"
 
-#: ../ldap_wizard/Ldap.pm:197
-#, fuzzy
-msgid "Domain name: "
-msgstr "Enw Parth:"
+#: ../ldap_wizard/Ldap.pm:181
+#, fuzzy, perl-format
+msgid "Domain name: %s"
+msgstr "Enw Parth:%s"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "LDAP Administrator"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 #, fuzzy
 msgid "LDAP directory tree"
 msgstr "Cyfeiriadur TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:197
+#: ../ldap_wizard/Ldap.pm:181
 msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:200 ../ldap_wizard/Ldap.pm:242
-#: ../ldap_wizard/Ldap.pm:288
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
+#: ../ldap_wizard/Ldap.pm:267
 #, fuzzy
 msgid "LDAP directory tree:"
 msgstr "Cyfeiriadur TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:201 ../ldap_wizard/Ldap.pm:243
-#: ../ldap_wizard/Ldap.pm:289
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
+#: ../ldap_wizard/Ldap.pm:268
 msgid "LDAP Administrator:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:186
 #, fuzzy
 msgid "LDAP Password:"
 msgstr "Cyfrinair:"
 
-#: ../ldap_wizard/Ldap.pm:203
+#: ../ldap_wizard/Ldap.pm:187
 #, fuzzy
 msgid "LDAP Password (again):"
 msgstr "Cyfrinair eto:"
 
-#: ../ldap_wizard/Ldap.pm:211
+#: ../ldap_wizard/Ldap.pm:194
 #, fuzzy
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Cyfeiriadur TFTP:"
 
-#: ../ldap_wizard/Ldap.pm:227
+#: ../ldap_wizard/Ldap.pm:210
 msgid "Confirmation of the user to create"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:214
 #, fuzzy
 msgid "First name:"
 msgstr "Enw Cyntaf:"
 
-#: ../ldap_wizard/Ldap.pm:232
+#: ../ldap_wizard/Ldap.pm:215
 msgid "User Name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:233
+#: ../ldap_wizard/Ldap.pm:216
 msgid "Create in:"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:239
+#: ../ldap_wizard/Ldap.pm:222
 #, fuzzy
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Ffurfweddu'r Gweinydd DHCP"
 
-#: ../ldap_wizard/Ldap.pm:244 ../ldap_wizard/Ldap.pm:290
+#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
 #, fuzzy
 msgid "Users Container:"
 msgstr "Cynhwysydd:"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:238
 msgid "The wizard successfully configured the LDAP."
 msgstr "Mae'r dewin wedi ffurfweddu'r LDAPt yn llwyddiannus."
 
-#: ../ldap_wizard/Ldap.pm:260
+#: ../ldap_wizard/Ldap.pm:244
 #, fuzzy
 msgid "Successfully added User"
 msgstr "Ychwanegu data'n llwyddiannus"
 
-#: ../ldap_wizard/Ldap.pm:270
+#: ../ldap_wizard/Ldap.pm:253
 #, fuzzy
 msgid "Error when adding user in Ldap database"
 msgstr "Ychwanegu - ychwanegu cofnod mewn gweinydd LDAP"
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 msgid "Server already configured"
 msgstr ""
 
-#: ../ldap_wizard/Ldap.pm:283
+#: ../ldap_wizard/Ldap.pm:262
 #, fuzzy
 msgid "You have already configured your Ldap Server"
 msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gweinydd Samba."
 
-#: ../ldap_wizard/Ldap.pm:442
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy, perl-format
 msgid "%s Failed"
 msgstr "Methwyd"
 
-#: ../ldap_wizard/Ldap.pm:442 ../ldap_wizard/ldapdef.pm:21
+#: ../ldap_wizard/Ldap.pm:421
 #, fuzzy
 msgid "Error!"
 msgstr "Gwall"
 
-#: ../ldap_wizard/ldapdef.pm:21
-#, perl-format
-msgid "Unable to connect to %s"
-msgstr ""
-
 #: ../news_wizard/Inn.pm:33
 msgid "News Wizard"
 msgstr "Dewin Newyddion"
@@ -1380,13 +1363,13 @@ msgstr ""
 msgid "Directory:"
 msgstr "Cyfeiriadur:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:171
+#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
 #: ../web_wizard/Apache.pm:119
 msgid "The path you entered does not exist."
 msgstr "Nid yw'r llwybr hwn yn bod."
 
-#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:109
-#: ../samba_wizard/Samba.pm:120
+#: ../nfs_wizard/NFS.pm:69 ../samba_wizard/Samba.pm:113
+#: ../samba_wizard/Samba.pm:124
 msgid "Access control"
 msgstr "Rheoli mynediad"
 
@@ -1441,28 +1424,20 @@ msgstr "Netmask:"
 msgid "The wizard successfully configured your NFS server."
 msgstr "Mae'r dewin wedi ffurfweddu eich Gweinydd NFS yn llwyddiannus"
 
-#: ../nisautofs_wizard/Nisautofs.pm:64
-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 NIS. Mae angen enw parth cywir ar gyfer "
-"gweinydd NIS, nid cydradd i barth lleol na dim."
-
-#: ../nisautofs_wizard/Nisautofs.pm:71 ../nisautofs_wizard/Nisautofs.pm:77
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:68 ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server with autofs map"
 msgstr "Gweinydd NIS gyda autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:72 ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
 msgid "NIS client"
 msgstr "Cleient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 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."
 
-#: ../nisautofs_wizard/Nisautofs.pm:77
+#: ../nisautofs_wizard/Nisautofs.pm:74
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1470,28 +1445,28 @@ msgstr ""
 "Mae'r defnyddiwr yn gosod eu cyfeiriadur cartref o'r gweinydd, wrth "
 "fewngofnodi i rwydwaith cyfrifiadurol cleient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:85
+#: ../nisautofs_wizard/Nisautofs.pm:82
 msgid "What do you want to do?"
 msgstr "Beth hoffech ei wneud:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "Configure computer to be a NIS client"
 msgstr "Ffurfweddu eich cyfrifiadur i fod yn gleient N\t..."
 
-#: ../nisautofs_wizard/Nisautofs.pm:90
+#: ../nisautofs_wizard/Nisautofs.pm:87
 msgid "You just have to put nisdomain and nisserver."
 msgstr "Rhaid gosod nisdomain a nisserver"
 
-#: ../nisautofs_wizard/Nisautofs.pm:92 ../nisautofs_wizard/Nisautofs.pm:100
-#: ../nisautofs_wizard/Nisautofs.pm:110 ../nisautofs_wizard/Nisautofs.pm:125
+#: ../nisautofs_wizard/Nisautofs.pm:89 ../nisautofs_wizard/Nisautofs.pm:97
+#: ../nisautofs_wizard/Nisautofs.pm:107 ../nisautofs_wizard/Nisautofs.pm:122
 msgid "NIS server:"
 msgstr "Gweinydd NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:93
+#: ../nisautofs_wizard/Nisautofs.pm:90
 msgid "NIS domain:"
 msgstr "Parth NIS::"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "A NIS server is useful to create user, hostname database. The wizard builds "
 "autofs map, so it will provide the capabilities for NIS user to automount "
@@ -1502,7 +1477,7 @@ msgstr ""
 "galluoedd ar gyfer defnyddwyr NIS i awto osod eu cyfeiriaduron cartref ar "
 "gyfrifiadur cleient NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1510,42 +1485,42 @@ msgstr ""
 "Cartref NIS: cyfeiriadur cartref defnyddwyr gweinydd NIS. Bydd y cyfeiriadur "
 "yn allforio drwy weinydd NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Parth NIS: parth NIS i'w ddefnyddio (yn gyffredinol yrun un â'ch enwparth "
 "DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:98
+#: ../nisautofs_wizard/Nisautofs.pm:95
 msgid "NIS server: name of your computer."
 msgstr "Gweinydd NIS: enw'r cyfrifiadur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:101 ../nisautofs_wizard/Nisautofs.pm:111
+#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Home NIS:"
 msgstr "NIS Cartref:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:102 ../nisautofs_wizard/Nisautofs.pm:112
-#: ../nisautofs_wizard/Nisautofs.pm:126
+#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
+#: ../nisautofs_wizard/Nisautofs.pm:123
 msgid "NIS domainname:"
 msgstr "Enw parth NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:105
 msgid "The wizard will set your NIS server with autofs map"
 msgstr "Bydd y dewin yn gosod eich gweinydd NIS gyda  autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:113
+#: ../nisautofs_wizard/Nisautofs.pm:110
 msgid "NIS directory:"
 msgstr "Cyfeiriadur NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS domainname: name of NIS domain."
 msgstr "Enw parth NIS: enw parth NIS "
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid "NIS server: hostname of the NIS server."
 msgstr "Gweinydd NIS: enw parth gweinydd NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:120
 msgid ""
 "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
 "binding information."
@@ -1553,24 +1528,24 @@ msgstr ""
 "Mae'r daemon YPBIND yn canfod gweinydd ar gyfer parthau NIS ac yn cynnal "
 "gwybodaeth rwymo NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:132
+#: ../nisautofs_wizard/Nisautofs.pm:129
 msgid "Error: should be a directory."
 msgstr "Gwall i fod yn gyfeiriadur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Gwall dylai nisdomainname fod yn 'dim' neu 'parthlleol'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:136
+#: ../nisautofs_wizard/Nisautofs.pm:133
 msgid "Please adjust it."
 msgstr "Newidiwch hwn."
 
-#: ../nisautofs_wizard/Nisautofs.pm:142
+#: ../nisautofs_wizard/Nisautofs.pm:139
 msgid "The wizard successfully configured your machine to be a NIS client."
 msgstr ""
 "Llwyddiant wrth i'r dewin ffurfweddu eich peiriant i fod yn gleient NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:149
+#: ../nisautofs_wizard/Nisautofs.pm:146
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1578,15 +1553,15 @@ msgstr ""
 "Mae'r dewin wedi ffurfweddu eich peiriant yn llwyddiannus i fod yn weinydd "
 "NIS gyda autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:310
+#: ../nisautofs_wizard/Nisautofs.pm:307
 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
+#: ../nisautofs_wizard/Nisautofs.pm:307
 msgid "NIS with Autofs map"
 msgstr "NIS gydag autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:339
+#: ../nisautofs_wizard/Nisautofs.pm:336
 msgid "Configuring your system as NIS client ..."
 msgstr "Ffurfweddu eich system fel Cleient NIS..."
 
@@ -1951,7 +1926,7 @@ msgstr ""
 "ffurfweddu eich dirprwy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:219 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:223 ../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."
@@ -1983,6 +1958,14 @@ msgstr "Dirprwy squid"
 msgid "PXE Wizard"
 msgstr "Dewin PXE"
 
+#: ../pxe_wizard/Pxe.pm:78
+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, nid cydradd i parthlleol na dim. "
+"Cychwynnwch drakconnect i'w newid."
+
 #: ../pxe_wizard/Pxe.pm:85 ../pxe_wizard/Pxe.pm:192
 msgid "Set PXE server"
 msgstr "Gosod gweinydd PXE"
@@ -2338,24 +2321,24 @@ msgstr "Ffurfweddu gweinydd PXE ar eich system..."
 msgid "PXE server"
 msgstr "Gweinydd PXE"
 
-#: ../samba_wizard/Samba.pm:35
+#: ../samba_wizard/Samba.pm:38
 msgid "Samba wizard"
 msgstr "Dewin Samba"
 
-#: ../samba_wizard/Samba.pm:60 ../web_wizard/Apache.pm:62
+#: ../samba_wizard/Samba.pm:63 ../web_wizard/Apache.pm:62
 #, perl-format
 msgid "%s does not exist."
 msgstr "Nid yw %s yn bod."
 
-#: ../samba_wizard/Samba.pm:66
+#: ../samba_wizard/Samba.pm:70
 msgid "All - no access restriction"
 msgstr "Pob - dim cyfyngiad mynediad"
 
-#: ../samba_wizard/Samba.pm:67
+#: ../samba_wizard/Samba.pm:71
 msgid "My rules - ask me allowed and denied hosts"
 msgstr "Fy rheol - parthau iawn a drwg"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2363,36 +2346,36 @@ msgstr ""
 "Mae Samba'n caniatáu i'ch gweinydd ymddwyn fel gweinydd ffeil ac argraffu ar "
 "gyfer gorsafoedd gwaith sy'n rhedeg systemau heblaw Linux."
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid "Samba configuration wizard"
 msgstr "Dewin Ffurfweddu Samba"
 
-#: ../samba_wizard/Samba.pm:72
+#: ../samba_wizard/Samba.pm:76
 msgid ""
 "This wizard will help you configuring the Samba services of your server."
 msgstr "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau Samba eich gweinydd."
 
-#: ../samba_wizard/Samba.pm:77
+#: ../samba_wizard/Samba.pm:81
 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.pm:77
+#: ../samba_wizard/Samba.pm:81
 msgid "Workgroup"
 msgstr "Grwp Gwaith"
 
-#: ../samba_wizard/Samba.pm:82 ../samba_wizard/Samba.pm:227
+#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
 msgid "Workgroup:"
 msgstr "Grwp Gwaith"
 
-#: ../samba_wizard/Samba.pm:88
+#: ../samba_wizard/Samba.pm:92
 msgid "The Workgroup is wrong"
 msgstr "Mae'r Grwp Gwaith yn anghywir"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid "Server banner."
 msgstr "Baner Gweinydd"
 
-#: ../samba_wizard/Samba.pm:93
+#: ../samba_wizard/Samba.pm:97
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2400,19 +2383,19 @@ msgstr ""
 "Y faner yw'r ffordd bydd y gweinydd hwn yn cael ei ddisgrifio mewn "
 "gorsafoedd gwaith Windows."
 
-#: ../samba_wizard/Samba.pm:99
+#: ../samba_wizard/Samba.pm:103
 msgid "Banner:"
 msgstr "Baner:"
 
-#: ../samba_wizard/Samba.pm:104
+#: ../samba_wizard/Samba.pm:108
 msgid "The server banner is incorrect"
 msgstr "Mae Baner y Gweinydd yn anghywir"
 
-#: ../samba_wizard/Samba.pm:115
+#: ../samba_wizard/Samba.pm:119
 msgid "Access level:"
 msgstr "Lefel mynediad:"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 1: allow all IP in 150.203.*.*; except one\n"
 "hosts allow = 150.203. EXCEPT 150.203.6.66"
@@ -2420,7 +2403,7 @@ msgstr ""
 "* Esiampl 1: caniatáu pob  IPs yn 150.203.*.*; heblaw un\\ngwesteiwr iawn = "
 "150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 2: allow hosts that match the given network/netmask\n"
 "hosts allow = 150.203.15.0/255.255.255.0"
@@ -2428,7 +2411,7 @@ msgstr ""
 "* Esiampl 2: caniatáu gwesteiwyr sy'n cydweddu â'r rhwydwaith/netmask"
 "\\ncaniatáu gwesteiwyr = 150.203.15.0/255.255.255.0"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 3: allow a couple of hosts\n"
 "hosts allow = lapland, arvidsjaur"
@@ -2436,7 +2419,7 @@ msgstr ""
 "*Esiampl 3: caniatáu rhai gwesteiwyr\\ncaniatáu gwesteiwyr = lapland, "
 "arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid ""
 "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
 "from one particular host\n"
@@ -2447,23 +2430,23 @@ msgstr ""
 "gwrthod mynediad o un gwesteiwr penodol \\ncaniatáu gwestiwyr = @foonet"
 "\\ngwrthod gwestiwyr = pirate"
 
-#: ../samba_wizard/Samba.pm:120
+#: ../samba_wizard/Samba.pm:124
 msgid "Note that access still requires suitable user-level passwords."
 msgstr "Mae mynediad yn gofyn cyfrineiriau lefel defnyddiwr addas."
 
-#: ../samba_wizard/Samba.pm:127
+#: ../samba_wizard/Samba.pm:131
 msgid "Allow hosts:"
 msgstr "Caniatáu gwesteiwr:"
 
-#: ../samba_wizard/Samba.pm:128
+#: ../samba_wizard/Samba.pm:132
 msgid "Deny hosts:"
 msgstr "Gwrthod gwesteiwr"
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 msgid "Enabled Samba services"
 msgstr "Gwasanaethau Samba "
 
-#: ../samba_wizard/Samba.pm:133
+#: ../samba_wizard/Samba.pm:137
 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 "
@@ -2473,19 +2456,19 @@ msgstr ""
 "gorsaf waith Windows, a rhannu argraffydd ar gyfer argraffyddion sydd wedi "
 "eu cysylltu i'ch gweinydd."
 
-#: ../samba_wizard/Samba.pm:141
+#: ../samba_wizard/Samba.pm:145
 msgid "Enable file sharing area"
 msgstr "Galluogi gofod rhannu ffeil"
 
-#: ../samba_wizard/Samba.pm:142
+#: ../samba_wizard/Samba.pm:146
 msgid "Enable server Printer Sharing"
 msgstr "Galluogi gofod rhannu ffeil"
 
-#: ../samba_wizard/Samba.pm:143
+#: ../samba_wizard/Samba.pm:147
 msgid "Make home directories available for their owners"
 msgstr "Gwneud cyfeiriaduron cartref ar gael ar gyfer eu perchnogion"
 
-#: ../samba_wizard/Samba.pm:148
+#: ../samba_wizard/Samba.pm:152
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2493,28 +2476,28 @@ msgstr ""
 "Rydych wedi dewis i caniatáu mynediad i ddefnyddwyr i'w cyfeiriaduron "
 "cartref drwy samba ond rhaid defnyddio smbpasswd i osod cyfrinair."
 
-#: ../samba_wizard/Samba.pm:154 ../samba_wizard/Samba.pm:160
-#: ../samba_wizard/Samba.pm:230
+#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
+#: ../samba_wizard/Samba.pm:234
 msgid "Shared directory:"
 msgstr "Cyfeiriadur rhanedig:"
 
-#: ../samba_wizard/Samba.pm:154
+#: ../samba_wizard/Samba.pm:158
 msgid "Type the path of the directory you want being shared."
 msgstr "Teipiwch lwybr y cyfeiriadur i'w rannu"
 
-#: ../samba_wizard/Samba.pm:161
+#: ../samba_wizard/Samba.pm:165
 msgid "Create shared directory if it doesn't exist"
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:166
+#: ../samba_wizard/Samba.pm:170
 msgid "Failed to create directory."
 msgstr ""
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid "File permissions"
 msgstr "Caniatâd ffeil"
 
-#: ../samba_wizard/Samba.pm:176
+#: ../samba_wizard/Samba.pm:180
 msgid ""
 "Type users or groups separated by a comma (groups must be preceded by a '@') "
 "like this:\n"
@@ -2524,61 +2507,61 @@ msgstr ""
 "gyda \\'@) fel hyn: \n"
 "root, fred, @defnyddiwr, @olwyn ar gyfer pob math o ganiatâd."
 
-#: ../samba_wizard/Samba.pm:183
+#: ../samba_wizard/Samba.pm:187
 msgid "Read list:"
 msgstr "rhestr ddarllen:"
 
-#: ../samba_wizard/Samba.pm:183 ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
 msgid "root, fred, @users, @wheel"
 msgstr "gwraidd, fred, @defnyddwyr, @olwyn"
 
-#: ../samba_wizard/Samba.pm:184
+#: ../samba_wizard/Samba.pm:188
 msgid "Write list:"
 msgstr "rhestr ysgrifennu"
 
-#: ../samba_wizard/Samba.pm:194
+#: ../samba_wizard/Samba.pm:198
 msgid "Select which printers you want to be accessible from known users"
 msgstr "Dewis pa argraffydd i fod ar gael ar gyfer defnyddwyr hysbys"
 
-#: ../samba_wizard/Samba.pm:201
+#: ../samba_wizard/Samba.pm:205
 msgid "Enable all printers"
 msgstr "Ateb i Bawb"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "Configuring Samba"
 msgstr "Ffurfweddu Samba"
 
-#: ../samba_wizard/Samba.pm:219
+#: ../samba_wizard/Samba.pm:223
 msgid "The wizard collected the following parameters to configure Samba."
 msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol\n"
 "ffurfweddu Samba."
 
-#: ../samba_wizard/Samba.pm:228
+#: ../samba_wizard/Samba.pm:232
 msgid "Server banner:"
 msgstr "Baner Gweinydd"
 
-#: ../samba_wizard/Samba.pm:229
+#: ../samba_wizard/Samba.pm:233
 msgid "File sharing:"
 msgstr "Rhannu Ffeiliau:"
 
-#: ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:235
 msgid "Print server:"
 msgstr "Gwasanaethwr LDAP"
 
-#: ../samba_wizard/Samba.pm:232
+#: ../samba_wizard/Samba.pm:236
 msgid "Home:"
 msgstr "Cartref:"
 
-#: ../samba_wizard/Samba.pm:233
+#: ../samba_wizard/Samba.pm:237
 msgid "Printers:"
 msgstr "Argraffyddion:"
 
-#: ../samba_wizard/Samba.pm:239
+#: ../samba_wizard/Samba.pm:243
 msgid "The wizard successfully configured your Samba server."
 msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gweinydd Samba."
 
-#: ../samba_wizard/Samba.pm:521
+#: ../samba_wizard/Samba.pm:525
 msgid "Configuring your Samba server..."
 msgstr "Ffurfweddu eich gweinydd Samba..."
 
@@ -2819,6 +2802,30 @@ msgstr "Gweinydd gwe Apache"
 msgid "Configuring your system as Apache server ..."
 msgstr "Ffurfweddu eich system fel gweinydd Apache..."
 
+#~ msgid "You need to readjust your hostname."
+#~ msgstr "Mae angen i chi newid eich enw gwesteiwr"
+
+#, fuzzy
+#~ msgid ""
+#~ "You need to readjust your domainname. For an LDAP server you need a "
+#~ "correct domainname, not equal to localdomain or none. Hostname must be a "
+#~ "FQDN: Fully Qualified Domain Name. 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."
+
+#, fuzzy
+#~ msgid "User Created in: "
+#~ msgstr "Enw Defnyddiwr:"
+
+#~ 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 NIS. Mae angen enw parth cywir ar "
+#~ "gyfer gweinydd NIS, nid cydradd i barth lleol na dim."
+
 #, fuzzy
 #~ msgid "Configure Ldap server"
 #~ msgstr "Ffurfweddu'r Gweinydd DHCP"