Updated POT file.

1 files changed, 1764 insertions, 515 deletions

diff --git a/po/cy.po b/po/cy.po
index b428d985..daf3b323 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Drakwizard-cy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-03 09:17+0100\n"
+"POT-Creation-Date: 2005-06-13 22:56+0800\n"
 "PO-Revision-Date: 2005-01-05 18:57-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -19,33 +19,32 @@ msgstr ""
 msgid "configuration wizard"
 msgstr "dewin ffurfweddu"
 
-#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:106 ../news_wizard/Inn.pm:71
+#: ../Wiztemplate.pm:60 ../ftp_wizard/Proftpd.pm:137 ../news_wizard/Inn.pm:71
 #: ../proxy_wizard/Squid.pm:83 ../proxy_wizard/Squid.pm:90
-#: ../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:196 ../ftp_wizard/Proftpd.pm:121
+#: ../Wiztemplate.pm:64 ../dns_wizard/Bind.pm:196 ../ftp_wizard/Proftpd.pm:142
 #: ../news_wizard/Inn.pm:76 ../news_wizard/Inn.pm:81
-#: ../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
+#: ../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: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:243 ../web_wizard/Apache.pm:146
+#: ../ftp_wizard/Proftpd.pm:169 ../kolab_wizard/Kolab.pm:97
+#: ../ldap_wizard/Ldap.pm:238 ../news_wizard/Inn.pm:95
+#: ../nfs_wizard/NFS.pm:102 ../nisautofs_wizard/Nisautofs.pm:113
+#: ../postfix_wizard/Postfix.pm:264 ../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:345
+#: ../samba_wizard/Sambaprint.pm:134 ../samba_wizard/Sambashare.pm:413
+#: ../samba_wizard/Sambashare.pm:421 ../samba_wizard/Sambashare.pm:426
+#: ../samba_wizard/Sambashare.pm:431 ../sshd_wizard/Sshd.pm:188
+#: ../web_wizard/Apache.pm:146
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
 
@@ -118,6 +117,7 @@ msgstr "Cyfeiriad porth IP"
 
 #: ../client_wizard/Bind_client.pm:73 ../dhcp_wizard/Dhcp.pm:90
 #: ../dhcp_wizard/Dhcp.pm:100 ../dns_wizard/Bind.pm:191
+#: ../nisautofs_wizard/Nisautofs.pm:86
 msgid "Warning"
 msgstr "Rhybudd"
 
@@ -128,15 +128,30 @@ msgstr ""
 "Rydych yn dhcp, efallai na fydd y gweinydd yn gweithio gyda'ch ffurfweddiad."
 
 #: ../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: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
+#: ../dhcp_wizard/Dhcp.pm:95 ../dhcp_wizard/Dhcp.pm:105 ../drakwizard.pl:82
+#: ../drakwizard.pl:108 ../drakwizard.pl:159 ../drakwizard.pl:163
+#: ../ftp_wizard/Proftpd.pm:93 ../ftp_wizard/Proftpd.pm:112
+#: ../ftp_wizard/Proftpd.pm:115 ../ftp_wizard/Proftpd.pm:133
+#: ../kolab_wizard/Kolab.pm:111 ../ldap_wizard/Ldap.pm:110
+#: ../ldap_wizard/Ldap.pm:117 ../ldap_wizard/Ldap.pm:144
+#: ../ldap_wizard/Ldap.pm:148 ../ldap_wizard/Ldap.pm:152
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:172
+#: ../ldap_wizard/Ldap.pm:196 ../ldap_wizard/Ldap.pm:200
+#: ../ldap_wizard/Ldap.pm:205 ../nfs_wizard/NFS.pm:62
+#: ../postfix_wizard/Postfix.pm:160 ../postfix_wizard/Postfix.pm:162
+#: ../postfix_wizard/Postfix.pm:164 ../postfix_wizard/Postfix.pm:181
+#: ../postfix_wizard/Postfix.pm:197 ../postfix_wizard/Postfix.pm:215
+#: ../samba_wizard/Samba.pm:150 ../samba_wizard/Samba.pm:180
+#: ../samba_wizard/Samba.pm:224 ../samba_wizard/Samba.pm:265
+#: ../samba_wizard/Samba.pm:269 ../samba_wizard/Samba.pm:273
+#: ../samba_wizard/Samba.pm:277 ../samba_wizard/Samba.pm:294
+#: ../samba_wizard/Samba.pm:310 ../samba_wizard/Sambashare.pm:153
+#: ../samba_wizard/Sambashare.pm:201 ../samba_wizard/Sambashare.pm:208
+#: ../samba_wizard/Sambashare.pm:247 ../samba_wizard/Sambashare.pm:252
+#: ../samba_wizard/Sambashare.pm:255 ../samba_wizard/Sambashare.pm:258
+#: ../samba_wizard/Sambashare.pm:311 ../samba_wizard/Sambashare.pm:317
+#: ../samba_wizard/Sambashare.pm:513 ../samba_wizard/Sambashare.pm:590
+#: ../sshd_wizard/Sshd.pm:89 ../sshd_wizard/Sshd.pm:146
 msgid "Error"
 msgstr "Gwall"
 
@@ -292,23 +307,21 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer eich "
 "gwasanaeth DHCP:"
 
-#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
-#: ../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:226
-#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
-#: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:149
+#: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
+#: ../ftp_wizard/Proftpd.pm:152 ../ftp_wizard/Proftpd.pm:153
+#: ../ftp_wizard/Proftpd.pm:154 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../web_wizard/Apache.pm:133
+#: ../web_wizard/Apache.pm:134
 msgid "disabled"
 msgstr "anablwyd"
 
-#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:128
-#: ../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:226
-#: ../samba_wizard/Samba.pm:227 ../samba_wizard/Samba.pm:228
-#: ../web_wizard/Apache.pm:133 ../web_wizard/Apache.pm:134
+#: ../dhcp_wizard/Dhcp.pm:112 ../ftp_wizard/Proftpd.pm:149
+#: ../ftp_wizard/Proftpd.pm:150 ../ftp_wizard/Proftpd.pm:151
+#: ../ftp_wizard/Proftpd.pm:152 ../ftp_wizard/Proftpd.pm:153
+#: ../ftp_wizard/Proftpd.pm:154 ../installsrv_wizard/Installsrv.pm:87
+#: ../installsrv_wizard/Installsrv.pm:88 ../web_wizard/Apache.pm:133
+#: ../web_wizard/Apache.pm:134
 msgid "enabled"
 msgstr "galluogwyd"
 
@@ -321,16 +334,18 @@ 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:274
-#: ../ftp_wizard/Proftpd.pm:154 ../nfs_wizard/NFS.pm:107
-#: ../nisautofs_wizard/Nisautofs.pm:152 ../postfix_wizard/Postfix.pm:153
+#: ../ftp_wizard/Proftpd.pm:175 ../nfs_wizard/NFS.pm:107
+#: ../nisautofs_wizard/Nisautofs.pm:120 ../postfix_wizard/Postfix.pm:273
 #: ../proxy_wizard/Squid.pm:179 ../pxe_wizard/Pxe.pm:331
-#: ../samba_wizard/Samba.pm:248 ../web_wizard/Apache.pm:152
+#: ../samba_wizard/Samba.pm:354 ../samba_wizard/Sambaprint.pm:143
+#: ../samba_wizard/Sambashare.pm:436 ../sshd_wizard/Sshd.pm:194
+#: ../web_wizard/Apache.pm:152
 msgid "Failed"
 msgstr "Methwyd"
 
 #: ../dhcp_wizard/Dhcp.pm:131 ../nfs_wizard/NFS.pm:108
-#: ../nisautofs_wizard/Nisautofs.pm:153 ../proxy_wizard/Squid.pm:180
-#: ../samba_wizard/Samba.pm:249 ../web_wizard/Apache.pm:153
+#: ../nisautofs_wizard/Nisautofs.pm:121 ../proxy_wizard/Squid.pm:180
+#: ../web_wizard/Apache.pm:153
 msgid "Relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwyn drakwizard, a cheisio newid rhai paramedrau."
 
@@ -373,11 +388,6 @@ 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: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:120
 msgid "DNS server Interface"
 msgstr "Rhyngwyneb gweinydd DNS"
@@ -605,51 +615,64 @@ msgstr "Gweinydd NFS"
 msgid "Mail server"
 msgstr "Gweinydd e-bost"
 
-#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:79
+#: ../drakwizard.pl:46 ../ftp_wizard/Proftpd.pm:86
 msgid "FTP server"
 msgstr "Gweinydd FTP"
 
-#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:525
+#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:451
+#: ../samba_wizard/Sambaprint.pm:269
 msgid "Samba server"
 msgstr "Gweinydd Samba"
 
 #: ../drakwizard.pl:48
+#, fuzzy
+msgid "Manage Samba share"
+msgstr "Gwasanaethau Samba "
+
+#: ../drakwizard.pl:49
+#, fuzzy
+msgid "Manage Samba print"
+msgstr "Gwasanaethau Samba "
+
+#: ../drakwizard.pl:50
 msgid "Proxy"
 msgstr "Dirprwy"
 
-#: ../drakwizard.pl:49
+#: ../drakwizard.pl:51
+#, fuzzy
+msgid "OpenSSH daemon configuration"
+msgstr "Dangos ffurfweddiad LDAP"
+
+#: ../drakwizard.pl:52
 msgid "Time server"
 msgstr "Gweinyddion amser"
 
-#: ../drakwizard.pl:50
+#: ../drakwizard.pl:53
 msgid "Apache2 web server"
 msgstr "Gweinydd gwe Apache2"
 
-#: ../drakwizard.pl:51
+#: ../drakwizard.pl:54
 msgid "NIS server autofs map"
 msgstr "Map autofs gweinydd NIS"
 
-#: ../drakwizard.pl:52
-msgid "Mandrakelinux Install server"
+#: ../drakwizard.pl:55
+#, fuzzy
+msgid "Linux Install server"
 msgstr "Gweinydd Gosod Mandrakelinux."
 
-#: ../drakwizard.pl:53 ../kolab_wizard/Kolab.pm:128
-msgid "Kolab server"
-msgstr "Gweinydd Kolab"
-
-#: ../drakwizard.pl:54
+#: ../drakwizard.pl:56
 msgid "ldap server"
 msgstr "Gweinydd LDAP"
 
-#: ../drakwizard.pl:68
+#: ../drakwizard.pl:70
 msgid "Drakwizard wizard selection"
 msgstr "Dewis dewin Drakwizard"
 
-#: ../drakwizard.pl:69
+#: ../drakwizard.pl:71
 msgid "Please select a wizard"
 msgstr "Dewiswch ddewin"
 
-#: ../drakwizard.pl:157
+#: ../drakwizard.pl:159
 #, perl-format
 msgid ""
 "%s is not installed\n"
@@ -658,29 +681,29 @@ msgstr ""
 "Nid yw %s wedi ei osod\n"
 "Cliciwch \"Nesaf\"i'w osod neu \"Diddymu\" i adael."
 
-#: ../drakwizard.pl:161 ../kolab_wizard/Kolab.pm:111
+#: ../drakwizard.pl:163 ../kolab_wizard/Kolab.pm:111
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../ftp_wizard/Proftpd.pm:34
+#: ../ftp_wizard/Proftpd.pm:39
 msgid "FTP wizard"
 msgstr "Dewin FTP"
 
-#: ../ftp_wizard/Proftpd.pm:73
+#: ../ftp_wizard/Proftpd.pm:80
 msgid "FTP server configuration wizard"
 msgstr "Dewin Ffurfweddu Gweinydd FTP"
 
-#: ../ftp_wizard/Proftpd.pm:73
+#: ../ftp_wizard/Proftpd.pm:80
 msgid "This wizard will help you configuring an FTP server for your network."
 msgstr ""
 "Bydd y Dewin hwn yn eich cynorthwyo i ffurfweddu'r Gweinydd FTP ar gyfer "
 "eich rhwydwaith."
 
-#: ../ftp_wizard/Proftpd.pm:79
+#: ../ftp_wizard/Proftpd.pm:86
 msgid "Select the kind of FTP service you want to activate:"
 msgstr "Dewiswch y math o wasanaeth FTP rydych am ei gychwyn:"
 
-#: ../ftp_wizard/Proftpd.pm:79
+#: ../ftp_wizard/Proftpd.pm:86
 msgid ""
 "Your server can act as an FTP server toward your internal network (intranet) "
 "and as an FTP server for the Internet."
@@ -688,93 +711,120 @@ 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
+#: ../ftp_wizard/Proftpd.pm:88
 msgid "Enable the FTP server for the intranet"
 msgstr "Galluogi'r Gweinydd FTP ar gyfer y Fewnrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:82
+#: ../ftp_wizard/Proftpd.pm:89
 msgid "Enable the FTP server for the Internet"
 msgstr "Galluogi'r Gweinydd FTP ar gyfer y Rhyngrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:88
+#: ../ftp_wizard/Proftpd.pm:93
+msgid ""
+"Please choose whether to allow a connection to FTP server from internal or "
+"external hosts."
+msgstr ""
+"Dewiswch p'un ai i ganiatáu cysylltiad i weinydd FTP o westai mewnol neu "
+"allanol."
+
+#: ../ftp_wizard/Proftpd.pm:100
 msgid "Admin email: email address of the FTP administrator."
 msgstr "E-bost Gweinyddwr: cyfeiriad e-bost gweinyddwr FTP."
 
-#: ../ftp_wizard/Proftpd.pm:88
+#: ../ftp_wizard/Proftpd.pm:100
+#, fuzzy
+msgid "FTP Proftpd server options, step 1"
+msgstr "Dewisiadau gweinydd Proftpd FTP"
+
+#: ../ftp_wizard/Proftpd.pm:100
+msgid "Permit root login: allow root to log on FTP server."
+msgstr ""
+"Caniatáu mewngofnodi gwraidd: caniatáu gwraidd i fewngofnodi i'r gweinydd "
+"FTP."
+
+#: ../ftp_wizard/Proftpd.pm:106
+#, fuzzy
+msgid "Server name:"
+msgstr "Enw gwestai'r Gweinydd"
+
+#: ../ftp_wizard/Proftpd.pm:107
+msgid "Admin email:"
+msgstr "E-bost gweinyddwr"
+
+#: ../ftp_wizard/Proftpd.pm:108 ../sshd_wizard/Sshd.pm:84
+#: ../sshd_wizard/Sshd.pm:180
+msgid "Permit root login:"
+msgstr "Caniatáu Mewngofnodi gwraidd"
+
+#: ../ftp_wizard/Proftpd.pm:112
+msgid ""
+"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:115
+#, fuzzy
+msgid "Need a server name"
+msgstr "Enw Gweinydd Newyddion:"
+
+#: ../ftp_wizard/Proftpd.pm:120
 msgid "Allow FTP resume: allow resume upload or download on FTP server."
 msgstr ""
 "Caniatáu ailgydio FTP: caniatáu ailgydio llwytho i fyny neu lawr ar weinydd "
 "FTP."
 
-#: ../ftp_wizard/Proftpd.pm:88
+#: ../ftp_wizard/Proftpd.pm:120
 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
+#: ../ftp_wizard/Proftpd.pm:120
 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."
 
-#: ../ftp_wizard/Proftpd.pm:88
-msgid "FTP Proftpd server options"
+#: ../ftp_wizard/Proftpd.pm:120
+#, fuzzy
+msgid "FTP server options, step 2"
 msgstr "Dewisiadau gweinydd Proftpd FTP"
 
-#: ../ftp_wizard/Proftpd.pm:88
-msgid "Permit root login: allow root to log on FTP server."
-msgstr ""
-"Caniatáu mewngofnodi gwraidd: caniatáu gwraidd i fewngofnodi i'r gweinydd "
-"FTP."
-
-#: ../ftp_wizard/Proftpd.pm:96
-msgid "Admin email:"
-msgstr "E-bost gweinyddwr"
-
-#: ../ftp_wizard/Proftpd.pm:97
-msgid "Permit root login:"
-msgstr "Caniatáu Mewngofnodi gwraidd"
+#: ../ftp_wizard/Proftpd.pm:128 ../ftp_wizard/Proftpd.pm:157
+#, fuzzy
+msgid "FTP Port:"
+msgstr "Porth:"
 
-#: ../ftp_wizard/Proftpd.pm:98
+#: ../ftp_wizard/Proftpd.pm:129
 msgid "Chroot home user:"
 msgstr "Defnyddiwr Chroot Home:"
 
-#: ../ftp_wizard/Proftpd.pm:99
+#: ../ftp_wizard/Proftpd.pm:130
 msgid "Allow FTP resume:"
 msgstr "Caniatáu ailgydio FTP"
 
-#: ../ftp_wizard/Proftpd.pm:100
+#: ../ftp_wizard/Proftpd.pm:131
 msgid "Allow FXP:"
 msgstr "Caniatáu FXP"
 
-#: ../ftp_wizard/Proftpd.pm:106
+#: ../ftp_wizard/Proftpd.pm:133
+#, fuzzy
+msgid "FTP Port should be a number."
+msgstr "Gwall i fod yn gyfeiriadur"
+
+#: ../ftp_wizard/Proftpd.pm:137
 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."
 
-#: ../ftp_wizard/Proftpd.pm:111
-msgid ""
-"Please choose whether to allow a connection to FTP server from internal or "
-"external hosts."
-msgstr ""
-"Dewiswch p'un ai i ganiatáu cysylltiad i weinydd FTP o westai mewnol neu "
-"allanol."
-
-#: ../ftp_wizard/Proftpd.pm:115
-msgid ""
-"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
+#: ../ftp_wizard/Proftpd.pm:142
 msgid "Sorry, you must be root to do this..."
 msgstr "Rhaid i chi fod yn wraidd i wneud hyn..."
 
-#: ../ftp_wizard/Proftpd.pm:126
+#: ../ftp_wizard/Proftpd.pm:147
 msgid "Configuring the FTP server"
 msgstr "Ffurfweddu'r Gweinydd FTP"
 
-#: ../ftp_wizard/Proftpd.pm:126
+#: ../ftp_wizard/Proftpd.pm:147
 msgid ""
 "The wizard collected the following parameters needed to configure your FTP "
 "server"
@@ -782,7 +832,7 @@ msgstr ""
 "Mae'r dewin wedi casglu'r paramedrau canlynol ar gyfer ffurfweddu eich "
 "Gweinydd FTP"
 
-#: ../ftp_wizard/Proftpd.pm:126
+#: ../ftp_wizard/Proftpd.pm:147
 msgid ""
 "To accept those values, and configure your server, click the next button or "
 "use the back button to correct them"
@@ -790,52 +840,51 @@ msgstr ""
 "I dderbyn y gwerthoedd hyn, ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
 "Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
-#: ../ftp_wizard/Proftpd.pm:136
+#: ../ftp_wizard/Proftpd.pm:158
 msgid "Intranet FTP server:"
 msgstr "Gweinydd FTP Mewnrwyd"
 
-#: ../ftp_wizard/Proftpd.pm:137
+#: ../ftp_wizard/Proftpd.pm:159
 msgid "Internet FTP server:"
 msgstr "Gwasanaeth FTP y Rhyngrwyd:"
 
-#: ../ftp_wizard/Proftpd.pm:138
-msgid "Admin email"
-msgstr "E-bost gweinyddwr"
-
-#: ../ftp_wizard/Proftpd.pm:139
+#: ../ftp_wizard/Proftpd.pm:160
 msgid "Permit root Login"
 msgstr "Caniatáu Mewngofnodi gwraidd"
 
-#: ../ftp_wizard/Proftpd.pm:140
+#: ../ftp_wizard/Proftpd.pm:161
 msgid "Chroot Home user"
 msgstr "Defnyddiwr Chroot Home:"
 
-#: ../ftp_wizard/Proftpd.pm:141
+#: ../ftp_wizard/Proftpd.pm:162
 msgid "Allow FTP resume"
 msgstr "Caniatáu ailgydio FTP"
 
-#: ../ftp_wizard/Proftpd.pm:142
+#: ../ftp_wizard/Proftpd.pm:163
 msgid "Allow FXP"
 msgstr "Caniatáu FXP"
 
-#: ../ftp_wizard/Proftpd.pm:148
+#: ../ftp_wizard/Proftpd.pm:169
 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:154
-#: ../pxe_wizard/Pxe.pm:332
+#: ../ftp_wizard/Proftpd.pm:176 ../postfix_wizard/Postfix.pm:274
+#: ../pxe_wizard/Pxe.pm:332 ../samba_wizard/Samba.pm:355
+#: ../samba_wizard/Sambaprint.pm:144 ../samba_wizard/Sambashare.pm:437
+#: ../sshd_wizard/Sshd.pm:195
 msgid "Please relaunch drakwizard, and try to change some parameters."
 msgstr "Ailgychwynnwch drakwizard, a cheisio newid rhai paramedrau."
 
 #: ../installsrv_wizard/Installsrv.pm:53
-msgid "Configure a Mandrakelinux install server (via NFS and http)"
+#, fuzzy
+msgid "Configure an install server (via NFS and http)"
 msgstr "Ffurfweddu gweinydd gosod Mandrakelinux (drwy NFS a http)"
 
 #: ../installsrv_wizard/Installsrv.pm:53
+#, fuzzy
 msgid ""
-"Easily configure a Mandrakelinux server installation directory, with NFS and "
-"HTTP access."
+"Easily configure a server installation directory, with NFS and HTTP access."
 msgstr ""
 "Ffurfweddiad hawdd cyfeiriadur gosod gweinydd Mandrake, gyda mynediad i NFS "
 "a HTTP"
@@ -849,9 +898,10 @@ msgid "Install server configuration"
 msgstr "Gosod ffurfweddiad gweinydd"
 
 #: ../installsrv_wizard/Installsrv.pm:58
+#, fuzzy
 msgid ""
-"Path to data: specify your source directory, should be base of a "
-"Mandrakelinux installation."
+"Path to data: specify your source directory, should be base of a Linux "
+"installation."
 msgstr ""
 "Llwybr i ddata: enwch eich cyfeiriadur ffynhonnell, dylai fod yn sail "
 "gosodiad Mandrake."
@@ -865,9 +915,10 @@ msgid "ie use: /var/install/mdk-release"
 msgstr "hy, defnyddio: /var/install/mdk-release"
 
 #: ../installsrv_wizard/Installsrv.pm:77
+#, fuzzy
 msgid ""
-"Error, the source path must be a directory with full Mandrakelinux "
-"installation directory."
+"Error, the source path must be a directory with full Linux installation "
+"directory."
 msgstr ""
 "Gwall, rhaid i'r cyfeiriadur ffynhonnell fod yn gyfeiriadur gyda "
 "chyfeiriadur gosodiad Mandrakelinux llawn."
@@ -889,20 +940,30 @@ msgstr "Galluogi gweinydd gosod NFS"
 msgid "Enable HTTP install server:"
 msgstr "Galluogi gweinydd gosod HTTP"
 
-#: ../installsrv_wizard/Installsrv.pm:100
+#: ../installsrv_wizard/Installsrv.pm:101
 msgid "Configuring your system, please wait..."
 msgstr "Ffurfweddu eich system, arhoswch..."
 
-#: ../installsrv_wizard/Installsrv.pm:104
+#: ../installsrv_wizard/Installsrv.pm:105
+#, fuzzy
 msgid ""
-"Congratulations, Mandrakelinux Install server is now ready. You can now "
-"configure a DHCP server with PXE support, and a PXE server. So it will be "
-"very easy to install Mandrakelinux through a network."
+"Congratulations, Install server is now ready. You can now configure a DHCP "
+"server with PXE support, and a PXE server. So it will be very easy to "
+"install Linux through a network."
 msgstr ""
 "Llongyfarchiadau, mae gweinydd Gosod Mandrakelinux yn awr yn barod. Mae modd "
 "ffurfweddu gweinydd DHCP gyda chynhaliaeth PXE a gweinydd PXE. Felly, bydd "
 "yn hawdd iawn gosod Mandrakelinux drwy rwydwaith."
 
+#: ../installsrv_wizard/Installsrv.pm:150
+#, fuzzy
+msgid "Configuring your system as Linux install server..."
+msgstr "Ffurfweddu eich system fel gweinydd Apache..."
+
+#: ../installsrv_wizard/Installsrv.pm:150
+msgid "Copying data"
+msgstr ""
+
 #: ../kolab_wizard/Kolab.pm:40
 msgid "Kolab configuration wizard"
 msgstr "Dewin Ffurfweddu Kolab"
@@ -941,7 +1002,7 @@ msgstr "Rhowch gyfrinair ar gyfer cyfrif rheolwr gweinydd Kolab"
 msgid "Password mismatch, or null password, please correct."
 msgstr "Cyfrinair gwallus, cywirwch."
 
-#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:165
+#: ../kolab_wizard/Kolab.pm:79 ../ldap_wizard/Ldap.pm:162
 msgid "Password:"
 msgstr "Cyfrinair:"
 
@@ -953,7 +1014,7 @@ msgstr "Cyfrinair eto:"
 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:89
+#: ../kolab_wizard/Kolab.pm:89 ../postfix_wizard/Postfix.pm:154
 msgid "Hostname:"
 msgstr "Enw Gwestai:"
 
@@ -981,23 +1042,27 @@ msgstr "Gosod gweinydd Kolab ar eich system..."
 msgid "Configuring Kolab server on your system..."
 msgstr "Ffurfweddu gweinydd Kolab ar eich system..."
 
-#: ../ldap_wizard/Ldap.pm:31
+#: ../kolab_wizard/Kolab.pm:128
+msgid "Kolab server"
+msgstr "Gweinydd Kolab"
+
+#: ../ldap_wizard/Ldap.pm:32
 msgid "Ldap wizard"
 msgstr "Dewin Ldap"
 
-#: ../ldap_wizard/Ldap.pm:91
+#: ../ldap_wizard/Ldap.pm:88
 msgid "Show Ldap configuration"
 msgstr "Dangos ffurfweddiad LDAP"
 
-#: ../ldap_wizard/Ldap.pm:92
+#: ../ldap_wizard/Ldap.pm:89
 msgid "Add user in Ldap server"
 msgstr "Ychwanegu defnyddiwr mewn gweinydd LDAP"
 
-#: ../ldap_wizard/Ldap.pm:93
+#: ../ldap_wizard/Ldap.pm:90
 msgid "Delete Ldap configuration"
 msgstr "Dileu ffurfweddiad LDAP"
 
-#: ../ldap_wizard/Ldap.pm:98
+#: ../ldap_wizard/Ldap.pm:95
 msgid ""
 "It is a lightweight protocol for accessing directory services, specifically "
 "X.500-based directory services."
@@ -1005,80 +1070,80 @@ msgstr ""
 "Mae'n brotocol ysgafn i gael mynediad i wasanaethau cyfeiriaduron, yn bennaf "
 "gwasanaethau cyfeiriadur X.500."
 
-#: ../ldap_wizard/Ldap.pm:98
+#: ../ldap_wizard/Ldap.pm:95
 msgid "LDAP stands for Lightweight Directory Access Protocol."
 msgstr "Ystyr LDAP yw Lightweight Directory Access Protocol."
 
-#: ../ldap_wizard/Ldap.pm:98 ../ldap_wizard/Ldap.pm:106
+#: ../ldap_wizard/Ldap.pm:95 ../ldap_wizard/Ldap.pm:103
 msgid "Ldap configuration wizard"
 msgstr "Dewin ffurfweddu LDAP"
 
-#: ../ldap_wizard/Ldap.pm:113 ../ldap_wizard/Ldap.pm:120
+#: ../ldap_wizard/Ldap.pm:110 ../ldap_wizard/Ldap.pm:117
 msgid "You must setup an Ldap server first."
 msgstr "Rhaid gosod gweinydd LDAP yn gyntaf"
 
-#: ../ldap_wizard/Ldap.pm:126
+#: ../ldap_wizard/Ldap.pm:123
 msgid "Your choice:"
 msgstr "Eich dewis:"
 
-#: ../ldap_wizard/Ldap.pm:131
+#: ../ldap_wizard/Ldap.pm:128
 msgid "Delete configuration"
 msgstr "Dileu ffurfweddiad"
 
-#: ../ldap_wizard/Ldap.pm:131
+#: ../ldap_wizard/Ldap.pm:128
 msgid "Saving existing base in /root/ldap-sav.ldiff"
 msgstr "Cadw'r sail bresennol yn /root/ldap-sav.ldiff"
 
-#: ../ldap_wizard/Ldap.pm:136
+#: ../ldap_wizard/Ldap.pm:133
 msgid "LDAP Adding User"
 msgstr "Ychwanegu defnyddiwr LDAP"
 
-#: ../ldap_wizard/Ldap.pm:139
+#: ../ldap_wizard/Ldap.pm:136
 #, perl-format
 msgid "User Created in: %s, %s"
 msgstr "Creu defnyddiwr yn: %s, %s"
 
-#: ../ldap_wizard/Ldap.pm:141
+#: ../ldap_wizard/Ldap.pm:138
 msgid "First Name:"
 msgstr "Enw Cyntaf:"
 
-#: ../ldap_wizard/Ldap.pm:142 ../ldap_wizard/Ldap.pm:213
+#: ../ldap_wizard/Ldap.pm:139 ../ldap_wizard/Ldap.pm:218
 msgid "Name:"
 msgstr "Enw:"
 
-#: ../ldap_wizard/Ldap.pm:143
+#: ../ldap_wizard/Ldap.pm:140
 msgid "User Login:"
 msgstr "Mewngofnod defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:147
+#: ../ldap_wizard/Ldap.pm:144
 msgid "You must enter a valid First Name."
 msgstr "Rhaid rhoi Enw Cyntaf dilys"
 
-#: ../ldap_wizard/Ldap.pm:151
+#: ../ldap_wizard/Ldap.pm:148
 msgid "You must enter a valid Name."
 msgstr "Rhaid rhoi Enw dilys"
 
-#: ../ldap_wizard/Ldap.pm:155
+#: ../ldap_wizard/Ldap.pm:152
 msgid "You must enter a valid User Name."
 msgstr "Rhaid rhoi Enw Defnyddiwr dilys."
 
-#: ../ldap_wizard/Ldap.pm:162
+#: ../ldap_wizard/Ldap.pm:159
 msgid "LDAP User Password"
 msgstr "Cyfrinair defnyddwyr LDAP"
 
-#: ../ldap_wizard/Ldap.pm:165 ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:162 ../ldap_wizard/Ldap.pm:163
 msgid "passwords must match"
 msgstr "rhaid i'r cyfrineiriau gydweddu"
 
-#: ../ldap_wizard/Ldap.pm:166
+#: ../ldap_wizard/Ldap.pm:163
 msgid "Password (again):"
 msgstr "Cyfrinair (eto):"
 
-#: ../ldap_wizard/Ldap.pm:170 ../ldap_wizard/Ldap.pm:198
+#: ../ldap_wizard/Ldap.pm:167 ../ldap_wizard/Ldap.pm:200
 msgid "You must enter a password for LDAP."
 msgstr "Rhaid rhoi cyfrinair ar gyfer LDAP."
 
-#: ../ldap_wizard/Ldap.pm:174 ../ldap_wizard/Ldap.pm:202
+#: ../ldap_wizard/Ldap.pm:172 ../ldap_wizard/Ldap.pm:205
 msgid "The passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
@@ -1114,13 +1179,13 @@ msgid "The DNS naming is used for LDAP directory tree definition"
 msgstr ""
 "Mae enwi DNS yn cael ei ddefnyddio ar gyfer diffinio coeden cyfeiriadur LDAP"
 
-#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:225
-#: ../ldap_wizard/Ldap.pm:267
+#: ../ldap_wizard/Ldap.pm:184 ../ldap_wizard/Ldap.pm:230
+#: ../ldap_wizard/Ldap.pm:272
 msgid "LDAP directory tree:"
 msgstr "Coeden cyfeiriadur LDAP:"
 
-#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:226
-#: ../ldap_wizard/Ldap.pm:268
+#: ../ldap_wizard/Ldap.pm:185 ../ldap_wizard/Ldap.pm:231
+#: ../ldap_wizard/Ldap.pm:273
 msgid "LDAP Administrator:"
 msgstr "Gweinyddwr LDAP:"
 
@@ -1132,60 +1197,60 @@ msgstr "Cyfrinair LDAP:"
 msgid "LDAP Password (again):"
 msgstr "Cyfrinair LDAP (eto)"
 
-#: ../ldap_wizard/Ldap.pm:194
+#: ../ldap_wizard/Ldap.pm:196
 msgid "You must enter a valid LDAP directory tree."
 msgstr "Rhaid rhoi coeden cyfeiriadur LDAP dilys."
 
-#: ../ldap_wizard/Ldap.pm:210
+#: ../ldap_wizard/Ldap.pm:215
 msgid "Confirmation of the user to create"
 msgstr "Cadarnhad y defnyddiwr i greu"
 
-#: ../ldap_wizard/Ldap.pm:214
+#: ../ldap_wizard/Ldap.pm:219
 msgid "First name:"
 msgstr "Enw cyntaf:"
 
-#: ../ldap_wizard/Ldap.pm:215
+#: ../ldap_wizard/Ldap.pm:220
 msgid "User Name:"
 msgstr "Enw Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:216
+#: ../ldap_wizard/Ldap.pm:221
 msgid "Create in:"
 msgstr "Creu yn:"
 
-#: ../ldap_wizard/Ldap.pm:222
+#: ../ldap_wizard/Ldap.pm:227
 msgid "Confirmation Information for create an LDAP server"
 msgstr "Gwybodaeth Cadarnhau i greu gweinydd LDAP"
 
-#: ../ldap_wizard/Ldap.pm:227 ../ldap_wizard/Ldap.pm:269
+#: ../ldap_wizard/Ldap.pm:232 ../ldap_wizard/Ldap.pm:274
 msgid "Users Container:"
 msgstr "Cynhwysydd Defnyddiwr:"
 
-#: ../ldap_wizard/Ldap.pm:238
+#: ../ldap_wizard/Ldap.pm:243
 msgid "The wizard successfully configured the LDAP."
 msgstr "Mae'r dewin wedi ffurfweddu'r LDAP yn llwyddiannus."
 
-#: ../ldap_wizard/Ldap.pm:244
+#: ../ldap_wizard/Ldap.pm:249
 msgid "Successfully added User"
 msgstr "Ychwanegu Defnyddiwr yn llwyddiannus"
 
-#: ../ldap_wizard/Ldap.pm:253
+#: ../ldap_wizard/Ldap.pm:258
 msgid "Error when adding user in Ldap database"
 msgstr "Gwall wrth ychwanegu defnyddiwr i gronfa ddata LDAP"
 
-#: ../ldap_wizard/Ldap.pm:262
+#: ../ldap_wizard/Ldap.pm:267
 msgid "Server already configured"
 msgstr "Gweinydd wedi ei ffurfweddu"
 
-#: ../ldap_wizard/Ldap.pm:262
+#: ../ldap_wizard/Ldap.pm:267
 msgid "You have already configured your Ldap Server"
 msgstr "Rydych eisoes wedi ffurfweddu eich gweinydd LDAP."
 
-#: ../ldap_wizard/Ldap.pm:421
+#: ../ldap_wizard/Ldap.pm:426
 #, perl-format
 msgid "%s Failed"
 msgstr "Methodd %s"
 
-#: ../ldap_wizard/Ldap.pm:421
+#: ../ldap_wizard/Ldap.pm:426
 msgid "Error!"
 msgstr "Gwall!"
 
@@ -1274,7 +1339,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:86 ../postfix_wizard/Postfix.pm:133
+#: ../news_wizard/Inn.pm:86 ../postfix_wizard/Postfix.pm:245
 msgid ""
 "To accept these values, and configure your server, click the next button or "
 "use the back button to correct them."
@@ -1301,6 +1366,7 @@ msgid "NFS Wizard"
 msgstr "Dewin NFS"
 
 #: ../nfs_wizard/NFS.pm:45 ../proxy_wizard/Squid.pm:39
+#: ../samba_wizard/Sambashare.pm:65
 msgid "All - No access restriction"
 msgstr "Pob - Dim cyfyngiad mynediad"
 
@@ -1332,13 +1398,11 @@ msgstr ""
 msgid "Directory:"
 msgstr "Cyfeiriadur:"
 
-#: ../nfs_wizard/NFS.pm:62 ../samba_wizard/Samba.pm:175
-#: ../web_wizard/Apache.pm:119
+#: ../nfs_wizard/NFS.pm:62 ../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:113
-#: ../samba_wizard/Samba.pm:124
+#: ../nfs_wizard/NFS.pm:69
 msgid "Access control"
 msgstr "Rheoli mynediad"
 
@@ -1393,20 +1457,15 @@ 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:68 ../nisautofs_wizard/Nisautofs.pm:74
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:70 ../nisautofs_wizard/Nisautofs.pm:75
 msgid "NIS server with autofs map"
 msgstr "Gweinydd NIS gyda autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:69 ../nisautofs_wizard/Nisautofs.pm:336
-msgid "NIS client"
-msgstr "Cleient NIS"
-
-#: ../nisautofs_wizard/Nisautofs.pm:74
+#: ../nisautofs_wizard/Nisautofs.pm:70
 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:74
+#: ../nisautofs_wizard/Nisautofs.pm:70
 msgid ""
 "Users automatically mount their home directory from server, when they log on "
 "a NIS client computer network."
@@ -1414,28 +1473,7 @@ msgstr ""
 "Mae'r defnyddiwr yn gosod eu cyfeiriadur cartref o'r gweinydd, wrth "
 "fewngofnodi i rwydwaith cyfrifiadurol cleient NIS"
 
-#: ../nisautofs_wizard/Nisautofs.pm:82
-msgid "What do you want to do?"
-msgstr "Beth hoffech ei wneud:"
-
-#: ../nisautofs_wizard/Nisautofs.pm:87
-msgid "Configure computer to be a NIS client"
-msgstr "Ffurfweddu eich cyfrifiadur i fod yn gleient NIS..."
-
-#: ../nisautofs_wizard/Nisautofs.pm:87
-msgid "You just have to put nisdomain and nisserver."
-msgstr "Rhaid gosod nisdomain a nisserver"
-
-#: ../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:90
-msgid "NIS domain:"
-msgstr "Parth NIS::"
-
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:75
 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 "
@@ -1446,7 +1484,7 @@ msgstr ""
 "galluoedd ar gyfer defnyddwyr NIS i awto osod eu cyfeiriaduron cartref ar "
 "gyfrifiadur cleient NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:75
 msgid ""
 "Home NIS: home base directory for users on NIS server. This directory will "
 "be exported through NFS server."
@@ -1454,67 +1492,54 @@ msgstr ""
 "Cartref NIS: cyfeiriadur cartref defnyddwyr gweinydd NIS. Bydd y cyfeiriadur "
 "yn allforio drwy weinydd NIS."
 
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:75
 msgid "NIS domain: NIS domain to use (generally same as your DNS domain name)."
 msgstr ""
 "Parth NIS: parth NIS i'w ddefnyddio (yn gyffredinol yr un un â'ch enwparth "
 "DNS)."
 
-#: ../nisautofs_wizard/Nisautofs.pm:95
+#: ../nisautofs_wizard/Nisautofs.pm:75
 msgid "NIS server: name of your computer."
 msgstr "Gweinydd NIS: enw'r cyfrifiadur"
 
-#: ../nisautofs_wizard/Nisautofs.pm:98 ../nisautofs_wizard/Nisautofs.pm:108
+#: ../nisautofs_wizard/Nisautofs.pm:77 ../nisautofs_wizard/Nisautofs.pm:95
+msgid "NIS server:"
+msgstr "Gweinydd NIS"
+
+#: ../nisautofs_wizard/Nisautofs.pm:78 ../nisautofs_wizard/Nisautofs.pm:96
 msgid "Home NIS:"
 msgstr "NIS Cartref:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:99 ../nisautofs_wizard/Nisautofs.pm:109
-#: ../nisautofs_wizard/Nisautofs.pm:123
+#: ../nisautofs_wizard/Nisautofs.pm:79 ../nisautofs_wizard/Nisautofs.pm:97
 msgid "NIS domainname:"
 msgstr "Enw parth NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:105
+#: ../nisautofs_wizard/Nisautofs.pm:80
+#, fuzzy
+msgid "Create home NIS directory if it doesn't exist"
+msgstr "Creu cyfeiriadur rhannu os nad yw'n bod"
+
+#: ../nisautofs_wizard/Nisautofs.pm:86
+msgid "Directory doesn't exist. Please create it manually."
+msgstr ""
+
+#: ../nisautofs_wizard/Nisautofs.pm:93
 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:110
+#: ../nisautofs_wizard/Nisautofs.pm:98
 msgid "NIS directory:"
 msgstr "Cyfeiriadur NIS:"
 
-#: ../nisautofs_wizard/Nisautofs.pm:120
-msgid "NIS domainname: name of NIS domain."
-msgstr "Enw parth NIS: enw parth NIS "
-
-#: ../nisautofs_wizard/Nisautofs.pm:120
-msgid "NIS server: hostname of the NIS server."
-msgstr "Gweinydd NIS: enw parth gweinydd NIS."
-
-#: ../nisautofs_wizard/Nisautofs.pm:120
-msgid ""
-"The YPBIND daemon finds the server for NIS domains and maintains the NIS "
-"binding information."
-msgstr ""
-"Mae'r daemon YPBIND yn canfod gweinydd ar gyfer parthau NIS ac yn cynnal "
-"gwybodaeth rwymo NIS."
-
-#: ../nisautofs_wizard/Nisautofs.pm:129
-msgid "Error: should be a directory."
-msgstr "Gwall i fod yn gyfeiriadur"
-
-#: ../nisautofs_wizard/Nisautofs.pm:133
+#: ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Error: nisdomainname should not be 'none' or 'localdomain'."
 msgstr "Gwall dylai nisdomainname fod yn 'dim' neu 'parth lleol'."
 
-#: ../nisautofs_wizard/Nisautofs.pm:133
+#: ../nisautofs_wizard/Nisautofs.pm:108
 msgid "Please adjust it."
 msgstr "Newidiwch hwn."
 
-#: ../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:146
+#: ../nisautofs_wizard/Nisautofs.pm:114
 msgid ""
 "The wizard successfully configured your machine to be a NIS server with "
 "autofs map."
@@ -1522,23 +1547,19 @@ msgstr ""
 "Mae'r dewin wedi ffurfweddu eich peiriant yn llwyddiannus i fod yn weinydd "
 "NIS gyda autofs map."
 
-#: ../nisautofs_wizard/Nisautofs.pm:307
+#: ../nisautofs_wizard/Nisautofs.pm:276
 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:307
+#: ../nisautofs_wizard/Nisautofs.pm:276
 msgid "NIS with Autofs map"
 msgstr "NIS gydag autofs map"
 
-#: ../nisautofs_wizard/Nisautofs.pm:336
-msgid "Configuring your system as NIS client ..."
-msgstr "Ffurfweddu eich system fel Cleient NIS..."
-
-#: ../postfix_wizard/Postfix.pm:39
+#: ../postfix_wizard/Postfix.pm:50
 msgid "Postfix wizard"
 msgstr "Dewin Postfix"
 
-#: ../postfix_wizard/Postfix.pm:49
+#: ../postfix_wizard/Postfix.pm:89
 msgid ""
 "Error, can't find your hostname in /etc/hosts. Exiting. Please launch "
 "drakconnect and choose static IP address."
@@ -1546,170 +1567,312 @@ msgstr ""
 "Gwall, methu canfod eich enw gwestai yn /etc/hosts. Gadael. Cychwynnwch "
 "drakconnect a dewis cyfeiriad IP sefydlog."
 
-#: ../postfix_wizard/Postfix.pm:59
-msgid "External mail server"
+#: ../postfix_wizard/Postfix.pm:99
+#, fuzzy
+msgid "Main mail server"
+msgstr "Gweinydd e-bost"
+
+#: ../postfix_wizard/Postfix.pm:100
+#, fuzzy
+msgid "Relay mail server"
 msgstr "Gweinydd e-bost allanol"
 
-#: ../postfix_wizard/Postfix.pm:60
-msgid "Internal mail server"
-msgstr "Gweinydd e-bost mewnol"
+#: ../postfix_wizard/Postfix.pm:104 ../samba_wizard/Sambashare.pm:70
+#: ../sshd_wizard/Sshd.pm:64
+msgid "Newbie - classical options"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:105 ../samba_wizard/Sambashare.pm:71
+msgid "Expert - advanced options"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:66
+#: ../postfix_wizard/Postfix.pm:112
 msgid "Internet mail configuration wizard"
 msgstr "Dewin ffurfweddu e-bost rhyngrwyd"
 
-#: ../postfix_wizard/Postfix.pm:66
+#: ../postfix_wizard/Postfix.pm:112
+#, fuzzy
 msgid ""
-"This wizard will help you configure an internal mail server for your "
-"network, or configure an external mail server."
+"This wizard will help you configure a Postifx mail server or a Postfix mail "
+"relay."
 msgstr ""
-"Bydd y dewin yn eich cynorthwyo i ffurfweddu gweinydd e-bost mewnol ar gyfer "
-"eich rhwydwaith, neu ffurfweddu gweinydd e-bost allanol"
+"Bydd y Dewin hwn yn eich cynorthwyo i ffurfweddu'r Gweinydd FTP ar gyfer "
+"eich rhwydwaith."
 
-#: ../postfix_wizard/Postfix.pm:82
+#: ../postfix_wizard/Postfix.pm:117 ../samba_wizard/Samba.pm:98
+#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:91
+#: ../samba_wizard/Sambashare.pm:140
+msgid "Information"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:117
 msgid ""
-"Address masquerading is a method to hide all hosts inside a domain behind "
-"their mail gateway, and to make it appear as if the mail comes from the "
-"gateway itself, instead of from individual machines."
+"It seems you previously setup a Postfix configuration. This wizard will re-"
+"read your old configuration, and show you the Postfix server type you choose"
 msgstr ""
-"Mae masquerade yn fod i guddio pob gwestai o fewn parth to ôl eu porth e-"
-"bost, ac i'w gwneud hi i ymddangos fod yr e-bost yn dod o'r porth ei hun, yn "
-"lle o beiriannau unigol."
 
-#: ../postfix_wizard/Postfix.pm:82
-msgid "Outgoing mail address"
-msgstr "Cyfeiriad e-bost allfynd"
+#: ../postfix_wizard/Postfix.pm:125 ../pxe_wizard/Pxe.pm:126
+msgid "What do you want to do:"
+msgstr "Beth hoffech ei wneud:"
 
-#: ../postfix_wizard/Postfix.pm:82
+#: ../postfix_wizard/Postfix.pm:130
+msgid "Now i need to know your undestanding in Postfix server configuration"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:132 ../samba_wizard/Sambashare.pm:116
+msgid "What kind of user are you:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:138
+#, fuzzy
+msgid "Global postfix configuration"
+msgstr "Dileu ffurfweddiad"
+
+#: ../postfix_wizard/Postfix.pm:153
+#, fuzzy
+msgid "Smtpd banner:"
+msgstr "Baner Gweinydd"
+
+#: ../postfix_wizard/Postfix.pm:154
 msgid ""
-"This should be chosen consistently with the address you use for incoming "
-"mail."
+"The myhostname parameter specifies the internet hostname of this  mail "
+"system. ie: myhostname = myhostname"
 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:82
+#: ../postfix_wizard/Postfix.pm:155
+#, fuzzy
+msgid "Domain:"
+msgstr "Enw Parth:"
+
+#: ../postfix_wizard/Postfix.pm:155
+#, fuzzy
+msgid ""
+"The mydomain parameter specifies the local internet domain name. ie: "
+"mydomain = mydomain"
+msgstr ""
+"Mae paramedr myorigin yn enwi'r parth mae post lleol yn ymddangos yn dod "
+"ohono."
+
+#: ../postfix_wizard/Postfix.pm:156
+#, fuzzy
+msgid "Origin:"
+msgstr "myorigin:"
+
+#: ../postfix_wizard/Postfix.pm:156
+#, fuzzy
 msgid ""
-"You can select the kind of address that outgoing mail will show in the "
-"\"From:\" and \"Reply-to\" field."
+"The myorigin parameter specifies the domain that locally-posted mail appears "
+"to come from. ie: myorigin = $myhostname"
+msgstr ""
+"Mae paramedr myorigin yn enwi'r parth mae post lleol yn ymddangos yn dod "
+"ohono."
+
+#: ../postfix_wizard/Postfix.pm:160
+#, fuzzy
+msgid "Please provide an Smtpd banner."
+msgstr "Rhowch un gwahanol"
+
+#: ../postfix_wizard/Postfix.pm:162
+msgid "You must provide an internet hostname of this mail system."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:164
+msgid "You must specifies the local internet domain name."
 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:88
+#: ../postfix_wizard/Postfix.pm:168
+#, fuzzy
+msgid "Main Postfix server"
+msgstr "Gweinydd Postfix"
+
+#: ../postfix_wizard/Postfix.pm:168
+msgid ""
+"Verify command: this stops some techniques used to harvest email addresses."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:168
+msgid ""
+"helo_required: require that a remote SMTP client introduces itself at the "
+"beginning of an SMTP session with the HELO or EHLO command."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:175
+msgid "helo required:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:176
+msgid "Disable verify command:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:177
+#, fuzzy
+msgid "Masquerade domains"
+msgstr "Enw parth ffug:"
+
+#: ../postfix_wizard/Postfix.pm:177
+#, fuzzy
+msgid ""
+"This should be chosen consistently with the address you use for incoming "
+"mail. Address masquerading is a method to hide all hosts inside a domain "
+"behind their mail gateway, and to make it appear as if the mail comes from "
+"the gateway itself, instead of from individual machines."
+msgstr ""
+"Mae masquerade yn fod i guddio pob gwestai o fewn parth to ôl eu porth e-"
+"bost, ac i'w gwneud hi i ymddangos fod yr e-bost yn dod o'r porth ei hun, yn "
+"lle o beiriannau unigol."
+
+#: ../postfix_wizard/Postfix.pm:181
 msgid "Masquerade should be a valid domain name such as \"mydomain.com\"!"
 msgstr "Dylai'r ffugiad fod yn enw parth dilys megis \"fymharth.com\"!"
 
-#: ../postfix_wizard/Postfix.pm:93
-msgid "Masquerade domain name:"
-msgstr "Enw parth ffug:"
+#: ../postfix_wizard/Postfix.pm:188
+msgid ""
+"Relay domains: what destination domains (and subdomains thereof) this system "
+"will relay mail to."
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:98
-msgid "Warning:"
-msgstr "Rhybudd"
+#: ../postfix_wizard/Postfix.pm:188
+#, fuzzy
+msgid "Relay server"
+msgstr "Gweinydd LDAP"
 
-#: ../postfix_wizard/Postfix.pm:98
-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:194 ../postfix_wizard/Postfix.pm:247
+#, fuzzy
+msgid "Relay host:"
+msgstr "Gwrthod gwesteiwr"
+
+#: ../postfix_wizard/Postfix.pm:195 ../postfix_wizard/Postfix.pm:248
+#, fuzzy
+msgid "Relay domains:"
+msgstr "Parth E-bost:"
 
-#: ../postfix_wizard/Postfix.pm:98
+#: ../postfix_wizard/Postfix.pm:195
 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."
+"What destination domains (and subdomains thereof) this system will relay "
+"mail to. ie: mydomain.com"
 msgstr ""
-"Mae modd derbyn eich dewis, ond ni fydd yn caniatáu i chi anfon e-bost y tu "
-"allan i'ch rhwydwaith lleol. Cliciwch nesaf i barhau, neu nôl i gynnig "
-"gwerth."
 
-#: ../postfix_wizard/Postfix.pm:102
+#: ../postfix_wizard/Postfix.pm:197
+msgid "Need a relayhost."
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:201
+msgid "Network config"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:211
 msgid ""
-"Error, sendmail is installed. Please remove it before installing or "
-"configuring Postfix"
+"The network interface addresses that this mail system receives mail on. By "
+"default, the software claims all active interfaces on the machine. ie: all"
 msgstr ""
-"Gwall, mae sendmail wedi ei osod, dadosodwch sendmail a ffurfweddu Postfix"
 
-#: ../postfix_wizard/Postfix.pm:108
+#: ../postfix_wizard/Postfix.pm:211 ../postfix_wizard/Postfix.pm:256
+#, fuzzy
+msgid "inet interfaces:"
+msgstr "Rhyngwyneb:"
+
+#: ../postfix_wizard/Postfix.pm:212
 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\"."
+"The list of domains that are delivered via the $local_transport mail "
+"delivery transport. ie: $myhostname, localhost.$mydomain, /etc/postfix/"
+"destinations"
 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\"."
 
-#: ../postfix_wizard/Postfix.pm:108
-msgid "Internet mail gateway"
-msgstr "Porth e-bost rhyngrwyd"
+#: ../postfix_wizard/Postfix.pm:212 ../postfix_wizard/Postfix.pm:257
+msgid "my destination:"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:108
+#: ../postfix_wizard/Postfix.pm:213
+msgid "The list of trusted SMTP clients. ie: 127.0.0.0/32, 192.168.1.0/24"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:213 ../postfix_wizard/Postfix.pm:258
+msgid "my networks:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:215
 msgid ""
-"Your server will send the outgoing through a mail gateway, that will take "
-"care of the final delivery."
+"This is the list of trusted SMTP clients. For securty reason, please provide "
+"one. ie: 127.0.0.0/32, 192.168.1.0/24"
 msgstr ""
-"Bydd eich gweinydd yn anfon yr e-bost allfynd drwy borth e-bost, gan ofalu "
-"am y trosglwyddiad terfynol."
 
-#: ../postfix_wizard/Postfix.pm:114
-msgid "Mail server name:"
-msgstr "Enw gweinydd allanol::"
+#: ../postfix_wizard/Postfix.pm:225
+msgid "Message options"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:119
-msgid "The default is to append myhostname which is fine for small sites."
+#: ../postfix_wizard/Postfix.pm:225
+msgid "Various options to configure your message queue, delay, size..."
 msgstr ""
-"Y rhagosodiad yw ategu myhostname sy'n iawn ar gyfer safleoedd bychain."
 
-#: ../postfix_wizard/Postfix.pm:119
+#: ../postfix_wizard/Postfix.pm:232
 msgid ""
-"The myorigin parameter specifies the domain that locally-posted mail appears "
-"to come from."
+"Determines how long a message should stay in the queue before it is deemed "
+"undeliverable. The default is five days (5d)"
 msgstr ""
-"Mae paramedr myorigin yn enwi'r parth mae post lleol yn ymddangos yn dod "
-"ohono."
 
-#: ../postfix_wizard/Postfix.pm:124 ../postfix_wizard/Postfix.pm:137
-msgid "myorigin:"
-msgstr "myorigin:"
+#: ../postfix_wizard/Postfix.pm:232
+msgid "Maximal queue life:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:233
+msgid "Maximum size of a message in Kb"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:133
-msgid "Configuring the external mail server"
-msgstr "Ffurfweddu ar gyfer gweinydd e-bost allanol"
+#: ../postfix_wizard/Postfix.pm:233
+msgid "Message size limit:"
+msgstr ""
+
+#: ../postfix_wizard/Postfix.pm:234
+msgid "Delay warning time:"
+msgstr ""
 
-#: ../postfix_wizard/Postfix.pm:133
+#: ../postfix_wizard/Postfix.pm:234
 msgid ""
-"The wizard collected the following parameters needed to configure your "
-"external mail server:"
+"The delay_warning_time specifies after how many hours a warning is sent that "
+"mail has not yet been delivered."
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
-"ffurfweddu eich gwasanaeth e-bost allanol:"
 
-#: ../postfix_wizard/Postfix.pm:135
-msgid "Internet mail gateway:"
-msgstr "Porth e-bost rhyngrwyd:"
+#: ../postfix_wizard/Postfix.pm:239
+msgid ""
+"Error, sendmail is installed. Please remove it before installing or "
+"configuring Postfix"
+msgstr ""
+"Gwall, mae sendmail wedi ei osod, dadosodwch sendmail a ffurfweddu Postfix"
 
-#: ../postfix_wizard/Postfix.pm:136
-msgid "Form of the address:"
-msgstr "Ffurf y cyfeiriad:"
+#: ../postfix_wizard/Postfix.pm:245
+#, fuzzy
+msgid "Configuring your relay mail server"
+msgstr "Ffurfweddu eich gweinydd Samba..."
+
+#: ../postfix_wizard/Postfix.pm:245
+#, fuzzy
+msgid ""
+"The wizard collected the following parameters needed to configure your relay "
+"mail server:"
+msgstr ""
+"Mae'r dewin wedi casglu'r paramedrau canlynol sydd eu hangen ar gyfer "
+"ffurfweddu eich gwasanaeth e-bost allanol:"
 
-#: ../postfix_wizard/Postfix.pm:143
-msgid "The wizard will now configure an internal mail server."
+#: ../postfix_wizard/Postfix.pm:254
+#, fuzzy
+msgid "The wizard will now configure your Postfix mail server."
 msgstr "Bydd y dewin yn ffurfweddu eich gwasanaeth e-bost allanol"
 
-#: ../postfix_wizard/Postfix.pm:148
-msgid "The wizard successfully configured your external mail server."
-msgstr ""
-"Mae'r dewin wedi ffurfweddu eich gweinydd e-bost allanol yn llwyddiannus."
+#: ../postfix_wizard/Postfix.pm:264
+#, fuzzy
+msgid "The wizard successfully configured your Postfix Mail server."
+msgstr "Mae'r dewin wedi ffurfweddu eich gweinydd PXE yn llwyddiannus."
 
-#: ../postfix_wizard/Postfix.pm:170 ../postfix_wizard/Postfix.pm:230
-#: ../postfix_wizard/Postfix.pm:265
+#: ../postfix_wizard/Postfix.pm:290 ../postfix_wizard/Postfix.pm:362
+#: ../postfix_wizard/Postfix.pm:382
 msgid "Postfix Server"
 msgstr "Gweinydd Postfix"
 
-#: ../postfix_wizard/Postfix.pm:170
+#: ../postfix_wizard/Postfix.pm:290
 msgid "removing Sendmail to avoid conflict...."
 msgstr "tynnu sendmail i osgoi gwrthdaro..."
 
-#: ../postfix_wizard/Postfix.pm:230 ../postfix_wizard/Postfix.pm:265
+#: ../postfix_wizard/Postfix.pm:362 ../postfix_wizard/Postfix.pm:382
 msgid "Configuring your Postfix server....."
 msgstr "Ffurfweddu eich gweinydd Postfix"
 
@@ -1895,7 +2058,7 @@ msgstr ""
 "ffurfweddu eich dirprwy:"
 
 #: ../proxy_wizard/Squid.pm:150 ../proxy_wizard/Squid.pm:163
-#: ../samba_wizard/Samba.pm:223 ../web_wizard/Apache.pm:131
+#: ../samba_wizard/Samba.pm:331 ../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."
@@ -2286,24 +2449,41 @@ msgstr "Ffurfweddu gweinydd PXE ar eich system..."
 msgid "PXE server"
 msgstr "Gweinydd PXE"
 
-#: ../samba_wizard/Samba.pm:38
-msgid "Samba wizard"
-msgstr "Dewin Samba"
+#: ../samba_wizard/Samba.pm:83
+msgid "BDC - backup domain controller"
+msgstr ""
 
-#: ../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:84
+msgid "PDC - primary domain controller"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:70
-msgid "All - no access restriction"
-msgstr "Pob - dim cyfyngiad mynediad"
+#: ../samba_wizard/Samba.pm:85
+#, fuzzy
+msgid "Standalone - standalone server"
+msgstr "Gweinydd Gosod Mandrakelinux."
 
-#: ../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:86
+msgid "Member - member of a domain"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:76
+#: ../samba_wizard/Samba.pm:94
+msgid "BDC: backup domain controller"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:94
+msgid "Member: member of a domain"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:94
+msgid "PDC: primary domain controller"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:94
+#, fuzzy
+msgid "Samba Configuration Wizard"
+msgstr "Dewin Ffurfweddu Samba"
+
+#: ../samba_wizard/Samba.pm:94
 msgid ""
 "Samba allows your server to behave as a file and print server for "
 "workstations running non-Linux systems."
@@ -2311,36 +2491,291 @@ 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:76
-msgid "Samba configuration wizard"
-msgstr "Dewin Ffurfweddu Samba"
+#: ../samba_wizard/Samba.pm:94
+#, fuzzy
+msgid "standalone: standalone server"
+msgstr "Gweinydd Gosod Mandrakelinux."
+
+#: ../samba_wizard/Samba.pm:98
+msgid ""
+"It seems you previously setup a Samba server. This wizard will re-read your "
+"old configuration, and show you the Samba server type you choose"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:117
+msgid "Wich type of Samba server do you you want:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:121
+msgid ""
+"Domain master = yes, causes the server to register the NetBIOS name <pdc "
+"name>1B. This name will be recognized by other servers."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:121
+msgid "PDC server: primary domain controller"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:121
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:121
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends, "
+"but large installations should use the LDAP backend to provide centralized "
+"management of both Posix users and Windows users."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:140
+#, fuzzy
+msgid "Domain logons:"
+msgstr "Enw Parth:"
+
+#: ../samba_wizard/Samba.pm:141 ../samba_wizard/Samba.pm:189
+#: ../samba_wizard/Samba.pm:219
+#, fuzzy
+msgid "Domain master:"
+msgstr "Enw Parth:"
+
+#: ../samba_wizard/Samba.pm:142 ../samba_wizard/Samba.pm:190
+#: ../samba_wizard/Samba.pm:218
+msgid "Security:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:143 ../samba_wizard/Samba.pm:174
+msgid "Wins support:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:144 ../samba_wizard/Samba.pm:196
+msgid "admin users:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:144 ../samba_wizard/Samba.pm:196
+msgid "root @adm"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:145 ../samba_wizard/Samba.pm:191
+#, fuzzy
+msgid "Os level:"
+msgstr "Lefel mynediad:"
+
+#: ../samba_wizard/Samba.pm:145
+msgid ""
+"The global os level option dictates the operating system level at which "
+"Samba will masquerade during a browser election. If you wish to have Samba "
+"win an election and become the master browser, you can set the level above "
+"that of the operating system on your network with the highest current value. "
+"ie: os level = 34"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:146 ../samba_wizard/Samba.pm:217
+msgid "Use LDAP Passdb backend"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:150
+#, fuzzy
+msgid "The domain is wrong."
+msgstr "Mae'r Grŵp Gwaith yn anghywir"
+
+#: ../samba_wizard/Samba.pm:157
+msgid "BDC server: backup domain controller"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:157
+msgid ""
+"This enables BDCs to carry much of the network logon processing. A BDC on a "
+"local segment handles logon requests and authenticates users when the PDC is "
+"busy on the local network. When a segment becomes heavily loaded, the "
+"reponsibility is offloaded to another segment's BDC or to the PDC."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:175
+msgid ""
+"This specifies the IP address (or DNS name: IP address for preference) of "
+"the WINS server that nmbd(8) should register with. If you have a WINS server "
+"on your network then you should set this to the WINS server's IP."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:175
+#, fuzzy
+msgid "Wins server:"
+msgstr "Gwasanaethwr LDAP"
+
+#: ../samba_wizard/Samba.pm:176
+msgid "Wins name resolve order:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:180
+msgid ""
+"Your server doesn't support Wins. Please provide a Wins server, or leave "
+"blank Wins Support entry."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:187
+msgid "BDC server: needed fixed options"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:192
+msgid "Local master:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:193
+#, fuzzy
+msgid "Domain master"
+msgstr "Enw Parth:"
+
+#: ../samba_wizard/Samba.pm:194
+msgid "Prefered master"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:195
+#, fuzzy
+msgid "Domain logons"
+msgstr "Enw parth: %s"
+
+#: ../samba_wizard/Samba.pm:201
+#, fuzzy
+msgid "Member of a domain"
+msgstr "Parth E-bost:"
+
+#: ../samba_wizard/Samba.pm:201
+msgid "Please enter the domain you want to join."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:216
+#, fuzzy
+msgid "Password server"
+msgstr "Cyfrinair:"
+
+#: ../samba_wizard/Samba.pm:224
+#, fuzzy
+msgid "Please provide the password server."
+msgstr "Rhowch un gwahanol"
+
+#: ../samba_wizard/Samba.pm:231
+msgid "LDAP configuration for Domain Controlling"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:231
+msgid ""
+"The account (dn) that samba uses to access the LDAP server. This account "
+"needs to have write access to the LDAP tree. You will need to give samba the "
+"password for this dn."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:254
+msgid "Passdb backend"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:255
+msgid ""
+" The ldap admin dn defines the Distinguished Name (DN) name used by Samba to "
+"contact the ldap server when retreiving user account information. ie: "
+"cn=Manager,dc=mydomain,dc=com"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:255
+#, fuzzy
+msgid "LDAP administrator"
+msgstr "Gweinyddwr LDAP"
+
+#: ../samba_wizard/Samba.pm:256
+msgid "LDAP suffix"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:256
+msgid ""
+"Specifies where user and machine accounts are added to the tree. Can be "
+"overriden by ldap user suffix and ldap machine suffix. It also used as the "
+"base dn for all ldap searches. ie: dc=$DOMAINNAME,dc=com"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:257
+#, fuzzy
+msgid "LDAP password"
+msgstr "Cyfrinair LDAP:"
+
+#: ../samba_wizard/Samba.pm:258
+#, fuzzy
+msgid "LDAP password check:"
+msgstr "Cyfrinair LDAP:"
+
+#: ../samba_wizard/Samba.pm:259
+msgid ""
+"It specifies where machines should be added to the ldap tree. ie: "
+"ou=Computers"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:76
+#: ../samba_wizard/Samba.pm:259
+msgid "LDAP machine suffix:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:260
+msgid "LDAP user suffix:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:260
 msgid ""
-"This wizard will help you configuring the Samba services of your server."
-msgstr "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau Samba eich gweinydd."
+"This parameter specifies where users are added to the tree. If this "
+"parameter is not specified, the value from ldap suffix."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:261
+msgid "LDAP group suffix:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:261
+msgid ""
+"This parameters specifies the suffix that is  used for groups when these are "
+"added to the LDAP directory. ie: ou=Groups"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:265
+#, fuzzy
+msgid "Please provide an LDAP suffix."
+msgstr "Rhowch un gwahanol"
+
+#: ../samba_wizard/Samba.pm:269
+#, fuzzy
+msgid "Please enter an LDAP administrator."
+msgstr "Gweinyddwr LDAP"
+
+#: ../samba_wizard/Samba.pm:273
+msgid "Please enter an LDAP password."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:277
+#, fuzzy
+msgid "Pasword dont match."
+msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
-#: ../samba_wizard/Samba.pm:81
+#: ../samba_wizard/Samba.pm:284
 msgid "Samba needs to know the Windows Workgroup it will serve."
 msgstr "Mae Samba angen gwybod y Grŵp Gwaith Windows bydd yn ei wasanaethu."
 
-#: ../samba_wizard/Samba.pm:81
+#: ../samba_wizard/Samba.pm:284
 msgid "Workgroup"
 msgstr "Grŵp Gwaith"
 
-#: ../samba_wizard/Samba.pm:86 ../samba_wizard/Samba.pm:231
+#: ../samba_wizard/Samba.pm:290 ../samba_wizard/Samba.pm:337
+#: ../samba_wizard/Sambaprint.pm:126
 msgid "Workgroup:"
 msgstr "Grŵp Gwaith"
 
-#: ../samba_wizard/Samba.pm:92
-msgid "The Workgroup is wrong"
+#: ../samba_wizard/Samba.pm:294
+#, fuzzy
+msgid "The Workgroup is wrong."
 msgstr "Mae'r Grŵp Gwaith yn anghywir"
 
-#: ../samba_wizard/Samba.pm:97
-msgid "Server banner."
+#: ../samba_wizard/Samba.pm:301
+#, fuzzy
+msgid "Server Banner."
 msgstr "Baner Gweinydd"
 
-#: ../samba_wizard/Samba.pm:97
+#: ../samba_wizard/Samba.pm:301
 msgid ""
 "The banner is the way this server will be described in the Windows "
 "workstations."
@@ -2348,92 +2783,478 @@ msgstr ""
 "Y faner yw'r ffordd bydd y gweinydd hwn yn cael ei ddisgrifio mewn "
 "gorsafoedd gwaith Windows."
 
-#: ../samba_wizard/Samba.pm:103
+#: ../samba_wizard/Samba.pm:306
 msgid "Banner:"
 msgstr "Baner:"
 
-#: ../samba_wizard/Samba.pm:108
-msgid "The server banner is incorrect"
+#: ../samba_wizard/Samba.pm:310
+#, fuzzy
+msgid "The Server Banner is incorrect."
 msgstr "Mae Baner y Gweinydd yn anghywir"
 
-#: ../samba_wizard/Samba.pm:119
-msgid "Access level:"
+#: ../samba_wizard/Samba.pm:317
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:317
+msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:317
+msgid "Max Log size: put a capping on the size of the log files (in Kb)."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:317
+msgid "Samba Log"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:324 ../samba_wizard/Samba.pm:339
+#: ../samba_wizard/Sambaprint.pm:128
+msgid "Log file:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:325
+msgid "Max log size:"
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:326 ../sshd_wizard/Sshd.pm:127
+#, fuzzy
+msgid "Log level:"
 msgstr "Lefel mynediad:"
 
-#: ../samba_wizard/Samba.pm:124
+#: ../samba_wizard/Samba.pm:331
+msgid "Configuring Samba"
+msgstr "Ffurfweddu Samba"
+
+#: ../samba_wizard/Samba.pm:331
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run \"drakwizard sambashare\" to manage your share."
+msgstr ""
+
+#: ../samba_wizard/Samba.pm:331
+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:336 ../samba_wizard/Sambaprint.pm:125
+#, fuzzy
+msgid "Samba type:"
+msgstr "Gweinydd Samba"
+
+#: ../samba_wizard/Samba.pm:338 ../samba_wizard/Sambaprint.pm:127
+msgid "Server banner:"
+msgstr "Baner Gweinydd"
+
+#: ../samba_wizard/Samba.pm:345 ../samba_wizard/Sambaprint.pm:134
+msgid "The wizard successfully configured your Samba server."
+msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gweinydd Samba."
+
+#: ../samba_wizard/Samba.pm:451 ../samba_wizard/Sambaprint.pm:269
+#: ../samba_wizard/Sambashare.pm:495 ../samba_wizard/Sambashare.pm:516
+#: ../samba_wizard/Sambashare.pm:552 ../samba_wizard/Sambashare.pm:568
+#: ../samba_wizard/Sambashare.pm:593
+msgid "Configuring your Samba server..."
+msgstr "Ffurfweddu eich gweinydd Samba..."
+
+#: ../samba_wizard/Sambaprint.pm:57
+msgid "Printers - configure your printers"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:58
+msgid "Print - printers drivers"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:65
+#, fuzzy
+msgid "Samba printers Wizard"
+msgstr "Dewin Samba"
+
+#: ../samba_wizard/Sambaprint.pm:69 ../samba_wizard/Sambashare.pm:91
+msgid ""
+"It seems that you don't setup a Samba server. Please setup a Samba server "
+"with Samba wizard before manage your share."
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:74
+msgid "? :"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:79
+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/Sambaprint.pm:85
+msgid "Enable all printers"
+msgstr "Ateb i Bawb"
+
+#: ../samba_wizard/Sambaprint.pm:91
+msgid ""
+"Now you can configure your printers service. Change value only if you know "
+"what your are doing."
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:112 ../samba_wizard/Sambashare.pm:168
+#: ../samba_wizard/Sambashare.pm:239 ../samba_wizard/Sambashare.pm:283
+#: ../samba_wizard/Sambashare.pm:340 ../samba_wizard/Sambashare.pm:351
+#: ../samba_wizard/Sambashare.pm:362 ../samba_wizard/Sambashare.pm:374
+#: ../samba_wizard/Sambashare.pm:388
+#, fuzzy
+msgid "Comment:"
+msgstr "Cartref:"
+
+#: ../samba_wizard/Sambaprint.pm:113 ../samba_wizard/Sambashare.pm:343
+#: ../samba_wizard/Sambashare.pm:354
+#, fuzzy
+msgid "Create mode:"
+msgstr "Creu yn:"
+
+#: ../samba_wizard/Sambaprint.pm:114 ../samba_wizard/Sambashare.pm:170
+#: ../samba_wizard/Sambashare.pm:241 ../samba_wizard/Sambashare.pm:285
+#: ../samba_wizard/Sambashare.pm:341 ../samba_wizard/Sambashare.pm:352
+#: ../samba_wizard/Sambashare.pm:363 ../samba_wizard/Sambashare.pm:376
+#: ../samba_wizard/Sambashare.pm:389
+msgid "Browseable:"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:115
+msgid "Guest ok:"
+msgstr ""
+
+#: ../samba_wizard/Sambaprint.pm:120
+#, fuzzy
+msgid "Configuring Samba priniters"
+msgstr "Ffurfweddu Samba"
+
+#: ../samba_wizard/Sambashare.pm:66
+#, fuzzy
+msgid "My rules - Ask me allowed and denied hosts"
+msgstr "Fy rheol - parthau iawn a drwg"
+
+#: ../samba_wizard/Sambashare.pm:75
+msgid "Add - add a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:76
+msgid "Remove - remove a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:77
+msgid "Modify - modify a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:78
+msgid "CDrom - share a CDrom"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:79
+msgid "Homes - share home user dir"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:88
+#, fuzzy
+msgid "What do you want todo with your share ?"
+msgstr "Beth hoffech ei wneud:"
+
+#: ../samba_wizard/Sambashare.pm:88
+msgid "add/remove/modify a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:114
+msgid "Now i need to know your undestanding in Samba server configuration"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:121
+msgid "Delete wich share ?"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:121
+#, fuzzy
+msgid "Please choose the share you want to remove."
+msgstr "Dewiswch y ddelwedd cychwyn PXE rydych am ei dynnu o'r gweinydd PXE."
+
+#: ../samba_wizard/Sambashare.pm:129
+msgid "Modify wich share ?"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:129
+#, fuzzy
+msgid "Please choose the share you want to modify."
+msgstr "Dewiswch, o'r rhestr,  y ddelwedd cychwyn PXE i'w newid"
+
+#: ../samba_wizard/Sambashare.pm:137
+msgid "Modify a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:140
+msgid "There is no share to modify, please add one."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:153
+msgid "Please enter a share comment."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:167 ../samba_wizard/Sambashare.pm:238
+#: ../samba_wizard/Sambashare.pm:361 ../samba_wizard/Sambashare.pm:387
+#, fuzzy
+msgid "Name of the share:"
+msgstr "Enw'r peiriant"
+
+#: ../samba_wizard/Sambashare.pm:168
 msgid ""
-"* Example 1: allow all IP in 150.203.*.*; except one\n"
-"hosts allow = 150.203. EXCEPT 150.203.6.66"
+"This is a text field that is seen next to a share when a client does a "
+"queries the server"
 msgstr ""
-"* Esiampl 1: caniatáu pob  IP yn 150.203.*.*; heblaw un\\ngwesteiwr iawn = "
-"150.203. EXCEPT 150.203.6.66"
 
-#: ../samba_wizard/Samba.pm:124
+#: ../samba_wizard/Sambashare.pm:169 ../samba_wizard/Sambashare.pm:240
+#, fuzzy
+msgid "Path:"
+msgstr "Porth:"
+
+#: ../samba_wizard/Sambashare.pm:170 ../samba_wizard/Sambashare.pm:241
+msgid "Allows share to be displayed in list of share."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:171 ../samba_wizard/Sambashare.pm:300
+#: ../samba_wizard/Sambashare.pm:342 ../samba_wizard/Sambashare.pm:353
+#: ../samba_wizard/Sambashare.pm:364 ../samba_wizard/Sambashare.pm:391
+#, fuzzy
+msgid "Writable:"
+msgstr "rhestr ysgrifennu"
+
+#: ../samba_wizard/Sambashare.pm:172 ../samba_wizard/Sambashare.pm:242
+#: ../samba_wizard/Sambashare.pm:288 ../samba_wizard/Sambashare.pm:365
+#: ../samba_wizard/Sambashare.pm:379 ../samba_wizard/Sambashare.pm:392
+msgid "Public:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:178
+msgid "Advanced options, step 1"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:178
+msgid "Advanced options, use them if you know what you are doing."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:178
 msgid ""
-"* Example 2: allow hosts that match the given network/netmask\n"
-"hosts allow = 150.203.15.0/255.255.255.0"
+"If you choose \"Write list\" wizard will create the samba user without "
+"password. Use: smbpasswd [username] to redefine samba user password."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:191
+msgid "Specifies a user that have read-write access to a share. ie: fred"
 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:124
+#: ../samba_wizard/Sambashare.pm:191 ../samba_wizard/Sambashare.pm:303
+#: ../samba_wizard/Sambashare.pm:394
+msgid "Write list:"
+msgstr "rhestr ysgrifennu"
+
+#: ../samba_wizard/Sambashare.pm:192 ../samba_wizard/Sambashare.pm:304
+#, fuzzy
+msgid "User own directory:"
+msgstr "Cyfeiriadur defnyddiwr:"
+
+#: ../samba_wizard/Sambashare.pm:195 ../samba_wizard/Sambashare.pm:306
+msgid "Hide files:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:195 ../samba_wizard/Sambashare.pm:306
 msgid ""
-"* Example 3: allow a couple of hosts\n"
-"hosts allow = lapland, arvidsjaur"
+"The hide files option provides one or more directory or filename patterns to "
+"Samba. Any file matching this pattern will be treated as a hidden file from "
+"the perspective of the client. ie: /.icewm/"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:196 ../samba_wizard/Sambashare.pm:305
+#: ../samba_wizard/Sambashare.pm:395
+msgid "Show dot files:"
 msgstr ""
-"*Esiampl 3: caniatáu rhai gwesteiwyr\\ncaniatáu gwesteiwyr = lapland, "
-"arvidsjaur"
 
-#: ../samba_wizard/Samba.pm:124
+#: ../samba_wizard/Sambashare.pm:196 ../samba_wizard/Sambashare.pm:305
 msgid ""
-"* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny access "
-"from one particular host\n"
-"hosts allow = @foonet\n"
-"hosts deny = pirate"
+"The hide dot files option hides any files on the server that begin with a "
+"dot (.)"
 msgstr ""
-"* Esiampl 4: caniatáu dim ond gwesteiwr mewn grŵp gwe NiS \"fonet\",  ond "
-"gwrthod mynediad o un gwesteiwr penodol \\ncaniatáu gwesteiwyr = @fonet"
-"\\ngwrthod gwestiwyr = pirate"
 
-#: ../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/Sambashare.pm:201 ../samba_wizard/Sambashare.pm:311
+#, fuzzy, perl-format
+msgid "Please provide a system user, %s not present."
+msgstr "Rhowch un gwahanol"
 
-#: ../samba_wizard/Samba.pm:131
-msgid "Allow hosts:"
-msgstr "Caniatáu gwesteiwr:"
+#: ../samba_wizard/Sambashare.pm:208
+msgid "Please enter a unique user name for: \\\"write list\\\"."
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:132
-msgid "Deny hosts:"
-msgstr "Gwrthod gwesteiwr"
+#: ../samba_wizard/Sambashare.pm:214
+msgid "Advanced options, step 2"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:137
-msgid "Enabled Samba services"
-msgstr "Gwasanaethau Samba "
+#: ../samba_wizard/Sambashare.pm:214
+msgid "Advanced options, use them only if you know what you are doing."
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:137
+#: ../samba_wizard/Sambashare.pm:226
 msgid ""
-"Samba can provide a common file sharing area to your Windows workstation, "
-"and can also provide printer sharing for the printers connected to your "
-"server."
+"When a file is created, the necessary permissions are calculated according "
+"to the mapping from DOS modes to UNIX permissions, and the resulting UNIX "
+"mode is then bit-wise 'AND'ed with this parameter. This parameter may be "
+"thought of as a bit-wise MASK for the UNIX modes of a file. Any bit not set "
+"here will be removed from the modes set on a file when it is created."
 msgstr ""
-"Mae Samba'n gallu darparu gofod rhannu ffeiliau cyffredin ar gyfer eich "
-"gorsaf waith Windows, a rhannu argraffydd ar gyfer argraffyddion sydd wedi "
-"eu cysylltu i'ch gweinydd."
 
-#: ../samba_wizard/Samba.pm:145
-msgid "Enable file sharing area"
-msgstr "Galluogi gofod rhannu ffeil"
+#: ../samba_wizard/Sambashare.pm:226
+#, fuzzy
+msgid "create mask"
+msgstr "Netmask:"
 
-#: ../samba_wizard/Samba.pm:146
-msgid "Enable server Printer Sharing"
-msgstr "Galluogi gofod rhannu ffeil"
+#: ../samba_wizard/Sambashare.pm:227
+msgid ""
+"This parameter specifies a set of UNIX mode bit permissions that will always "
+"be set on a file created by Samba. This is done by bitwise 'OR'ing these "
+"bits onto the mode bits of a file that is being created or having its "
+"permissions changed. The default for this parameter is (in octal) 000. ie: "
+"force create mode = 0700 "
+msgstr ""
 
-#: ../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/Sambashare.pm:227
+msgid "force create mode"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:152
+#: ../samba_wizard/Sambashare.pm:228
+msgid ""
+"This parameter specifies a set of UNIX mode bit permissions that will always "
+"be set on a directory created by Samba. This is done by bitwise 'OR'ing "
+"these bits onto the mode bits of a directory that is being created. The "
+"default for this parameter is (in octal) 0000 which will not add any extra "
+"permission bits to a created directory. Default: ie: force directory mode = "
+"0755"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:228
+#, fuzzy
+msgid "force directory mode"
+msgstr "Cyfeiriadur rhanedig:"
+
+#: ../samba_wizard/Sambashare.pm:229
+msgid ""
+"This specifies a UNIX group name that will be assigned as the default "
+"primary group for all users connecting to this service. This is useful for "
+"sharing files by ensuring that all access to files on service will use the "
+"named group for their permissions checking. ie: force group = agroup"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:229
+#, fuzzy
+msgid "force group"
+msgstr "Grŵp Gwaith"
+
+#: ../samba_wizard/Sambashare.pm:230
+msgid "default case"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:230
+msgid "lower or upper"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:231
+msgid ""
+"This controls if new filenames are created with the case that the client "
+"passes, or if they are forced to be the default case"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:231
+#, fuzzy
+msgid "preserve case"
+msgstr "Enw Gweinydd Newyddion:"
+
+#: ../samba_wizard/Sambashare.pm:236 ../samba_wizard/Sambashare.pm:293
+msgid "Add a share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:236 ../samba_wizard/Sambashare.pm:324
+msgid "Browseable: view share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:236
+msgid "Comment: description of the share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:236
+msgid "Writable: user can write in the share"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:247
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:252 ../samba_wizard/Sambashare.pm:258
+msgid "Can't create the directory, please enter a correct path."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:255
+msgid "Please enter a Comment for this share."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:265
+msgid "Share a CDROM"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:284
+msgid "CDrom path:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:286 ../samba_wizard/Sambashare.pm:377
+msgid "Root preexec:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:287 ../samba_wizard/Sambashare.pm:378
+msgid "Root postexec:"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:293
+msgid "If you don't want to use one of this options, leave it blanck."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:301 ../samba_wizard/Sambashare.pm:390
+#, fuzzy
+msgid "Create mask:"
+msgstr "Creu yn:"
+
+#: ../samba_wizard/Sambashare.pm:303
+msgid "Specifie a user that have read-write access to a share. ie: guibo"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:317
+msgid ""
+"Please enter a unique user name for: \\\"write list\\\" and \\\"valid user\\"
+"\"."
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:324
+msgid "Comment: description of users home directory"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:324
+msgid "Create mode: man chmod for more info"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:324
+#, fuzzy
+msgid "Users home options"
+msgstr "Dewis addasu:"
+
+#: ../samba_wizard/Sambashare.pm:324
+msgid "Writable: user can write in their home"
+msgstr ""
+
+#: ../samba_wizard/Sambashare.pm:324
 msgid ""
 "You have selected to allow user access their home directories via samba but "
 "you/they must use smbpasswd to set a password."
@@ -2441,95 +3262,315 @@ msgstr ""
 "Rydych wedi dewis i ganiatáu mynediad i ddefnyddwyr i'w cyfeiriaduron "
 "cartref drwy samba ond rhaid defnyddio smbpasswd i osod cyfrinair."
 
-#: ../samba_wizard/Samba.pm:158 ../samba_wizard/Samba.pm:164
-#: ../samba_wizard/Samba.pm:234
-msgid "Shared directory:"
-msgstr "Cyfeiriadur rhanedig:"
+#: ../samba_wizard/Sambashare.pm:348 ../samba_wizard/Sambashare.pm:384
+#, fuzzy
+msgid ""
+"If you really want to add this this share, click the Next button or use the "
+"Back button."
+msgstr ""
+"I dderbyn y gwerthoedd hyn, ac ychwanegu cleient, cliciwch y botwm Nesaf neu "
+"ddefnyddio botwm Nôl i'w cywiro."
 
-#: ../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/Sambashare.pm:348
+msgid "Summary add home share"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:165
-msgid "Create shared directory if it doesn't exist"
-msgstr "Creu cyfeiriadur rhannu os nad yw'n bod"
+#: ../samba_wizard/Sambashare.pm:359
+#, fuzzy
+msgid ""
+"If you really want to modify this share, click the Next button or use the "
+"Back button."
+msgstr ""
+"I dderbyn y gwerth hwn ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
+"Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
-#: ../samba_wizard/Samba.pm:170
-msgid "Failed to create directory."
-msgstr "Methu creu cyfeiriadur."
+#: ../samba_wizard/Sambashare.pm:359
+msgid "Summary modify a share"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:180
-msgid "File permissions"
-msgstr "Caniatâd ffeil"
+#: ../samba_wizard/Sambashare.pm:371
+msgid "CDROM"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:180
+#: ../samba_wizard/Sambashare.pm:371
+#, fuzzy
 msgid ""
-"Type users or groups separated by a comma (groups must be preceded by a '@') "
-"like this:\n"
-"root, fred, @users, @wheel for each kind of permission."
+"If you really want to share a CDROM, click the Next button or use the Back "
+"button."
 msgstr ""
-"Teipio defnyddwyr neu grwpiau wedi eu gwahanu gan atalnod (blaenori grwpiau "
-"gyda \\'@) fel hyn: \n"
-"root, fred, @defnyddiwr, @olwyn ar gyfer pob math o ganiatâd."
+"I dderbyn y gwerth hwn ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
+"Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
-#: ../samba_wizard/Samba.pm:187
-msgid "Read list:"
-msgstr "rhestr ddarllen:"
+#: ../samba_wizard/Sambashare.pm:375
+msgid "Cdrom path:"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:187 ../samba_wizard/Samba.pm:188
-msgid "root, fred, @users, @wheel"
-msgstr "gwraidd, frêd, @defnyddwyr, @olwyn"
+#: ../samba_wizard/Sambashare.pm:384
+msgid "Summary add share"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:188
-msgid "Write list:"
-msgstr "rhestr ysgrifennu"
+#: ../samba_wizard/Sambashare.pm:400
+#, fuzzy
+msgid ""
+"If you really want to remove this share, click the Next button or use the "
+"Back button."
+msgstr ""
+"I dderbyn y gwerth hwn ac i ffurfweddu eich gweinydd, cliciwch  y botwm "
+"Nesaf neu ddefnyddio'r botwm Nôl i'w cywiro."
 
-#: ../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/Sambashare.pm:400
+msgid "Summary remove a share"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:205
-msgid "Enable all printers"
-msgstr "Ateb i Bawb"
+#: ../samba_wizard/Sambashare.pm:406
+msgid "Delete this share:"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:223
-msgid "Configuring Samba"
-msgstr "Ffurfweddu Samba"
+#: ../samba_wizard/Sambashare.pm:407
+msgid "Comment for this share:"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:223
-msgid "The wizard collected the following parameters to configure Samba."
+#: ../samba_wizard/Sambashare.pm:413
+#, fuzzy
+msgid "The wizard successfully configured your Samba samba."
+msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gweinydd Samba."
+
+#: ../samba_wizard/Sambashare.pm:421
+#, fuzzy
+msgid "The wizard successfully modify your share."
+msgstr "Mae'r dewin wedi ffurfweddu eich gweinydd PXE yn llwyddiannus."
+
+#: ../samba_wizard/Sambashare.pm:426
+#, fuzzy
+msgid "The wizard successfully add your share."
+msgstr "Mae'r dewin wedi ffurfweddu eich Gweinydd NFS yn llwyddiannus"
+
+#: ../samba_wizard/Sambashare.pm:431
+#, fuzzy
+msgid "The wizard successfully remove your share."
+msgstr "Mae'r dewin wedi ffurfweddu eich gweinydd PXE yn llwyddiannus."
+
+#: ../samba_wizard/Sambashare.pm:495 ../samba_wizard/Sambashare.pm:516
+#: ../samba_wizard/Sambashare.pm:552 ../samba_wizard/Sambashare.pm:568
+#: ../samba_wizard/Sambashare.pm:593
+#, fuzzy
+msgid "Samba share"
+msgstr "Gweinydd Samba"
+
+#: ../samba_wizard/Sambashare.pm:513 ../samba_wizard/Sambashare.pm:590
+#, perl-format
+msgid "Can't create %s. Please check why wizard can't create this directory."
 msgstr ""
-"Mae'r dewin wedi casglu'r paramedrau canlynol\n"
-"ffurfweddu Samba."
 
-#: ../samba_wizard/Samba.pm:232
-msgid "Server banner:"
-msgstr "Baner Gweinydd"
+#: ../sshd_wizard/Sshd.pm:65
+msgid "Expert - advanced ssh options"
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:233
-msgid "File sharing:"
-msgstr "Rhannu Ffeiliau:"
+#: ../sshd_wizard/Sshd.pm:70
+#, fuzzy
+msgid "OpenSSH SSH daemon configuration"
+msgstr "Dangos ffurfweddiad LDAP"
 
-#: ../samba_wizard/Samba.pm:235
-msgid "Print server:"
-msgstr "Gwasanaethwr LDAP"
+#: ../sshd_wizard/Sshd.pm:72
+#, fuzzy
+msgid "Wich type of configuration do you you want to do:"
+msgstr "Beth hoffech ei wneud:"
 
-#: ../samba_wizard/Samba.pm:236
-msgid "Home:"
-msgstr "Cartref:"
+#: ../sshd_wizard/Sshd.pm:77
+msgid "SSH server, classical options"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:85 ../sshd_wizard/Sshd.pm:181
+#, fuzzy
+msgid "Listen address:"
+msgstr "Cyfeiriad IP Isaf:"
+
+#: ../sshd_wizard/Sshd.pm:85
+msgid "Specifies the local addresses sshd should listen on."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:86 ../sshd_wizard/Sshd.pm:182
+#, fuzzy
+msgid "Port number:"
+msgstr "Enw cyntaf:"
+
+#: ../sshd_wizard/Sshd.pm:86
+msgid "Specifies the port number that sshd listens on. The default is 22."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:89
+#, fuzzy
+msgid "Port should be a number"
+msgstr "Gwall i fod yn gyfeiriadur"
+
+#: ../sshd_wizard/Sshd.pm:100
+#, fuzzy
+msgid "Authentication Method"
+msgstr "Dull gosodi:"
+
+#: ../sshd_wizard/Sshd.pm:110
+msgid "RSA auth:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:111
+msgid "PubKey auth:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:112
+msgid "Auth key file:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:113
+#, fuzzy
+msgid "Password auth:"
+msgstr "Cyfrinair:"
+
+#: ../sshd_wizard/Sshd.pm:114
+msgid "Ignore rhosts file:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:115
+msgid "Permit empty password:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:120
+msgid "Log"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:120
+msgid ""
+"Log level: gives the verbosity level that is used when logging messages from "
+"sshd."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:120
+msgid ""
+"Syslog facility: gives the facility code that is used when logging messages "
+"from sshd"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:126
+msgid "Syslog facility:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:132
+msgid "Login options"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:132
+msgid ""
+"Print last log: whether sshd should print the date and time when the user "
+"last logged in"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:140
+msgid "Login Grace time:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:140
+msgid ""
+"The server disconnects after this time if the user has not successfully "
+"logged in. If the value is 0, there is no time limit. The default is 120 "
+"seconds."
+msgstr ""
 
-#: ../samba_wizard/Samba.pm:237
-msgid "Printers:"
+#: ../sshd_wizard/Sshd.pm:141
+msgid "Keep alive:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:142
+#, fuzzy
+msgid "Print motd:"
 msgstr "Argraffyddion:"
 
-#: ../samba_wizard/Samba.pm:243
-msgid "The wizard successfully configured your Samba server."
-msgstr "Llwyddiant! Mae'r dewin wedi ffurfweddu eich gweinydd Samba."
+#: ../sshd_wizard/Sshd.pm:143
+#, fuzzy
+msgid "Print last log:"
+msgstr "Caniatáu Mewngofnodi gwraidd"
 
-#: ../samba_wizard/Samba.pm:525
-msgid "Configuring your Samba server..."
+#: ../sshd_wizard/Sshd.pm:146
+msgid "Login grace time should be a number"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:151
+msgid ""
+"Strict modes: specifies whether sshd should check file modes and ownership "
+"of the user's files and home directory before accepting login. This is "
+"normally desirable because novices sometimes accidentally leave their "
+"directory or files world-writable"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:151
+#, fuzzy
+msgid "User Login options"
+msgstr "Mewngofnod defnyddiwr:"
+
+#: ../sshd_wizard/Sshd.pm:159
+msgid "Strict modes:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:160
+#, fuzzy
+msgid "Allow users:"
+msgstr "Caniatáu gwesteiwr:"
+
+#: ../sshd_wizard/Sshd.pm:160
+msgid ""
+"If specified, login is allowed only for user names that match one of the "
+"patterns. ie: erwan aginies guibo"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:161
+#, fuzzy
+msgid "Deny users:"
+msgstr "Gwrthod gwesteiwr"
+
+#: ../sshd_wizard/Sshd.pm:161
+msgid ""
+"Login is disallowed for user names that match one of the patterns. ie: "
+"pirate guillomovitch"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:166
+msgid "Compression: Specifies whether compression is allowed."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:166
+msgid ""
+"X11 forwarding: specifies whether X11 forwarding is permitted. Note that "
+"disabling X11 forwarding does not prevent users from forwarding X11 traffic, "
+"as users can always install their own forwarders."
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:172
+#, fuzzy
+msgid "Compression:"
+msgstr "Dewis addasu:"
+
+#: ../sshd_wizard/Sshd.pm:173
+msgid "X11 forwarding:"
+msgstr ""
+
+#: ../sshd_wizard/Sshd.pm:178
+#, fuzzy
+msgid "Summary of OpenSSH configuration."
+msgstr "Dangos ffurfweddiad LDAP"
+
+#: ../sshd_wizard/Sshd.pm:188
+#, fuzzy
+msgid "The wizard successfully configured your SSH server."
+msgstr "Mae'r dewin wedi ffurfweddu eich Gweinydd NFS yn llwyddiannus"
+
+#: ../sshd_wizard/Sshd.pm:250
+#, fuzzy
+msgid "Configuring your OpenSSH server..."
 msgstr "Ffurfweddu eich gweinydd Samba..."
 
+#: ../sshd_wizard/Sshd.pm:250
+#, fuzzy
+msgid "OpenSSH server"
+msgstr "Gweinydd gwe Apache"
+
 #: ../time_wizard/Ntp.pm:34
 msgid "Time wizard"
 msgstr "Dewin amser"
@@ -2651,6 +3692,11 @@ msgstr ""
 msgid "Web wizard"
 msgstr "Dewin Gwe"
 
+#: ../web_wizard/Apache.pm:62
+#, perl-format
+msgid "%s does not exist."
+msgstr "Nid yw %s yn bod."
+
 #: ../web_wizard/Apache.pm:71
 msgid "This wizard will help you configuring the Web server for your network."
 msgstr ""
@@ -2766,3 +3812,206 @@ msgstr "Gweinydd gwe Apache"
 #: ../web_wizard/Apache.pm:236
 msgid "Configuring your system as Apache server ..."
 msgstr "Ffurfweddu eich system fel gweinydd Apache..."
+
+#~ msgid "Admin email"
+#~ msgstr "E-bost gweinyddwr"
+
+#~ msgid "NIS client"
+#~ msgstr "Cleient NIS"
+
+#~ msgid "Configure computer to be a NIS client"
+#~ msgstr "Ffurfweddu eich cyfrifiadur i fod yn gleient NIS..."
+
+#~ msgid "You just have to put nisdomain and nisserver."
+#~ msgstr "Rhaid gosod nisdomain a nisserver"
+
+#~ msgid "NIS domain:"
+#~ msgstr "Parth NIS::"
+
+#~ msgid "NIS domainname: name of NIS domain."
+#~ msgstr "Enw parth NIS: enw parth NIS "
+
+#~ msgid "NIS server: hostname of the NIS server."
+#~ msgstr "Gweinydd NIS: enw parth gweinydd NIS."
+
+#~ msgid ""
+#~ "The YPBIND daemon finds the server for NIS domains and maintains the NIS "
+#~ "binding information."
+#~ msgstr ""
+#~ "Mae'r daemon YPBIND yn canfod gweinydd ar gyfer parthau NIS ac yn cynnal "
+#~ "gwybodaeth rwymo NIS."
+
+#~ 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."
+
+#~ msgid "Configuring your system as NIS client ..."
+#~ msgstr "Ffurfweddu eich system fel Cleient NIS..."
+
+#~ msgid "Internal mail server"
+#~ msgstr "Gweinydd e-bost mewnol"
+
+#~ msgid ""
+#~ "This wizard will help you configure an internal mail server for your "
+#~ "network, or configure an external mail server."
+#~ msgstr ""
+#~ "Bydd y dewin yn eich cynorthwyo i ffurfweddu gweinydd e-bost mewnol ar "
+#~ "gyfer eich rhwydwaith, neu ffurfweddu gweinydd e-bost allanol"
+
+#~ msgid "Outgoing mail address"
+#~ msgstr "Cyfeiriad e-bost allfynd"
+
+#~ msgid ""
+#~ "This should be chosen consistently with the address you use for incoming "
+#~ "mail."
+#~ msgstr ""
+#~ "Rhaid i hyn gael ei ddewis yn gyson gyda'r cyfeiriad sy'n cael ei "
+#~ "ddefnyddio ar gyfer e-bost sy'n cyrraedd."
+
+#~ msgid ""
+#~ "You can select the kind of address that outgoing mail will show in the "
+#~ "\"From:\" and \"Reply-to\" field."
+#~ msgstr ""
+#~ "Mae modd dewis y math o gyfeiriad fydd e-bost allfynd yn ei ddangos ym "
+#~ "maes \"Oddi wrth:\" a \"Ateb i\"."
+
+#~ msgid "Warning:"
+#~ msgstr "Rhybudd"
+
+#~ msgid "You entered an empty address for the mail gateway."
+#~ msgstr "Rydych wedi rhoi cyfeiriad gwag ar gyfer porth e-bost."
+
+#~ msgid ""
+#~ "Your choice can be accepted, but this will not allow you to send mail "
+#~ "outside your local network. Press next to continue, or back to enter a "
+#~ "value."
+#~ msgstr ""
+#~ "Mae modd derbyn eich dewis, ond ni fydd yn caniatáu i chi anfon e-bost y "
+#~ "tu allan i'ch rhwydwaith lleol. Cliciwch nesaf i barhau, neu nôl i gynnig "
+#~ "gwerth."
+
+#~ 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 "Internet mail gateway"
+#~ msgstr "Porth e-bost rhyngrwyd"
+
+#~ msgid ""
+#~ "Your server will send the outgoing through a mail gateway, that will take "
+#~ "care of the final delivery."
+#~ msgstr ""
+#~ "Bydd eich gweinydd yn anfon yr e-bost allfynd drwy borth e-bost, gan "
+#~ "ofalu am y trosglwyddiad terfynol."
+
+#~ msgid "Mail server name:"
+#~ msgstr "Enw gweinydd allanol::"
+
+#~ msgid "The default is to append myhostname which is fine for small sites."
+#~ msgstr ""
+#~ "Y rhagosodiad yw ategu myhostname sy'n iawn ar gyfer safleoedd bychain."
+
+#~ msgid "Configuring the external mail server"
+#~ msgstr "Ffurfweddu ar gyfer gweinydd e-bost allanol"
+
+#~ msgid "Internet mail gateway:"
+#~ msgstr "Porth e-bost rhyngrwyd:"
+
+#~ msgid "Form of the address:"
+#~ msgstr "Ffurf y cyfeiriad:"
+
+#~ msgid "The wizard successfully configured your external mail server."
+#~ msgstr ""
+#~ "Mae'r dewin wedi ffurfweddu eich gweinydd e-bost allanol yn llwyddiannus."
+
+#~ msgid "All - no access restriction"
+#~ msgstr "Pob - dim cyfyngiad mynediad"
+
+#~ msgid ""
+#~ "This wizard will help you configuring the Samba services of your server."
+#~ msgstr ""
+#~ "Dewin i'ch cynorthwyo i ffurfweddu gwasanaethau Samba eich gweinydd."
+
+#~ msgid ""
+#~ "* 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  IP yn 150.203.*.*; heblaw un\\ngwesteiwr iawn "
+#~ "= 150.203. EXCEPT 150.203.6.66"
+
+#~ msgid ""
+#~ "* Example 2: allow hosts that match the given network/netmask\n"
+#~ "hosts allow = 150.203.15.0/255.255.255.0"
+#~ msgstr ""
+#~ "* Esiampl 2: caniatáu gwesteiwyr sy'n cydweddu â'r rhwydwaith/netmask"
+#~ "\\ncaniatáu gwesteiwyr = 150.203.15.0/255.255.255.0"
+
+#~ msgid ""
+#~ "* Example 3: allow a couple of hosts\n"
+#~ "hosts allow = lapland, arvidsjaur"
+#~ msgstr ""
+#~ "*Esiampl 3: caniatáu rhai gwesteiwyr\\ncaniatáu gwesteiwyr = lapland, "
+#~ "arvidsjaur"
+
+#~ msgid ""
+#~ "* Example 4: allow only hosts in NIS netgroup \"foonet\",  but deny "
+#~ "access from one particular host\n"
+#~ "hosts allow = @foonet\n"
+#~ "hosts deny = pirate"
+#~ msgstr ""
+#~ "* Esiampl 4: caniatáu dim ond gwesteiwr mewn grŵp gwe NiS \"fonet\",  ond "
+#~ "gwrthod mynediad o un gwesteiwr penodol \\ncaniatáu gwesteiwyr = @fonet"
+#~ "\\ngwrthod gwestiwyr = pirate"
+
+#~ msgid "Note that access still requires suitable user-level passwords."
+#~ msgstr "Mae mynediad yn gofyn cyfrineiriau lefel defnyddiwr addas."
+
+#~ msgid ""
+#~ "Samba can provide a common file sharing area to your Windows workstation, "
+#~ "and can also provide printer sharing for the printers connected to your "
+#~ "server."
+#~ msgstr ""
+#~ "Mae Samba'n gallu darparu gofod rhannu ffeiliau cyffredin ar gyfer eich "
+#~ "gorsaf waith Windows, a rhannu argraffydd ar gyfer argraffyddion sydd "
+#~ "wedi eu cysylltu i'ch gweinydd."
+
+#~ msgid "Enable file sharing area"
+#~ msgstr "Galluogi gofod rhannu ffeil"
+
+#~ msgid "Enable server Printer Sharing"
+#~ msgstr "Galluogi gofod rhannu ffeil"
+
+#~ msgid "Make home directories available for their owners"
+#~ msgstr "Gwneud cyfeiriaduron cartref ar gael ar gyfer eu perchnogion"
+
+#~ msgid "Type the path of the directory you want being shared."
+#~ msgstr "Teipiwch lwybr y cyfeiriadur i'w rannu"
+
+#~ msgid "Failed to create directory."
+#~ msgstr "Methu creu cyfeiriadur."
+
+#~ msgid "File permissions"
+#~ msgstr "Caniatâd ffeil"
+
+#~ msgid ""
+#~ "Type users or groups separated by a comma (groups must be preceded by a "
+#~ "'@') like this:\n"
+#~ "root, fred, @users, @wheel for each kind of permission."
+#~ msgstr ""
+#~ "Teipio defnyddwyr neu grwpiau wedi eu gwahanu gan atalnod (blaenori "
+#~ "grwpiau gyda \\'@) fel hyn: \n"
+#~ "root, fred, @defnyddiwr, @olwyn ar gyfer pob math o ganiatâd."
+
+#~ msgid "Read list:"
+#~ msgstr "rhestr ddarllen:"
+
+#~ msgid "root, fred, @users, @wheel"
+#~ msgstr "gwraidd, frêd, @defnyddwyr, @olwyn"
+
+#~ msgid "File sharing:"
+#~ msgstr "Rhannu Ffeiliau:"